Update changelog for 0.10.0-2 release

Signed-off-by: Sven Sager <akira@narux.de>

.idea/misc.xml

@@ -6,7 +6,7 @@
   <component name="ProjectPlainTextFileTypeManager">
     <file url="file://$PROJECT_DIR$/src/revpicommander/locale/revpicommander_de.ts" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (revpicommander)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (revpicommander)" project-jdk-type="Python SDK" />
   <component name="PythonCompatibilityInspectionAdvertiser">
     <option name="version" value="3" />
   </component>

.idea/revpicommander.iml

@@ -4,8 +4,9 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.9 (revpicommander)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.11 (revpicommander)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PackageRequirementsSettings">

.idea/vcs.xml

@@ -3,6 +3,8 @@
   <component name="CommitMessageInspectionProfile">
     <profile version="1.0">
       <inspection_tool class="BodyLimit" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="CommitFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
       <inspection_tool class="SubjectBodySeparation" enabled="true" level="WARNING" enabled_by_default="true" />
       <inspection_tool class="SubjectLimit" enabled="true" level="WARNING" enabled_by_default="true" />
     </profile>

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
+  The licenses for most software are designed to take away your
-software and other kinds of works.
+freedom to share and change it.  By contrast, the GNU General Public
-
+License is intended to guarantee your freedom to share and change free
-  The licenses for most software and other practical works are designed
+software--to make sure the software is free for all its users.  This
-to take away your freedom to share and change the works.  By contrast,
+General Public License applies to most of the Free Software
-the GNU General Public License is intended to guarantee your freedom to
+Foundation's software and to any other program whose authors commit to
-share and change all versions of a program--to make sure it remains free
+using it.  (Some other Free Software Foundation software is covered by
-software for all its users.  We, the Free Software Foundation, use the
+the GNU Lesser General Public License instead.)  You can apply it to
-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
 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
+this service if you wish), that you receive source code or can get it
-want it, that you can change the software or use pieces of it in new
+if you want it, that you can change the software or use pieces of it
-free programs, and that you know you can do these things.
+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
+  To protect your rights, we need to make restrictions that forbid
-these rights or asking you to surrender the rights.  Therefore, you have
+anyone to deny you these rights or to ask you to surrender the rights.
-certain responsibilities if you distribute copies of the software, or if
+These restrictions translate to certain responsibilities for you if you
-you modify it: responsibilities to respect the freedom of others.
+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
+gratis or for a fee, you must give the recipients all the rights that
-freedoms that you received.  You must make sure that they, too, receive
+you have.  You must make sure that they, too, receive or can get the
-or can get the source code.  And you must show them these terms so they
+source code.  And you must show them these terms so they know their
-know their rights.
+rights.
 
-  Developers that use the GNU GPL protect your rights with two steps:
+  We protect your rights with two steps: (1) copyright the software, and
-(1) assert copyright on the software, and (2) offer you this License
+(2) offer you this license which gives you legal permission to copy,
-giving you legal permission to copy, distribute and/or modify it.
+distribute and/or modify the software.
 
-  For the developers' and authors' protection, the GPL clearly explains
+  Also, for each author's protection and ours, we want to make certain
-that there is no warranty for this free software.  For both users' and
+that everyone understands that there is no warranty for this free
-authors' sake, the GPL requires that modified versions be marked as
+software.  If the software is modified by someone else and passed on, we
-changed, so that their problems will not be attributed erroneously to
+want its recipients to know that what they have is not the original, so
-authors of previous versions.
+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
+  Finally, any free program is threatened constantly by software
-modified versions of the software inside them, although the manufacturer
+patents.  We wish to avoid the danger that redistributors of a free
-can do so.  This is fundamentally incompatible with the aim of
+program will individually obtain patent licenses, in effect making the
-protecting users' freedom to change the software.  The systematic
+program proprietary.  To prevent this, we have made it clear that any
-pattern of such abuse occurs in the area of products for individuals to
+patent must be licensed for everyone's free use or not licensed at all.
-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.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                       TERMS AND CONDITIONS
+                    GNU GENERAL PUBLIC LICENSE
-
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  0. Definitions.
+
-
+  0. This License applies to any program or other work which contains
-  "This License" refers to version 3 of the GNU General Public License.
+a notice placed by the copyright holder saying it may be distributed
-
+under the terms of this General Public License.  The "Program", below,
-  "Copyright" also means copyright-like laws that apply to other kinds of
+refers to any such program or work, and a "work based on the Program"
-works, such as semiconductor masks.
+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,
-  "The Program" refers to any copyrightable work licensed under this
+either verbatim or with modifications and/or translated into another
-License.  Each licensee is addressed as "you".  "Licensees" and
+language.  (Hereinafter, translation is included without limitation in
-"recipients" may be individuals or organizations.
+the term "modification".)  Each licensee is addressed as "you".
-
+
-  To "modify" a work means to copy from or adapt all or part of the work
+Activities other than copying, distribution and modification are not
-in a fashion requiring copyright permission, other than the making of an
+covered by this License; they are outside its scope.  The act of
-exact copy.  The resulting work is called a "modified version" of the
+running the Program is not restricted, and the output from the Program
-earlier work or a work "based on" the earlier work.
+is covered only if its contents constitute a work based on the
-
+Program (independent of having been made by running the Program).
-  A "covered work" means either the unmodified Program or a work based
+Whether that is true depends on what the Program does.
-on the Program.
+
-
+  1. You may copy and distribute verbatim copies of the Program's
-  To "propagate" a work means to do anything with it that, without
+source code as you receive it, in any medium, provided that you
-permission, would make you directly or secondarily liable for
+conspicuously and appropriately publish on each copy an appropriate
-infringement under applicable copyright law, except executing it on a
+copyright notice and disclaimer of warranty; keep intact all the
-computer or modifying a private copy.  Propagation includes copying,
+notices that refer to this License and to the absence of any warranty;
-distribution (with or without modification), making available to the
+and give any other recipients of the Program a copy of this License
-public, and in some countries other activities as well.
+along with the Program.
-
+
-  To "convey" a work means any kind of propagation that enables other
+You may charge a fee for the physical act of transferring a copy, and
-parties to make or receive copies.  Mere interaction with a user through
+you may at your option offer warranty protection in exchange for a fee.
-a computer network, with no transfer of a copy, is not conveying.
+
-
+  2. You may modify your copy or copies of the Program or any portion
-  An interactive user interface displays "Appropriate Legal Notices"
+of it, thus forming a work based on the Program, and copy and
-to the extent that it includes a convenient and prominently visible
+distribute such modifications or work under the terms of Section 1
-feature that (1) displays an appropriate copyright notice, and (2)
+above, provided that you also meet all of these conditions:
-tells the user that there is no warranty for the work (except to the
+
-extent that warranties are provided), that licensees may convey the
+    a) You must cause the modified files to carry prominent notices
-work under this License, and how to view a copy of this License.  If
+    stating that you changed the files and the date of any change.
-the interface presents a list of user commands or options, such as a
+
-menu, a prominent item in the list meets this criterion.
+    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
-  1. Source Code.
+    part thereof, to be licensed as a whole at no charge to all third
-
+    parties under the terms of this License.
-  The "source code" for a work means the preferred form of the work
+
-for making modifications to it.  "Object code" means any non-source
+    c) If the modified program normally reads commands interactively
-form of a work.
+    when run, you must cause it, when started running for such
-
+    interactive use in the most ordinary way, to print or display an
-  A "Standard Interface" means an interface that either is an official
+    announcement including an appropriate copyright notice and a
-standard defined by a recognized standards body, or, in the case of
+    notice that there is no warranty (or else, saying that you provide
-interfaces specified for a particular programming language, one that
+    a warranty) and that users may redistribute the program under
-is widely used among developers working in that language.
+    these conditions, and telling the user how to view a copy of this
-
+    License.  (Exception: if the Program itself is interactive but
-  The "System Libraries" of an executable work include anything, other
+    does not normally print such an announcement, your work based on
-than the work as a whole, that (a) is included in the normal form of
+    the Program is not required to print an announcement.)
-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
+These requirements apply to the modified work as a whole.  If
-Major Component, or to implement a Standard Interface for which an
+identifiable sections of that work are not derived from the Program,
-implementation is available to the public in source code form.  A
+and can be reasonably considered independent and separate works in
-"Major Component", in this context, means a major essential component
+themselves, then this License, and its terms, do not apply to those
-(kernel, window system, and so on) of the specific operating system
+sections when you distribute them as separate works.  But when you
-(if any) on which the executable work runs, or a compiler used to
+distribute the same sections as part of a whole which is a work based
-produce the work, or an object code interpreter used to run it.
+on the Program, the distribution of the whole must be on the terms of
-
+this License, whose permissions for other licensees extend to the
-  The "Corresponding Source" for a work in object code form means all
+entire whole, and thus to each and every part regardless of who wrote it.
-the source code needed to generate, install, and (for an executable
+
-work) run the object code and to modify the work, including scripts to
+Thus, it is not the intent of this section to claim rights or contest
-control those activities.  However, it does not include the work's
+your rights to work written entirely by you; rather, the intent is to
-System Libraries, or general-purpose tools or generally available free
+exercise the right to control the distribution of derivative or
-programs which are used unmodified in performing those activities but
+collective works based on the Program.
-which are not part of the work.  For example, Corresponding Source
+
-includes interface definition files associated with source files for
+In addition, mere aggregation of another work not based on the Program
-the work, and the source code for shared libraries and dynamically
+with the Program (or with a work based on the Program) on a volume of
-linked subprograms that the work is specifically designed to require,
+a storage or distribution medium does not bring the other work under
-such as by intimate data communication or control flow between those
+the scope of this License.
-subprograms and other parts of the work.
+
-
+  3. You may copy and distribute the Program (or a work based on it,
-  The Corresponding Source need not include anything that users
+under Section 2) in object code or executable form under the terms of
-can regenerate automatically from other parts of the Corresponding
+Sections 1 and 2 above provided that you also do one of the following:
-Source.
+
-
+    a) Accompany it with the complete corresponding machine-readable
-  The Corresponding Source for a work in source code form is that
+    source code, which must be distributed under the terms of Sections
-same work.
+    1 and 2 above on a medium customarily used for software interchange; or,
-
+
-  2. Basic Permissions.
+    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
-  All rights granted under this License are granted for the term of
+    cost of physically performing source distribution, a complete
-copyright on the Program, and are irrevocable provided the stated
+    machine-readable copy of the corresponding source code, to be
-conditions are met.  This License explicitly affirms your unlimited
+    distributed under the terms of Sections 1 and 2 above on a medium
-permission to run the unmodified Program.  The output from running a
+    customarily used for software interchange; or,
-covered work is covered by this License only if the output, given its
+
-content, constitutes a covered work.  This License acknowledges your
+    c) Accompany it with the information you received as to the offer
-rights of fair use or other equivalent, as provided by copyright law.
+    to distribute corresponding source code.  (This alternative is
-
+    allowed only for noncommercial distribution and only if you
-  You may make, run and propagate covered works that you do not
+    received the program in object code or executable form with such
-convey, without conditions so long as your license otherwise remains
+    an offer, in accord with Subsection b above.)
-in force.  You may convey covered works to others for the sole purpose
+
-of having them make modifications exclusively for you, or provide you
+The source code for a work means the preferred form of the work for
-with facilities for running those works, provided that you comply with
+making modifications to it.  For an executable work, complete source
-the terms of this License in conveying all material for which you do
+code means all the source code for all modules it contains, plus any
-not control copyright.  Those thus making or running the covered works
+associated interface definition files, plus the scripts used to
-for you must do so exclusively on your behalf, under your direction
+control compilation and installation of the executable.  However, as a
-and control, on terms that prohibit them from making any copies of
+special exception, the source code distributed need not include
-your copyrighted material outside their relationship with you.
+anything that is normally distributed (in either source or binary
-
+form) with the major components (compiler, kernel, and so on) of the
-  Conveying under any other circumstances is permitted solely under
+operating system on which the executable runs, unless that component
-the conditions stated below.  Sublicensing is not allowed; section 10
+itself accompanies the executable.
-makes it unnecessary.
+
-
+If distribution of executable or object code is made by offering
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+access to copy from a designated place, then offering equivalent
-
+access to copy the source code from the same place counts as
-  No covered work shall be deemed part of an effective technological
+distribution of the source code, even though third parties are not
-measure under any applicable law fulfilling obligations under article
+compelled to copy the source along with the object code.
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
+
-similar laws prohibiting or restricting circumvention of such
+  4. You may not copy, modify, sublicense, or distribute the Program
-measures.
+except as expressly provided under this License.  Any attempt
-
+otherwise to copy, modify, sublicense or distribute the Program is
-  When you convey a covered work, you waive any legal power to forbid
+void, and will automatically terminate your rights under this License.
-circumvention of technological measures to the extent such circumvention
+However, parties who have received copies, or rights, from you under
-is effected by exercising rights under this License with respect to
+this License will not have their licenses terminated so long as such
-the covered work, and you disclaim any intention to limit operation or
+parties remain in full compliance.
-modification of the work as a means of enforcing, against the work's
+
-users, your or third parties' legal rights to forbid circumvention of
+  5. You are not required to accept this License, since you have not
-technological measures.
+signed it.  However, nothing else grants you permission to modify or
-
+distribute the Program or its derivative works.  These actions are
-  4. Conveying Verbatim Copies.
+prohibited by law if you do not accept this License.  Therefore, by
-
+modifying or distributing the Program (or any work based on the
-  You may convey verbatim copies of the Program's source code as you
+Program), you indicate your acceptance of this License to do so, and
-receive it, in any medium, provided that you conspicuously and
+all its terms and conditions for copying, distributing or modifying
-appropriately publish on each copy an appropriate copyright notice;
+the Program or works based on it.
-keep intact all notices stating that this License and any
+
-non-permissive terms added in accord with section 7 apply to the code;
+  6. Each time you redistribute the Program (or any work based on the
-keep intact all notices of the absence of any warranty; and give all
+Program), the recipient automatically receives a license from the
-recipients a copy of this License along with the Program.
+original licensor to copy, distribute or modify the Program subject to
-
+these terms and conditions.  You may not impose any further
-  You may charge any price or no price for each copy that you convey,
+restrictions on the recipients' exercise of the rights granted herein.
-and you may offer support or warranty protection for a fee.
+You are not responsible for enforcing compliance by third parties to
-
-  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
 this License.
 
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
+  7. If, as a consequence of a court judgment or allegation of patent
-patent license under the contributor's essential patent claims, to
+infringement or for any other reason (not limited to patent issues),
-make, use, sell, offer for sale, import and otherwise run, modify and
+conditions are imposed on you (whether by court order, agreement or
-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
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
+excuse you from the conditions of this License.  If you cannot
-covered work so as to satisfy simultaneously your obligations under this
+distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
+License and any other pertinent obligations, then as a consequence you
-not convey it at all.  For example, if you agree to terms that obligate you
+may not distribute the Program at all.  For example, if a patent
-to collect a royalty for further conveying from those to whom you convey
+license would not permit royalty-free redistribution of the Program by
-the Program, the only way you could satisfy both those terms and this
+all those who receive copies directly or indirectly through you, then
-License would be to refrain entirely from conveying the Program.
+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
+It is not the purpose of this section to induce you to infringe any
-permission to link or combine any covered work with a work licensed
+patents or other property right claims or to contest validity of any
-under version 3 of the GNU Affero General Public License into a single
+such claims; this section has the sole purpose of protecting the
-combined work, and to convey the resulting work.  The terms of this
+integrity of the free software distribution system, which is
-License will continue to apply to the part which is the covered work,
+implemented by public license practices.  Many people have made
-but the special requirements of the GNU Affero General Public License,
+generous contributions to the wide range of software distributed
-section 13, concerning interaction through a network will apply to the
+through that system in reliance on consistent application of that
-combination as such.
+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
+  8. If the distribution and/or use of the Program is restricted in
-the GNU General Public License from time to time.  Such new versions will
+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
+Each version is given a distinguishing version number.  If the Program
-Program specifies that a certain numbered version of the GNU General
+specifies a version number of this License which applies to it and "any
-Public License "or any later version" applies to it, you have the
+later version", you have the option of following the terms and conditions
-option of following the terms and conditions either of that numbered
+either of that version or of any later version published by the Free
-version or of any later version published by the Free Software
+Software Foundation.  If the Program does not specify a version number of
-Foundation.  If the Program does not specify a version number of the
+this License, you may choose any version ever published by the Free Software
-GNU General Public License, you may choose any version ever published
+Foundation.
-by the Free Software Foundation.
 
-  If the Program specifies that a proxy can decide which future
+  10. If you wish to incorporate parts of the Program into other free
-versions of the GNU General Public License can be used, that proxy's
+programs whose distribution conditions are different, write to the author
-public statement of acceptance of a version permanently authorizes you
+to ask for permission.  For software which is copyrighted by the Free
-to choose that version for the Program.
+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
+                            NO WARRANTY
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
 
-  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
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-
+POSSIBILITY OF SUCH DAMAGES.
-  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.
 
                      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
+    You should have received a copy of the GNU General Public License along
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    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
+If the program is interactive, make it output a short notice like this
-notice like this when it starts in an interactive mode:
+when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
+    Gnomovision version 69, Copyright (C) year name of author
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    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
+parts of the General Public License.  Of course, the commands you use may
-might be different; for a GUI interface, you would use an "about box".
+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,
+You should also get your employer (if you work as a programmer) or your
-if any, to sign a "copyright disclaimer" for the program, if necessary.
+school, if any, to sign a "copyright disclaimer" for the program, if
-For more information on this, and how to apply and follow the GNU GPL, see
+necessary.  Here is a sample; alter the names:
-<https://www.gnu.org/licenses/>.
 
-  The GNU General Public License does not permit incorporating your program
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-into proprietary programs.  If your program is a subroutine library, you
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-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
+  <signature of Ty Coon>, 1 April 1989
-Public License instead of this License.  But first, please read
+  Ty Coon, President of Vice
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+
+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.

MANIFEST.in

@@ -2,12 +2,11 @@ recursive-include data *
 recursive-include src/revpicommander *.py *.qm
 recursive-include ui_dev *
 include LICENSE.txt
-include make_installer_win.bat
+include make.bat
 include Makefile
 include MANIFEST.in
 include README.md
 include requirements.txt
 include setup.iss
 include setup.py
-include stdeb.cfg
 include translate.pro

Makefile

@@ -4,80 +4,125 @@ MAKEFLAGS     = --no-print-directory --no-builtin-rules
 
 # Variables
 PACKAGE = revpicommander
+APP_NAME = RevPi\ Commander
+APP_IDENT = org.revpimodio.revpicommander
+APPLE_SIG = "Developer ID Application: Sven Sager (U3N5843D9K)"
 
-# If virtualenv exists, use it. If not, use PATH to find
+# Set path to create the virtual environment with package name
-SYSTEM_PYTHON  = $(or $(shell which python3), $(shell which python))
+ifdef PYTHON3_VENV
-PYTHON         = $(or $(wildcard venv/bin/python), $(SYSTEM_PYTHON))
+VENV_PATH = $(PYTHON3_VENV)/$(PACKAGE)
-SYSTEM_PYUIC5  = $(shell which pyuic5)
+else
-PYUIC5         = $(or $(wildcard venv/bin/pyuic5), $(SYSTEM_PYUIC5))
+VENV_PATH = venv
-SYSTEM_PYRCC5  = $(shell which pyrcc5)
+endif
-PYRCC5         = $(or $(wildcard venv/bin/pyrcc5), $(SYSTEM_PYRCC5))
-SYSTEM_PYLUP5  = $(shell which pylupdate5)
-PYLUP5         = $(or $(wildcard venv/bin/pylupdate5), $(SYSTEM_PYLUP5))
 
-all: build_ui build_rc build
+# If virtualenv exists, use it. If not, use PATH to find commands
+SYSTEM_PYTHON  = python3
+PYTHON         = $(or $(wildcard $(VENV_PATH)/bin/python), $(SYSTEM_PYTHON))
+
+APP_VERSION = $(shell $(PYTHON) src/$(PACKAGE) --version)
+
+all: build_ui build_rc test build
 
 .PHONY: all
 
+## Environment
+venv-info:
+	echo Using path: "$(VENV_PATH)"
+	exit 0
+
+venv:
+	$(SYSTEM_PYTHON) -m venv --system-site-packages "$(VENV_PATH)"
+	source $(VENV_PATH)/bin/activate && \
+		python3 -m pip install --upgrade pip && \
+		python3 -m pip install -r requirements.txt
+	exit 0
+
+.PHONY: venv-info venv
+
 ## Compile Qt UI files to python code
 build_ui:
 	cd ui_dev && for ui_file in *.ui; do \
 		file_name=$${ui_file%.ui}; \
-		$(PYUIC5) $${ui_file} -o ../src/$(PACKAGE)/ui/$${file_name}_ui.py -x --from-imports; \
+		$(PYTHON) -m PyQt5.uic.pyuic $${ui_file} -o ../src/$(PACKAGE)/ui/$${file_name}_ui.py -x --from-imports; \
 		echo $${file_name}; \
 	done
 
 build_rc:
 	cd ui_dev && for rc_file in *.qrc; do \
 		file_name=$${rc_file%.qrc}; \
-		$(PYRCC5) $${rc_file} -o ../src/$(PACKAGE)/ui/$${file_name}_rc.py; \
+		$(PYTHON) -m PyQt5.pyrcc_main $${rc_file} -o ../src/$(PACKAGE)/ui/$${file_name}_rc.py; \
 		echo $${file_name}; \
 	done
 
 update_translation:
-	$(PYLUP5) translate.pro
+	$(PYTHON) -m PyQt5.pylupdate_main translate.pro
 
 .PHONY: build_ui build_rc update_translation
 
-## Environment
+## Build steps
-venv:
-	rm -rf venv
-	$(SYSTEM_PYTHON) -m venv venv
-
-deps:
-	$(PYTHON) -m pip install --upgrade pip -r requirements.txt
-
-.PHONY: venv deps
-
-## Build, install
 build: build_ui build_rc
 	$(PYTHON) -m setup sdist
 	$(PYTHON) -m setup bdist_wheel
 
-install:
+install: test build
 	$(PYTHON) -m pip install dist/$(PACKAGE)-*.whl
 
-.PHONY: build install
+uninstall:
+	$(PYTHON) -m pip uninstall --yes $(PACKAGE)
+
+.PHONY: test build install uninstall
 
 ## PyInstaller
-installer_mac: build
+installer_mac: build_ui build_rc
-	$(PYTHON) -m PyInstaller -n "RevPi Commander" \
+	$(PYTHON) -m PyInstaller -n $(APP_NAME) \
-		--add-data="src/$(PACKAGE)/locale:./revpicommander/locale" \
+		--add-data="src/$(PACKAGE)/locale:./$(PACKAGE)/locale" \
 		--add-data="data/$(PACKAGE).icns:." \
 		--icon=data/$(PACKAGE).icns \
 		--noconfirm \
 		--clean \
 		--onedir \
 		--windowed \
+		--osx-bundle-identifier $APP_IDENT \
+		--codesign-identity $(APPLE_SIG) \
 		src/$(PACKAGE)/__main__.py
 
-installer_win: all
+installer_mac_dmg: installer_mac
-	make_installer_win.bat
+	mkdir dist/dmg
+	mv dist/$(APP_NAME).app dist/dmg
+	create-dmg \
+		--volname $(APP_NAME) \
+		--background data/dmg_background.png \
+		--window-pos 200 120 \
+		--window-size 480 300 \
+		--icon-size 64 \
+		--icon $(APP_NAME).app 64 64 \
+		--hide-extension $(APP_NAME).app \
+		--app-drop-link 288 64 \
+		--add-file LICENSE.txt LICENSE.txt 192 180 \
+		--codesign $(APPLE_SIG) \
+		--notarize AC_PASSWORD \
+		dist/$(APP_NAME)\ $(APP_VERSION).dmg \
+		dist/dmg
 
-.PHONY: installer_mac installer_win
+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:
 	rm -rf build dist src/*.egg-info *.spec
 
-.PHONY: clean
+distclean: clean
+	rm -rf $(VENV_PATH)
+
+.PHONY: clean distclean

data/revpicommander

@@ -1,3 +1,7 @@
 #!/bin/sh
+# This script will create the entry point 'revpicommander', which is defined
+# in the setup.py script. If you want to install this python module as an
+# application and not in the python standard library directory, you will need
+# to use this script for /usr/bin.
 
-exec "/usr/share/revpicommander/revpicommander.py" "$@"
+exec python3 /usr/share/revpicommander/revpicommander "$@"

data/revpicommander.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=RevPi PLC Commander
+Name=RevPi Commander
 Comment=Controls the Python PLC program on your Revolution PI
 Comment[de]=Kontrolliert das Python PLC Programm auf dem Revolution PI
 Exec=/usr/bin/revpicommander
@@ -7,4 +7,3 @@ Icon=revpicommander
 Terminal=false
 Type=Application
 Categories=Application;
-#StartupNotify=true

debian/changelog

@@ -0,0 +1,98 @@
+revpicommander (0.10.0-2) stable; urgency=medium
+
+  [ Sven Sager ]
+  * Renamed version of revpipycontrol written with Qt framework
+  * Replace widget search to widget directory (performance)
+  * Replace widget search to widget dict (performance)
+  * WIP: GUI and base function from revpidevelop
+  * Bugfix: PyInstaller script
+  * Save IP address, not hostname of avahisearch.py found RevPi
+    (Windows will not resolve)
+  * WIP: revpifiles.py has all functions for PyLoad 0.9.2
+  * revpifiles.py is ready with PyLoad 0.9.3 functions
+  * files.ui Design change, cleanup
+  * String fields (> 4 Bytes) can be switched to numbers
+  * Load and display logfiles block by block
+  * Add option for software watchdog and driver reset action
+  * Destroy changed IOs after piCtory changes
+  * UI Text check and translation-de
+  * Bugfixes - IP regex, Queue handling, file upload
+  * UI Text check and translation-de
+  * Bugfix: Load locales file
+  * Remove included revpimodio2 static link and add it as requires
+  * New release
+  * Get AVAHI IPv4 addresses with service_info
+  * Bugfix for translations strings and format function
+  * Add parameter to change connection timeout (default was and
+    is 5 seconds)
+  * Add a simulator dialog to manage simulator settings
+  * Bugfix for simulator to prevent GUI crash after first use
+  * Modified translations
+  * New release
+  * Add upload progress display in developer, bugfix on file download in
+    developer
+  * Fix error on decoding broken log files
+  * Fix crash during add new connection
+  * Reduce max block to load for log files on slow networks
+  * Improved RevPi search window
+  * New release
+  * Fix error in debugios.py with long byte values
+  * Bugfix: RevPi simulator could not be startet without existing
+    proc.img file
+  * Design things: enable HighDpi, dependency versions, icon text
+  * Add Windows files for pyinstaller and setup generation
+  * Fix qt parents of menu entries in connections
+  * Improved shortcuts to meet the needs of different operating systems
+  * Implement update function of ZeroConf ServiceListener
+  * Redesign main window with text boxes to copy host name or ip
+  * Add translation of status codes
+  * Bugfix: could not open debugcontrol, because of new layout names
+  * Add context menu with copy and piCtory actions to revpi search dialog
+  * Switch project so src layout
+  * Switch to setuptools for setup.py
+  * Add icons to commander main window for start, stop and so on
+  * Update Makefile and requirements.txt for build and clean ui files
+  * Add PyInstaller script for Windows
+  * QTranslator uses ui_languages to find translation
+  * Use cm.call_remote_function to fetch log files via XML-RPC
+  * Prepare SSH tunnel server and password GUI
+  * Configure and start ssh tunneled connections
+  * Choose connection type (ssh or xml-rpc) in avahisearch dialog
+  * Update Makefile rules
+  * Update translation file
+  * Update Windows setup script to match pyinstaller output
+  * Manage revolution pi saved settings in an own class
+  * Change most button pressed event to clicked and add global shortcuts
+  * Set the use of ssh tunnel to default value for new settings
+  * Save SSH credentials with keyring module
+  * Show just the hostname without .local in avahisearch.py list
+  * Bugfix for new settings management
+  * Clean up keyring when a connection is deleted
+  * Move version number from revpicommander.py to __init__.py
+  * New async connection management with user feedback
+  * Connection list with add folder button and removed naming bug
+  * Move version number from __init__.py to __main__.py
+  * Adjustments for creating installations on various operating systems
+  * Bugfix: Add missing packages to install_requires
+  * Add option to switch word order on debugios
+  * Add pyinstaller option for linux platform
+  * Bugfix type hinting, PyLoad version handling, piCtory browser
+  * Update translation and messages
+  * Change license from GPLv3 to GPLv2 after approval of all contributors
+  * Replaces Master-Slave with Client-Server
+  * Bugfix in super call of backgroundworker.py
+  * Ignore ssh known_hosts from home directory, use own
+  * build: Use system python interpreter in make file
+  * fix: Show program dialog, even if there are no files on the RevPi
+  * chore: Release 0.10.0rc1
+  * fix: PLC monitor crashes when a device has no inputs or outputs
+  * build: Add environment variable to set alternative venv path
+  * feat: SSH tunnel server extended to execute commands on remote host.
+  * build: Use python interpreter and modules for qt commands in Makefile
+  * feat: Try to start RevPiPyLoad via SSH on the Revolution Pi
+  * fix: Simulator always sets process image to NULL
+  * build: Fix Makefile targets to match GNU coding standards
+  * chore: Release 0.10.0
+  * packaging(deb): Start packaging branch
+
+ -- Sven Sager <s.sager@kunbus.com>  Sat, 16 Sep 2023 14:10:12 +0200

debian/control

@@ -0,0 +1,32 @@
+Source: revpicommander
+Section: x11
+Priority: optional
+Maintainer: Sven Sager <akira@narux.de>
+Rules-Requires-Root: no
+Homepage: https://revpimodio.org/revpipyplc/
+Vcs-Browser: https://github.com/narux/revpicommander
+Vcs-Git: https://github.com/narux/revpicommander.git
+Build-Depends:
+  debhelper-compat (= 12),
+  dh-python,
+  python3-all,
+  python3-keyring (>= 17.1.1),
+  python3-pyqt5,
+  python3-paramiko (>= 2.4.2),
+  python3-revpimodio2 (>= 2.5.6),
+  python3-zeroconf (>= 0.24.4),
+  python3-setuptools,
+  python3-wheel
+Standards-Version: 4.3.0
+
+Package: revpicommander
+Architecture: all
+Depends:
+  ${python3:Depends},
+  ${misc:Depends}
+Description: GUI for Revolution Pi to upload programs and do IO-Checks
+ The RevPiCommander is a GUI tool to manage your revolution Pi over the
+ network. You can search for RevPis in your network, manage the settings
+ of RevPiPyLoad and do IO checks on your local machine. Developing your
+ control program is very easy with the developer, upload and debug it
+ over the network.

debian/copyright

@@ -0,0 +1,46 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://github.com/naruxde/revpicommander
+Upstream-Name: revpicommander
+Upstream-Contact: Sven Sager <akira@narux.de>
+
+Files: *
+Copyright: 2017-2023 Sven Sager
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2021-2023 KUNBUS GmbH
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GPL-3+
+ 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
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

debian/gbp.conf

@@ -0,0 +1,4 @@
+[DEFAULT]
+upstream-branch = main
+upstream-tag = %(version)s
+debian-branch=pkg/debian

debian/install

@@ -0,0 +1,3 @@
+data/revpicommander                 /usr/bin
+data/revpicommander.desktop         /usr/share/applications
+data/revpicommander.png             /usr/share/icons/hicolor/128x128/apps

debian/py3dist-overrides

@@ -0,0 +1 @@
+pyqt5 python3-pyqt5

debian/rules

@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+
+export PYBUILD_NAME=revpicommander
+
+# Install this module as an application an not into the python standard library path
+export PYBUILD_INSTALL_ARGS=--install-lib=/usr/share/revpicommander/ --install-scripts=/usr/share/revpicommander/bin/
+
+%:
+	dh $@ --with python3 --buildsystem=pybuild

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

make.bat

@@ -0,0 +1,39 @@
+@echo off
+set PACKAGE=revpicommander
+set APP_NAME=RevPi Commander
+
+if "%1" == "venv" goto venv
+if "%1" == "installer" goto installer
+if "%1" == "clean" goto clean
+
+echo Make script for "%APP_NAME%" on Windows
+echo.
+echo Need action:
+echo     venv        Create / update your virtual environment for build process
+echo     installer   Build this application with PyInstaller
+echo     clean       Clean up your environment after build process
+goto end
+
+:venv
+python -m venv venv
+venv\\Scripts\\pip.exe install --upgrade -r requirements.txt
+goto end
+
+:installer
+venv\\Scripts\\pyinstaller -n "%APP_NAME%" ^
+	--add-data="src\%PACKAGE%\locale;.\%PACKAGE%\locale" ^
+	--add-data="data\%PACKAGE%.ico;." ^
+	--icon=data\\%PACKAGE%.ico ^
+	--noconfirm ^
+	--clean ^
+	--onedir ^
+	--windowed ^
+	src\\%PACKAGE%\\__main__.py
+goto end
+
+:clean
+rmdir /S /Q build dist
+rmdir /S /Q src\%PACKAGE%.egg-info
+del *.spec
+
+:end

make_installer_win.bat

@@ -1,18 +0,0 @@
-@echo off
-set PACKAGE=revpicommander
-
-rem python -m venv venv
-rem venv\\Scripts\\activate.bat
-rem pip install -r requirements.txt
-
-pyinstaller -n "RevPi Commander" ^
-	--add-data="src\%PACKAGE%\locale;.\revpicommander\locale" ^
-	--add-data="data\%PACKAGE%.ico;." ^
-	--icon=data\\%PACKAGE%.ico ^
-	--noconfirm ^
-	--clean ^
-	--onedir ^
-	--windowed ^
-	src\\%PACKAGE%\\__main__.py
-
-rem deactivate

requirements.txt

@@ -1,7 +1,9 @@
-Pyinstaller
-PyQt5>=5.14.1
-revpimodio2>=2.5.6
-zeroconf>=0.24.4
 setuptools>=65.6.3
 wheel
+Pyinstaller
+
+keyring>=23.13.1
+PyQt5>=5.14.1
 paramiko>=2.12.0
+revpimodio2>=2.5.6
+zeroconf>=0.24.4

setup.iss

@@ -2,12 +2,13 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "RevPi Commander"
-#define MyAppVersion "0.9.10rc1"
+#define MyAppVersion "0.10.0"
 #define MyAppPublisher "Sven Sager"
 #define MyAppURL "https://revpimodio.org/"
 #define MyAppICO "data\revpicommander.ico"
 
 [Setup]
+SignTool=kSign
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{21E8D429-0C18-462F-AFC0-56EA664DE629}

setup.py

@@ -1,46 +1,50 @@
 # -*- 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
 
+from src.revpicommander import __version__
+
 setup(
     name="revpicommander",
-    version="0.9.10rc1",
+    version=__version__,
 
     packages=find_namespace_packages("src"),
     package_dir={'': 'src'},
     include_package_data=True,
 
     install_requires=[
+        "keyring",
         "PyQt5",
+        "paramiko",
         "revpimodio2",
         "zeroconf"
     ],
     entry_points={
-        'console_scripts': [
-            'revpicommander = revpicommander.revpicommander:main',
-        ],
         'gui_scripts': [
-            'RevPiCommander = revpicommander.revpicommander:main',
+            'revpicommander = revpicommander.revpicommander:main',
         ],
     },
 
+    platforms=["all"],
+
     url="https://revpimodio.org/revpipyplc/",
-    license="GPLv3",
+    license="GPLv2",
     author="Sven Sager",
     author_email="akira@narux.de",
     maintainer="Sven Sager",
     maintainer_email="akira@revpimodio.org",
     description="GUI for Revolution Pi to upload programs and do IO-Checks",
-    long_description="The RevPiCommander is a GUI tool to manage your revolution Pi over the\n"
+    long_description="The RevPiCommander is a GUI tool to manage your Revolution Pi over the\n"
                      "network. You can search for RevPis in your network, manage the settings\n"
                      "of RevPiPyLoad and do IO checks on your local machine. Developing your\n"
                      "control program is very easy with the developer, upload and debug it\n"
                      "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)",
     ],
 )

src/revpicommander/__init__.py

@@ -2,4 +2,6 @@
 """Package: RevPiCommander."""
 __author__ = "Sven Sager"
 __copyright__ = "Copyright (C) 2023 Sven Sager"
-__license__ = "GPLv3"
+__license__ = "GPLv2"
+__package__ = "revpicommander"
+__version__ = "0.10.0"

src/revpicommander/__main__.py

@@ -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__ == "":
@@ -16,6 +16,14 @@ if __package__ == "":
 
 if __name__ == "__main__":
     import sys
+
+    if len(sys.argv) == 2 and "--version" in sys.argv:
+        # Catch --version, if this is the only argument (sys.argv[0] is always the script name)
+        from revpicommander import __version__
+        print(__version__)
+        sys.exit(0)
+
+    else:
         from revpicommander.revpicommander import main
 
         # Run the main application of this package

src/revpicommander/aclmanager.py

@@ -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
 
@@ -16,7 +16,7 @@ class AclManager(QtWidgets.QDialog, Ui_diag_aclmanager):
     """ACL manager."""
 
     def __init__(self, parent=None):
-        super(AclManager, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         self.setFixedSize(self.size())
 
@@ -85,13 +85,13 @@ class AclManager(QtWidgets.QDialog, Ui_diag_aclmanager):
                 )
             ) == QtWidgets.QMessageBox.Yes
             if ask:
-                self.on_btn_add_pressed()
+                self.on_btn_add_clicked()
 
         if self.__check_load_error():
             return
 
         self.__oldacl = self.__table_to_acl()
-        super(AclManager, self).accept()
+        super().accept()
 
     def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
         if self._changes_done():
@@ -107,12 +107,12 @@ class AclManager(QtWidgets.QDialog, Ui_diag_aclmanager):
                 a0.ignore()
 
     def exec(self) -> int:
-        return super(AclManager, self).exec()
+        return super().exec()
 
     def reject(self) -> None:
         """Restore old settings."""
         self.setup_acl_manager(self.__oldacl, self.__dict_acltext)
-        super(AclManager, self).reject()
+        super().reject()
 
     def setup_acl_manager(self, acl_string: str, acl_texts: dict):
         if type(acl_string) != str:
@@ -252,11 +252,11 @@ class AclManager(QtWidgets.QDialog, Ui_diag_aclmanager):
         self.btn_remove.setEnabled(not self.__read_only and selected_rows > 0)
 
     @QtCore.pyqtSlot()
-    def on_btn_edit_pressed(self):
+    def on_btn_edit_clicked(self):
         self.__load_selected_entry()
 
     @QtCore.pyqtSlot()
-    def on_btn_remove_pressed(self):
+    def on_btn_remove_clicked(self):
         lst_selected_row_indexes = [mi.row() for mi in self.tb_acls.selectionModel().selectedRows(0)]
         if len(lst_selected_row_indexes) == 0:
             return
@@ -355,7 +355,7 @@ class AclManager(QtWidgets.QDialog, Ui_diag_aclmanager):
         self._check_all_filled()
 
     @QtCore.pyqtSlot()
-    def on_btn_add_pressed(self):
+    def on_btn_add_clicked(self):
         """Add a new entry to acl table."""
         ip_level = "{0}.{1}.{2}.{3},{4}".format(
             self.txt_ip_a.text(),
@@ -366,7 +366,7 @@ class AclManager(QtWidgets.QDialog, Ui_diag_aclmanager):
         )
         if self.__re_ipacl.match(ip_level):
             self.__table_add_acl(ip_level)
-            self.on_btn_clear_pressed()
+            self.on_btn_clear_clicked()
         else:
             QtWidgets.QMessageBox.critical(
                 self, self.tr("Error"), self.tr(
@@ -376,7 +376,7 @@ class AclManager(QtWidgets.QDialog, Ui_diag_aclmanager):
             )
 
     @QtCore.pyqtSlot()
-    def on_btn_clear_pressed(self):
+    def on_btn_clear_clicked(self):
         """Clear entry widgets."""
         self.txt_ip_a.clear()
         self.txt_ip_b.clear()

src/revpicommander/avahisearch.py

@@ -2,43 +2,21 @@
 """Revolution Pi search with zeroconf."""
 __author__ = "Sven Sager"
 __copyright__ = "Copyright (C) 2023 Sven Sager"
-__license__ = "GPLv3"
+__license__ = "GPLv2"
 
 import webbrowser
-from os import name as osname
 from re import compile
 from sys import platform
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 from zeroconf import IPVersion, ServiceBrowser, Zeroconf
 
+from . import helper
 from . import proginit as pi
-from .helper import WidgetData, settings
+from .helper import RevPiSettings, WidgetData, all_revpi_settings
 from .ui.avahisearch_ui import Ui_diag_search
 
 
-def find_settings_index(address: str, port: int) -> int:
-    """
-    Search index of saved settings.
-
-    :param address: Host or IP address of Revolution Pi
-    :param port: Port to connect
-    :return: Index of settings array or -1, if not found
-    """
-    settings_index = -1
-    for i in range(settings.beginReadArray("connections")):
-        settings.setArrayIndex(i)
-
-        _address = settings.value("address", type=str)
-        _port = settings.value("port", type=int)
-        if address.lower() == _address.lower() and port == _port:
-            settings_index = i
-            break
-
-    settings.endArray()
-    return settings_index
-
-
 class AvahiSearchThread(QtCore.QThread):
     """Search thread for Revolution Pi with installed RevPiPyLoad."""
     added = QtCore.pyqtSignal(str, str, int, str, str)
@@ -46,33 +24,14 @@ class AvahiSearchThread(QtCore.QThread):
     updated = QtCore.pyqtSignal(str, str, int, str, str)
 
     def __init__(self, parent=None):
-        super(AvahiSearchThread, self).__init__(parent)
+        super().__init__(parent)
         self._cycle_wait_ms = 1000
 
-        self.__dict_arp = {}
         self.re_posix = compile(
             r"(?P<ip>(\d{1,3}\.){3}\d{1,3}).*"
             r"(?P<mac>([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2})"
         )
 
-    def _update_arp(self) -> None:
-        """Find mac address in arp table."""
-        if osname == "posix":
-            with open("/proc/net/arp") as fh:
-                for line in fh.readlines():
-                    ip_mac = self.re_posix.search(line)
-                    if ip_mac:
-                        self.__dict_arp[ip_mac.group("ip")] = ip_mac.group("mac")
-
-    def get_mac(self, ip: str) -> dict:
-        """
-        Get mac address of ip, if known.
-
-        :param ip: IP address to find mac address
-        :return: MAC address as string or empty string, if unknown
-        """
-        return self.__dict_arp.get(ip, "")
-
     def remove_service(self, zeroconf: Zeroconf, conf_type: str, name: str) -> None:
         """Revolution Pi disappeared."""
         pi.logger.debug("AvahiSearchThread.remove_service")
@@ -112,20 +71,23 @@ class AvahiSearchThread(QtCore.QThread):
 class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
 
     def __init__(self, parent=None):
-        super(AvahiSearch, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
+        # Global variables to let parent decide other actions
+        self.connect_settings = None
+        self.just_save = False
+
+        # Local variables
         self.clipboard = QtGui.QGuiApplication.clipboard()
-        self.connect_index = -1
+        self._th_zero_conf = AvahiSearchThread(self)
-        self.known_hosts = {}
-        self.th_zero_conf = AvahiSearchThread(self)
 
         self.tb_revpi.setColumnWidth(0, 250)
         self.btn_connect.setEnabled(False)
         self.btn_save.setEnabled(False)
 
-        self.restoreGeometry(settings.value("avahisearch/geo", b''))
+        self.restoreGeometry(helper.settings.value("avahisearch/geo", b''))
-        column_sizes = settings.value("avahisearch/column_sizes", [], type=list)
+        column_sizes = helper.settings.value("avahisearch/column_sizes", [], type=list)
         if len(column_sizes) == self.tb_revpi.columnCount():
             for i in range(self.tb_revpi.columnCount()):
                 self.tb_revpi.setColumnWidth(i, int(column_sizes[i]))
@@ -136,174 +98,148 @@ class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
         self.cm_connect_actions.addAction(self.act_connect_xmlrpc)
 
         self.cm_quick_actions = QtWidgets.QMenu(self)
-        self.cm_quick_actions.addAction(self.act_open_pictory)
+        self.cm_quick_actions.addAction(self.act_connect)
-        self.cm_quick_actions.addSeparator()
-        self.cm_quick_actions.addAction(self.act_copy_ip)
-        self.cm_quick_actions.addAction(self.act_copy_host)
-        self.cm_quick_actions.addSeparator()
         self.cm_quick_actions.addAction(self.act_connect_ssh)
         self.cm_quick_actions.addAction(self.act_connect_xmlrpc)
+        self.cm_quick_actions.addSeparator()
+        self.cm_quick_actions.addAction(self.act_open_pictory)
+        self.cm_quick_actions.addSeparator()
+        self.cm_quick_actions.addAction(self.act_copy_host)
+        self.cm_quick_actions.addAction(self.act_copy_ip)
 
         self.tb_revpi.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
         self.tb_revpi.customContextMenuRequested.connect(self._cm_quick_exec)
 
-    @QtCore.pyqtSlot(QtCore.QPoint)
-    def _cm_connect_exec(self, position: QtCore.QPoint) -> None:
-        row = self.tb_revpi.currentRow()
-        if row == -1:
-            return
-
-        item = self.tb_revpi.item(row, 0)
-        settings_index = find_settings_index(item.data(WidgetData.address), item.data(WidgetData.port))
-        if settings_index >= 0:
-            self.connect_index = settings_index
-            self.accept()
-            return
-
-        action = self.cm_connect_actions.exec(position)
-        if action:
-            action.trigger()
-
     @QtCore.pyqtSlot(QtCore.QPoint)
     def _cm_quick_exec(self, position: QtCore.QPoint) -> None:
-        if self.tb_revpi.currentItem() is None:
+        selected_items = self.tb_revpi.selectedItems()
+        if not selected_items:
             return
+        item = selected_items[0]
+
+        revpi_settings = bool(item.data(WidgetData.revpi_settings))
+        self.act_connect.setVisible(revpi_settings)
+        self.act_connect_ssh.setVisible(not revpi_settings)
+        self.act_connect_xmlrpc.setVisible(not revpi_settings)
 
         sender = self.sender()
-        action = self.cm_quick_actions.exec(sender.mapToGlobal(position))
+        self.cm_quick_actions.exec(sender.mapToGlobal(position))
-        if action:
-            action.trigger()
 
-    def _load_known_hosts(self) -> None:
+        self.act_connect.setVisible(True)
-        """Load existing connections to show hostname of existing ip addresses"""
+        self.act_connect_ssh.setVisible(True)
-        self.known_hosts.clear()
+        self.act_connect_xmlrpc.setVisible(True)
 
-        for i in range(settings.beginReadArray("connections")):
+    @staticmethod
-            settings.setArrayIndex(i)
+    def _find_settings(address: str):
-
+        """Find all settings with known avahi_id."""
-            name = settings.value("name", type=str)
+        return [
-            folder = settings.value("folder", type=str)
+            revpi_setting
-            address = settings.value("address", type=str)
+            for revpi_setting in all_revpi_settings()
-            self.known_hosts[address] = "{0}/{1}".format(folder, name) if folder else name
+            if revpi_setting.address.lower() == address.lower()
-
+        ]
-        settings.endArray()
 
     def _restart_search(self) -> None:
         """Clean up and restart search thread."""
         while self.tb_revpi.rowCount() > 0:
+            # Remove each row, a .clean would destroy the columns
             self.tb_revpi.removeRow(0)
-        self.th_zero_conf.requestInterruption()
 
-        self.th_zero_conf = AvahiSearchThread(self)
+        self._th_zero_conf.requestInterruption()
-        self.th_zero_conf.added.connect(self.on_avahi_added)
-        self.th_zero_conf.updated.connect(self.on_avahi_added)
-        self.th_zero_conf.removed.connect(self.on_avahi_removed)
-        self.th_zero_conf.start()
 
-    def _save_connection(self, row: int, ssh_tunnel: bool, no_warn=False) -> int:
+        self._th_zero_conf = AvahiSearchThread(self)
+        self._th_zero_conf.added.connect(self.on_avahi_added)
+        self._th_zero_conf.updated.connect(self.on_avahi_added)
+        self._th_zero_conf.removed.connect(self.on_avahi_removed)
+        self._th_zero_conf.start()
+
+    def _create_settings_object(self, row: int, ssh_tunnel: bool) -> RevPiSettings or None:
         """
-        Save the connection from given row to settings.
+        Create settings object from given row to settings.
 
         :param row: Row with connection data
         :param ssh_tunnel: Save as SSH tunnel connection
-        :param no_warn: If True, no message boxes will appear
+        :return: RevPi settings with data from avahi search and default values
-        :return: Array index of connection (found or saved) or -1
         """
         item = self.tb_revpi.item(row, 0)
         if not item:
-            return -1
+            return None
 
-        folder_name = self.tr("Auto discovered")
+        settings = RevPiSettings()
-        selected_name = item.text()
+        settings.folder = self.tr("Auto discovered")
-        selected_address = item.data(WidgetData.address)
+        settings.name = item.data(WidgetData.host_name)
-        selected_port = item.data(WidgetData.port)
+        settings.address = item.data(WidgetData.address)
-        i = 0
+        settings.port = item.data(WidgetData.port)
-        for i in range(settings.beginReadArray("connections")):
+        settings.ssh_use_tunnel = ssh_tunnel
-            settings.setArrayIndex(i)
 
-            name = settings.value("name", type=str)
+        return settings
-            address = settings.value("address", type=str)
-            port = settings.value("port", type=int)
-            if address.lower() == selected_address.lower() and port == selected_port:
-                if not no_warn:
-                    QtWidgets.QMessageBox.information(
-                        self, self.tr("Already in list..."), self.tr(
-                            "The selected Revolution Pi is already saved in your "
-                            "connection list as '{0}'."
-                        ).format(name)
-                    )
-                settings.endArray()
-                return i
-
-        settings.endArray()
-        settings.beginWriteArray("connections")
-
-        settings.setArrayIndex(i + 1)
-        settings.setValue("address", selected_address)
-        settings.setValue("folder", folder_name)
-        settings.setValue("name", selected_name)
-        settings.setValue("port", selected_port)
-
-        settings.setValue("ssh_use_tunnel", ssh_tunnel)
-        settings.setValue("ssh_port", 22)
-        settings.setValue("ssh_user", "pi")
-
-        settings.endArray()
-
-        if not no_warn:
-            QtWidgets.QMessageBox.information(
-                self, self.tr("Success"), self.tr(
-                    "The connection with the name '{0}' was successfully saved "
-                    "to folder '{1}' in your connections."
-                ).format(selected_name, folder_name)
-            )
-
-        return i + 1
 
     def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
-        settings.setValue("avahisearch/geo", self.saveGeometry())
+        helper.settings.setValue("avahisearch/geo", self.saveGeometry())
-        settings.setValue("avahisearch/column_sizes", [
+        helper.settings.setValue("avahisearch/column_sizes", [
             self.tb_revpi.columnWidth(i)
             for i in range(self.tb_revpi.columnCount())
         ])
 
     def exec(self) -> int:
-        self._load_known_hosts()
+        self.connect_settings = None
+        self.just_save = False
         self._restart_search()
-        rc = super(AvahiSearch, self).exec()
+        rc = super().exec()
-        self.th_zero_conf.requestInterruption()
+        self._th_zero_conf.requestInterruption()
         return rc
 
     @QtCore.pyqtSlot()
-    def on_act_connect_ssh_triggered(self) -> None:
+    def on_act_connect_triggered(self) -> None:
-        """Copy ip address of selected item to clipboard."""
+        """Connect via existing settings or ask for type."""
-        pi.logger.debug("AvahiSearch.on_act_connect_ssh_triggered")
+        pi.logger.debug("AvahiSearch.on_act_connect_triggered")
-        if self.tb_revpi.currentRow() == -1:
-            return
-        self.connect_index = self._save_connection(self.tb_revpi.currentRow(), True, no_warn=True)
-        self.accept()
-
-    @QtCore.pyqtSlot()
-    def on_act_connect_xmlrpc_triggered(self) -> None:
-        """Copy ip address of selected item to clipboard."""
-        pi.logger.debug("AvahiSearch.on_act_connect_xmlrpc_triggered")
-        if self.tb_revpi.currentRow() == -1:
-            return
-        self.connect_index = self._save_connection(self.tb_revpi.currentRow(), False, no_warn=True)
-        self.accept()
-
-    @QtCore.pyqtSlot()
-    def on_act_copy_host_triggered(self) -> None:
-        """Copy ip address of selected item to clipboard."""
         selected_items = self.tb_revpi.selectedItems()
         if not selected_items:
             return
         item = selected_items[0]
-        host_name = item.data(WidgetData.host_name)
+
-        if platform == "win32":
+        revpi_settings = item.data(WidgetData.revpi_settings)  # type: RevPiSettings
-            # Strip hostname on Windows systems, it can not resolve .local addresses
+        if not revpi_settings:
-            host_name = host_name[:host_name.find(".")]
+            return
-        self.clipboard.setText(host_name)
+        self.connect_settings = revpi_settings
+        self.accept()
+
+    @QtCore.pyqtSlot()
+    def on_act_connect_ssh_triggered(self) -> None:
+        """Create new revpi settings with ssh, save and connect."""
+        pi.logger.debug("AvahiSearch.on_act_connect_ssh_triggered")
+        if self.tb_revpi.currentRow() == -1:
+            return
+
+        revpi_settings = self._create_settings_object(self.tb_revpi.currentRow(), True)
+        revpi_settings.save_settings()
+        self.connect_settings = revpi_settings
+        self.accept()
+
+    @QtCore.pyqtSlot()
+    def on_act_connect_xmlrpc_triggered(self) -> None:
+        """Create new revpi settings with XML-RPC, save and connect."""
+        pi.logger.debug("AvahiSearch.on_act_connect_xmlrpc_triggered")
+        if self.tb_revpi.currentRow() == -1:
+            return
+
+        revpi_settings = self._create_settings_object(self.tb_revpi.currentRow(), False)
+        revpi_settings.save_settings()
+        self.connect_settings = revpi_settings
+        self.accept()
+
+    @QtCore.pyqtSlot()
+    def on_act_copy_host_triggered(self) -> None:
+        """Copy hostname of selected item to clipboard."""
+        selected_items = self.tb_revpi.selectedItems()
+        if not selected_items:
+            return
+        item = selected_items[0]
+
+        # Use just the hostname on Windows systems, it can not resolve .local addresses
+        self.clipboard.setText(
+            item.data(WidgetData.host_name) if platform == "win32"
+            else item.data(WidgetData.host_name_full)
+        )
 
     @QtCore.pyqtSlot()
     def on_act_copy_ip_triggered(self) -> None:
@@ -321,51 +257,74 @@ class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
         if not selected_items:
             return
         item = selected_items[0]
-        if platform == "win32":
+
-            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)
-        else:
+        webbrowser.open("http://{0}/".format(item.data(
-            webbrowser.open("http://{0}/".format(item.data(WidgetData.host_name)))
+            WidgetData.address if platform == "win32"
+            else WidgetData.host_name_full
+        )))
 
     @QtCore.pyqtSlot(str, str, int, str, str)
-    def on_avahi_added(self, name: str, server: str, port: int, conf_type: str, ip: str) -> None:
+    def on_avahi_added(self, avahi_id: str, server: str, port: int, conf_type: str, ip: str) -> None:
         """New Revolution Pi found."""
-        index = -1
-        for i in range(self.tb_revpi.rowCount()):
-            if self.tb_revpi.item(i, 0).data(WidgetData.object_name) == name:
-                index = i
-                break
 
-        if index == -1:
+        def update_tb_revpi_row(row_index: int):
-            # New Row
+            host_name_full = server[:-1]
+            host_name = host_name_full[:host_name_full.find(".")]
+
+            item_name = self.tb_revpi.item(row_index, 0)
+            item_name.setData(WidgetData.address, ip)
+            item_name.setData(WidgetData.port, port)
+            item_name.setData(WidgetData.host_name_full, host_name_full)
+            item_name.setData(WidgetData.host_name, host_name)
+
+            revpi_settings = item_name.data(WidgetData.revpi_settings)  # type: RevPiSettings
+            if revpi_settings:
+                # Generate the name of saved revpi and show the avahi-name in brackets
+                settings_text = "{0}/{1}".format(revpi_settings.folder, revpi_settings.name) \
+                    if revpi_settings.folder \
+                    else revpi_settings.name
+                if revpi_settings.ssh_use_tunnel:
+                    settings_text += self.tr(" over SSH")
+                item_name.setText("{0} ({1})".format(settings_text, host_name))
+            else:
+                item_name.setText(host_name)
+            item_name.setToolTip(item_name.text())
+
+            item_ip = self.tb_revpi.item(row_index, 1)
+            item_ip.setText(ip)
+            item_ip.setToolTip(item_name.text())
+
+        lst_existing = self._find_settings(ip)
+
+        exists = False
+        for i in range(self.tb_revpi.rowCount()):
+            item_tb_revpi = self.tb_revpi.item(i, 0)
+            if item_tb_revpi.data(WidgetData.object_name) == avahi_id:
+                # Object already discovered
+                update_tb_revpi_row(i)
+                exists = True
+
+        if not exists:
+            for known_settings in lst_existing or [None]:
                 item_name = QtWidgets.QTableWidgetItem()
-            item_ip = QtWidgets.QTableWidgetItem()
+
+                item_name.setIcon(QtGui.QIcon(":/main/ico/cpu.ico"))
+                item_name.setData(WidgetData.object_name, avahi_id)
+                item_name.setData(WidgetData.revpi_settings, known_settings)
 
                 index = self.tb_revpi.rowCount()
                 self.tb_revpi.insertRow(index)
                 self.tb_revpi.setItem(index, 0, item_name)
-            self.tb_revpi.setItem(index, 1, item_ip)
+                self.tb_revpi.setItem(index, 1, QtWidgets.QTableWidgetItem())
-        else:
-            # Update row
-            item_name = self.tb_revpi.item(index, 0)
-            item_ip = self.tb_revpi.item(index, 1)
 
-        host_name = server[:-1]
+                update_tb_revpi_row(index)
-        item_name.setIcon(QtGui.QIcon(":/main/ico/cpu.ico"))
-        if ip in self.known_hosts:
-            item_name.setText("{0} ({1})".format(host_name, self.known_hosts[ip]))
-        else:
-            item_name.setText(host_name)
-        item_name.setData(WidgetData.object_name, name)
-        item_name.setData(WidgetData.address, ip)
-        item_name.setData(WidgetData.port, port)
-        item_name.setData(WidgetData.host_name, host_name)
-        item_ip.setText(ip)
 
     @QtCore.pyqtSlot(str, str)
-    def on_avahi_removed(self, name: str, conf_type: str) -> None:
+    def on_avahi_removed(self, avahi_id: str, conf_type: str) -> None:
         """Revolution Pi disappeared."""
         for i in range(self.tb_revpi.rowCount()):
-            if self.tb_revpi.item(i, 0).data(WidgetData.object_name) == name:
+            if self.tb_revpi.item(i, 0).data(WidgetData.object_name) == avahi_id:
                 self.tb_revpi.removeRow(i)
                 break
 
@@ -373,8 +332,17 @@ class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
     def on_tb_revpi_cellDoubleClicked(self, row: int, column: int) -> None:
         """Connect to double-clicked Revolution Pi."""
         pi.logger.debug("AvahiSearch.on_tb_revpi_cellDoubleClicked")
+        selected_items = self.tb_revpi.selectedItems()
+        if not selected_items:
+            return
+        item = selected_items[0]
+
+        revpi_settings = bool(item.data(WidgetData.revpi_settings))
+        if revpi_settings:
+            self.act_connect.trigger()
+        else:
             cur = QtGui.QCursor()
-        self._cm_connect_exec(cur.pos())
+            self.cm_connect_actions.exec(cur.pos())
 
     @QtCore.pyqtSlot(int, int, int, int)
     def on_tb_revpi_currentCellChanged(self, row: int, column: int, last_row: int, last_column: int) -> None:
@@ -386,18 +354,29 @@ class AvahiSearch(QtWidgets.QDialog, Ui_diag_search):
     def on_btn_connect_clicked(self) -> None:
         """Connect to selected Revolution Pi."""
         pi.logger.debug("AvahiSearch.on_btn_connect_clicked")
-        # Open context menu under the button
+        selected_items = self.tb_revpi.selectedItems()
-        pos = self.btn_connect.pos()
+        if not selected_items:
-        pos.setY(pos.y() + self.btn_connect.height())
+            return
-        self._cm_connect_exec(self.mapToGlobal(pos))
+        item = selected_items[0]
+
+        revpi_settings = bool(item.data(WidgetData.revpi_settings))
+        if revpi_settings:
+            self.act_connect.trigger()
+        else:
+            pos_context_menu = self.btn_connect.pos()
+            pos_context_menu.setY(pos_context_menu.y() + self.btn_connect.height())
+            self.cm_connect_actions.exec(self.mapToGlobal(pos_context_menu))
 
     @QtCore.pyqtSlot()
     def on_btn_save_clicked(self) -> None:
         """Save selected Revolution Pi."""
         pi.logger.debug("AvahiSearch.on_btn_save_clicked")
-        if self.tb_revpi.currentRow() == -1:
+        row_index = self.tb_revpi.currentRow()
+        if row_index == -1:
             return
-        self.connect_index = self._save_connection(self.tb_revpi.currentRow(), ssh_tunnel=True)
+        self.connect_settings = self._create_settings_object(row_index, True)
+        self.just_save = True
+        self.accept()
 
     @QtCore.pyqtSlot()
     def on_btn_restart_clicked(self) -> None:

src/revpicommander/backgroundworker.py

@@ -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
 
@@ -18,8 +18,9 @@ class BackgroundWorker(QtCore.QThread):
     steps_done = QtCore.pyqtSignal(int)
     status_message = QtCore.pyqtSignal(str)
 
-    def __init__(self, parent=None):
+    def __init__(self, parent=None, interruption_text: str = None):
-        super(BackgroundWorker, self).__init__(parent)
+        super().__init__(parent)
+        self._interruption_text = interruption_text or self.tr("User requested cancellation...")
 
     def check_cancel(self) -> bool:
         """
@@ -28,33 +29,67 @@ class BackgroundWorker(QtCore.QThread):
         :return: True, if interruption was requested
         """
         if self.isInterruptionRequested():
-            self.status_message.emit(self.tr("User requested cancellation..."))
+            self.status_message.emit(self._interruption_text)
             self.msleep(750)
             return True
         return False
 
-    def exec_dialog(self) -> int:
+    def exec_dialog(self, window_title="", can_cancel=True) -> int:
+        """
+        Show dialog with progress bar.
+
+        :param window_title: Title of Dialog window
+        :param can_cancel: If False, the cancel button is deactivated
+        :return: Dialog result
+        """
         diag = WorkerDialog(self, self.parent())
+        diag.setWindowTitle(window_title)
+        diag.btn_box.setEnabled(can_cancel)
         rc = diag.exec()
         diag.deleteLater()
         return rc
 
-    def wait_interruptable(self, seconds=-1) -> None:
+    def wait_interruptable(self, seconds=-1) -> bool:
-        """Save function to wait and get the cancel buttons."""
+        """
+        Save function to wait and get the cancel buttons.
+
+        :param seconds: Wait this amount of seconds
+        :return: True, if interruption was requested
+        """
         counter = seconds * 4
         while counter != 0:
             counter -= 1
             self.msleep(250)
-            if self._check_cancel():
+            if self.check_cancel():
-                break
+                return True
+        return False
 
     def run(self) -> None:
-        """Worker thread to import pictures from camera."""
+        """Override this function with your logic."""
-        log.debug("BackgroundWorker.run")
+        raise NotImplementedError()
-        self.status_message.emit("Started dummy thread...")
+
-        self.wait_interruptable(5)
+
-        self.status_message.emit("Completed dummy thread.")
+class BackgroundWaiter(BackgroundWorker):
-        self._save_wait(3)
+    """Just wait an amount of time and show progress bar."""
+
+    def __init__(self, seconds: int, status_message: str, parent=None, interruption_text: str = None):
+        super().__init__(parent, interruption_text)
+        self._status_message = status_message
+        self._wait_steps = seconds * 4
+
+    def run(self) -> None:
+        log.debug("BackgroundWaiter.run")
+        self.steps_todo.emit(self._wait_steps)
+        self.status_message.emit(self._status_message)
+        counter = 0
+        while counter <= self._wait_steps:
+            counter += 1
+            self.msleep(250)
+            if self.isInterruptionRequested():
+                self.steps_done.emit(self._wait_steps)
+            if self.check_cancel():
+                return
+            self.steps_done.emit(counter)
 
 
 class WorkerDialog(QtWidgets.QDialog, Ui_diag_backgroundworker):
@@ -66,7 +101,7 @@ class WorkerDialog(QtWidgets.QDialog, Ui_diag_backgroundworker):
         :param worker_thread: Thread with the logic work to do
         :param parent: QtWidget
         """
-        super(WorkerDialog, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         self._canceled = False
@@ -82,7 +117,7 @@ class WorkerDialog(QtWidgets.QDialog, Ui_diag_backgroundworker):
 
     def exec(self) -> int:
         self._th.start()
-        return super(WorkerDialog, self).exec()
+        return super().exec()
 
     @QtCore.pyqtSlot()
     def on_th_finished(self) -> None:

src/revpicommander/debugcontrol.py

@@ -2,14 +2,14 @@
 """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
 
-from PyQt5 import QtCore, QtWidgets
+from PyQt5 import QtCore, QtGui, QtWidgets
 
-from .import helper
+from . import helper
 from . import proginit as pi
 from .debugios import DebugIos
 from .ui.debugcontrol_ui import Ui_wid_debugcontrol
@@ -26,7 +26,7 @@ class PsValues(QtCore.QThread):
     process_image_received = QtCore.pyqtSignal(Binary)
 
     def __init__(self):
-        super(PsValues, self).__init__()
+        super().__init__()
         self._cycle_time = 200
 
     def run(self):
@@ -55,7 +55,7 @@ class DebugControl(QtWidgets.QWidget, Ui_wid_debugcontrol):
     """Debug controller for main window."""
 
     def __init__(self, parent=None):
-        super(DebugControl, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         self.dict_devices = {}
@@ -74,7 +74,17 @@ class DebugControl(QtWidgets.QWidget, Ui_wid_debugcontrol):
             QtWidgets.QSpacerItem(20, 1, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
         )
         self.cbx_write.setEnabled(False)
-        self.cbx_stay_on_top.setChecked(helper.settings.value("stay_on_top", False, bool))
+        self.cbx_stay_on_top.setChecked(helper.settings.value("debugcontrol/stay_on_top", False, bool))
+
+        self.shc_read_io = QtWidgets.QShortcut(QtGui.QKeySequence("F4"), self)
+        self.shc_read_io.setContext(QtCore.Qt.ApplicationShortcut)
+        self.shc_read_io.activated.connect(self.on_btn_read_io_pressed)
+        self.shc_refresh_io = QtWidgets.QShortcut(QtGui.QKeySequence("F5"), self)
+        self.shc_refresh_io.setContext(QtCore.Qt.ApplicationShortcut)
+        self.shc_refresh_io.activated.connect(self.on_btn_refresh_io_pressed)
+        self.shc_write_o = QtWidgets.QShortcut(QtGui.QKeySequence("F6"), self)
+        self.shc_write_o.setContext(QtCore.Qt.ApplicationShortcut)
+        self.shc_write_o.activated.connect(self.on_btn_write_o_clicked)
 
     def __del__(self):
         pi.logger.debug("DebugControl.__del__")
@@ -187,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
@@ -273,7 +284,7 @@ class DebugControl(QtWidgets.QWidget, Ui_wid_debugcontrol):
         self.cbx_refresh.setChecked(False)
         self._destroy_io_view()
 
-        super(DebugControl, self).deleteLater()
+        super().deleteLater()
 
     def reload_devices(self):
         """Rebuild GUI depending on devices and ios of Revolution Pi."""
@@ -323,8 +334,6 @@ class DebugControl(QtWidgets.QWidget, Ui_wid_debugcontrol):
                 dict_inps[position], dict_outs[position]
             )
             win.device_closed.connect(self.on_device_closed)
-            win.do_read.connect(self.btn_refresh_io.pressed)
-            win.do_write.connect(self.btn_write_o.pressed)
             self.dict_windows[position] = win
 
             btn = QtWidgets.QPushButton(self.gb_devices)
@@ -342,7 +351,7 @@ class DebugControl(QtWidgets.QWidget, Ui_wid_debugcontrol):
         self._work_values(refresh=True)
         self._set_gui_control_states()
 
-        self.cbx_refresh.setChecked(helper.settings.value("auto_refresh", False, bool))
+        self.cbx_refresh.setChecked(helper.settings.value("debugcontrol/auto_refresh", False, bool))
 
         return True
 
@@ -380,9 +389,9 @@ class DebugControl(QtWidgets.QWidget, Ui_wid_debugcontrol):
             self._work_values(refresh=True)
 
     @QtCore.pyqtSlot()
-    def on_btn_write_o_pressed(self):
+    def on_btn_write_o_clicked(self):
         """Write outputs."""
-        pi.logger.debug("DebugControl.on_btn_write_o_pressed")
+        pi.logger.debug("DebugControl.on_btn_write_o_clicked")
         if not self.cbx_write.isChecked() and (helper.cm.xml_mode >= 3 or helper.cm.simulating):
             for win in self.dict_windows.values():  # type: DebugIos
                 win.reset_label_colors()
@@ -415,12 +424,12 @@ class DebugControl(QtWidgets.QWidget, Ui_wid_debugcontrol):
     @QtCore.pyqtSlot(bool)
     def on_cbx_refresh_clicked(self, state: bool):
         """Save the state on user action."""
-        helper.settings.setValue("auto_refresh", state)
+        helper.settings.setValue("debugcontrol/auto_refresh", state)
 
     @QtCore.pyqtSlot(bool)
     def on_cbx_stay_on_top_clicked(self, state: bool):
         """Save the state on user action."""
-        helper.settings.setValue("stay_on_top", state)
+        helper.settings.setValue("debugcontrol/stay_on_top", state)
 
     @QtCore.pyqtSlot(int)
     def on_cbx_write_stateChanged(self, state: int):

src/revpicommander/debugios.py

@@ -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
 
@@ -18,15 +18,14 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
 
     device_closed = QtCore.pyqtSignal(int)
     """This window was closed."""
-    do_read = QtCore.pyqtSignal()
+
-    do_write = QtCore.pyqtSignal()
     search_class = (QtWidgets.QLineEdit, QtWidgets.QDoubleSpinBox, QtWidgets.QCheckBox)
 
     def __init__(self, position: int, name: str, inputs: list, outputs: list, parent=None):
-        super(DebugIos, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
-        self.restoreGeometry(helper.cm.debug_geos.get(position, b''))
+        self.restoreGeometry(helper.cm.settings.debug_geos.get(position, b''))
         self.setWindowTitle("{0} - {1}".format(position, name))
         self.gb_io.setTitle(self.gb_io.title().format(name))
 
@@ -39,26 +38,19 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
         self.outputs = outputs.copy()
         self.write_values = False
 
-        min_input = min(inputs, key=lambda k: k[2])
+        self.length = self._calc_device_length(self.inputs, self.outputs)
-        max_output = max(outputs, key=lambda k: k[2])
-        self.length = max_output[2] + max_output[1] - min_input[2]
 
         self.style_sheet = ""
         self._create_io(self.inputs, self.saw_inp, True)
         self._create_io(self.outputs, self.saw_out, False)
         self.style_sheet = "background-color: red;"
 
-        shc_read = QtWidgets.QShortcut(QtGui.QKeySequence("F5"), self)
-        shc_read.activated.connect(self.do_read)
-        shc_write = QtWidgets.QShortcut(QtGui.QKeySequence("F6"), self)
-        shc_write.activated.connect(self.do_write)
-
     def __del__(self):
         pi.logger.debug("DebugIos.__del__")
 
     def closeEvent(self, a0: QtGui.QCloseEvent):
         pi.logger.debug("DebugIos.closeEvent")
-        helper.cm.debug_geos[self.position] = self.saveGeometry()
+        helper.cm.settings.debug_geos[self.position] = self.saveGeometry()
         self.device_closed.emit(self.position)
 
     @staticmethod
@@ -68,6 +60,23 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
         return max_int_value / 2 * -1 if signed else 0.0, \
             max_int_value / 2 - 1 if signed else max_int_value - 1
 
+    @staticmethod
+    def _calc_device_length(inputs: list, outputs: list) -> int:
+        """Calculate the device length with IO data."""
+        if inputs and outputs:
+            min_input = min(inputs, key=lambda k: k[2])
+            max_output = max(outputs, key=lambda k: k[2])
+        elif inputs:
+            min_input = min(inputs, key=lambda k: k[2])
+            max_output = max(inputs, key=lambda k: k[2])
+        elif outputs:
+            min_input = min(outputs, key=lambda k: k[2])
+            max_output = max(outputs, key=lambda k: k[2])
+        else:
+            return 0
+
+        return max_output[2] + max_output[1] - min_input[2]
+
     def _create_io(self, lst_ios: list, container: QtWidgets.QWidget, read_only: bool):
         lst_names = list(lst[0] for lst in lst_ios)
         layout = container.layout()  # type: QtWidgets.QFormLayout
@@ -88,6 +97,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:
@@ -106,14 +116,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()
@@ -166,6 +177,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
@@ -209,6 +221,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)
@@ -220,6 +235,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()
@@ -238,6 +261,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(
@@ -245,8 +270,7 @@ 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:
+        elif rc == act_as_text:
-            if rc == act_as_text:
             sender.setProperty("struct_type", "text")
         elif rc == act_as_number:
             sender.setProperty("struct_type", "number")
@@ -284,10 +308,7 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
         """Update IOs after driver reset of piCtory."""
 
         # Check device length, this has to match to reuse this device
-        min_input = min(inputs, key=lambda k: k[2])
+        if self.length != self._calc_device_length(inputs, outputs):
-        max_output = max(outputs, key=lambda k: k[2])
-        new_length = max_output[2] + max_output[1] - min_input[2]
-        if self.length != new_length:
             return False
 
         # Remove IOs, which was remove or renamed
@@ -341,6 +362,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:
@@ -355,6 +380,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",

src/revpicommander/helper.py

@@ -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,46 +11,198 @@ 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
 
-from PyQt5 import QtCore, QtWidgets
+from PyQt5 import QtCore
 from paramiko.ssh_exception import AuthenticationException
 
 from . import proginit as pi
 from .ssh_tunneling.server import SSHLocalTunnel
-from .sshauth import SSHAuth, SSHAuthType
+
+settings = QtCore.QSettings("revpimodio.org", "revpicommander")
+"""Global application settings."""
+
+homedir = environ.get("HOME", "") or environ.get("APPDATA", "")
+"""Home dir of user."""
+
+
+class ConnectionFail(IntEnum):
+    NO_XML_RPC = 1
+    SSH_CONNECT = 2
+    SSH_AUTH = 4
+    NO_XML_RPC_VIA_TUNNEL = 9  # Includes NO_XML_RPC Bit
 
 
 class WidgetData(IntEnum):
     address = 260
-    replace_ios_config = 261
     acl_level = 262
     has_error = 263
     port = 264
     object_name = 265
-    timeout = 266
     host_name = 267
-    last_dir_upload = 301
+    host_name_full = 268
-    last_file_upload = 302
-    last_dir_pictory = 303
-    last_dir_picontrol = 304
-    last_dir_selected = 305
-    last_pictory_file = 306
-    last_tar_file = 307
-    last_zip_file = 308
     file_name = 309
-    watch_files = 310
+    revpi_settings = 320
-    watch_path = 311
+
-    debug_geos = 312
+
-    ssh_use_tunnel = 313
+class RevPiSettings:
-    ssh_port = 315
+
-    ssh_user = 316
+    def __init__(self, load_index: int = None, settings_storage: QtCore.QSettings = None):
+        """
+        Revolution Pi saved settings.
+
+        :param load_index: Load settings from index, same as .load_from_index
+        :param settings_storage: Change QSettings object to work on from default to this one
+        """
+        self._settings = settings_storage or settings
+        self.internal_id = ""
+
+        self.name = "New connection"
+        self.folder = ""
+        self.address = "127.0.0.1"
+        self.port = 55123
+        self.timeout = 5
+
+        self.ssh_use_tunnel = True
+        self.ssh_port = 22
+        self.ssh_user = "pi"
+        self.ssh_saved_password = False
+
+        self.last_dir_upload = "."
+        self.last_file_upload = "."
+        self.last_dir_pictory = "."
+        self.last_dir_picontrol = "."
+        self.last_dir_selected = "."
+        self.last_pictory_file = ""
+        self.last_tar_file = ""
+        self.last_zip_file = ""
+        self.watch_files = []
+        self.watch_path = ""
+
+        self.debug_geos = {}
+
+        if load_index is not None:
+            self.load_from_index(load_index)
+
+    def load_from_index(self, settings_index: int) -> None:
+        """Load settings from 'connections' index."""
+        self._settings.beginReadArray("connections")
+        self._settings.setArrayIndex(settings_index)
+
+        # Flag as "legacy" connection to generate missing internal_id on save_settings()
+        self.internal_id = self._settings.value("internal_id", "legacy", type=str)
+
+        self.name = self._settings.value("name", type=str)
+        self.folder = self._settings.value("folder", "", type=str)
+        self.address = self._settings.value("address", type=str)
+        self.port = self._settings.value("port", 55123, type=int)
+        self.timeout = self._settings.value("timeout", 5, type=int)
+
+        self.ssh_use_tunnel = self._settings.value("ssh_use_tunnel", True, type=bool)
+        self.ssh_port = self._settings.value("ssh_port", 22, type=int)
+        self.ssh_user = self._settings.value("ssh_user", "pi", type=str)
+        self.ssh_saved_password = self._settings.value("ssh_saved_password", False, type=bool)
+
+        self.last_dir_upload = self._settings.value("last_dir_upload", ".", type=str)
+        self.last_file_upload = self._settings.value("last_file_upload", ".", type=str)
+        self.last_dir_pictory = self._settings.value("last_dir_pictory", ".", type=str)
+        self.last_dir_picontrol = self._settings.value("last_dir_picontrol", ".", type=str)
+        self.last_dir_selected = self._settings.value("last_dir_selected", ".", type=str)
+        self.last_pictory_file = self._settings.value("last_pictory_file", "", type=str)
+        self.last_tar_file = self._settings.value("last_tar_file", "", type=str)
+        self.last_zip_file = self._settings.value("last_zip_file", "", type=str)
+        self.watch_files = self._settings.value("watch_files", [], type=list)
+        self.watch_path = self._settings.value("watch_path", "", type=str)
+
+        try:
+            # Bytes with QSettings are a little difficult sometimes
+            self.debug_geos = self._settings.value("debug_geos", {}, type=dict)
+        except Exception:
+            # Just drop the geos of IO windows
+            pass
+
+        # These values must exists
+        if not (self.name and self.address and self.port):
+            raise ValueError("Could not geht all required values from saved settings")
+
+        self._settings.endArray()
+
+    def save_settings(self):
+        """Save all settings."""
+
+        count_settings = self._settings.beginReadArray("connections")
+
+        def create_new_array_member():
+            """Insert a new setting at the end of the array."""
+
+            # Close the active array action to reopen a write action to expand the array
+            self._settings.endArray()
+            self._settings.beginWriteArray("connections")
+            self._settings.setArrayIndex(count_settings)
+
+            if not self.internal_id:
+                self.internal_id = uuid4().hex
+
+        if not self.internal_id:
+            create_new_array_member()
+
+        else:
+            # Always search setting in array, because connection manager could reorganize array indexes
+            new_setting = True
+            for index in range(count_settings):
+                self._settings.setArrayIndex(index)
+
+                if self.internal_id == "legacy":
+                    # Legacy connection without internal_id
+                    if self._settings.value("address") == self.address:
+                        # Set missing internal_id
+                        self.internal_id = uuid4().hex
+                        new_setting = False
+                        break
+                else:
+                    if self._settings.value("internal_id") == self.internal_id:
+                        new_setting = False
+                        break
+
+            if new_setting:
+                # On this point, we iterate all settings and found none, so create new one
+                create_new_array_member()
+
+        self._settings.setValue("internal_id", self.internal_id)
+        self._settings.setValue("name", self.name)
+        self._settings.setValue("folder", self.folder)
+        self._settings.setValue("address", self.address)
+        self._settings.setValue("port", self.port)
+        self._settings.setValue("timeout", self.timeout)
+
+        self._settings.setValue("ssh_use_tunnel", self.ssh_use_tunnel)
+        self._settings.setValue("ssh_port", self.ssh_port)
+        self._settings.setValue("ssh_user", self.ssh_user)
+        self._settings.setValue("ssh_saved_password", self.ssh_saved_password)
+
+        self._settings.setValue("last_dir_upload", self.last_dir_upload)
+        self._settings.setValue("last_file_upload", self.last_file_upload)
+        self._settings.setValue("last_dir_pictory", self.last_dir_pictory)
+        self._settings.setValue("last_dir_picontrol", self.last_dir_picontrol)
+        self._settings.setValue("last_dir_selected", self.last_dir_selected)
+        self._settings.setValue("last_pictory_file", self.last_pictory_file)
+        self._settings.setValue("last_tar_file", self.last_tar_file)
+        self._settings.setValue("last_zip_file", self.last_zip_file)
+        self._settings.setValue("watch_files", self.watch_files)
+        self._settings.setValue("watch_path", self.watch_path)
+        self._settings.setValue("debug_geos", self.debug_geos)
+
+        self._settings.endArray()
 
 
 class ConnectionManager(QtCore.QThread):
     """Check connection and status for PLC program on Revolution Pi."""
 
+    connect_error = QtCore.pyqtSignal(str, str, ConnectionFail, RevPiSettings)
+    """Error header, message and reason (ConnectionFail) of a new connection after pyload_connect call."""
     connection_established = QtCore.pyqtSignal()
     """New connection established successfully with <class 'ServerProxy'>."""
     connection_disconnected = QtCore.pyqtSignal()
@@ -65,7 +217,7 @@ class ConnectionManager(QtCore.QThread):
     """After errors the connection is established again, could have other port information (SSH)."""
 
     def __init__(self, parent=None, cycle_time_ms=1000):
-        super(ConnectionManager, self).__init__(parent)
+        super().__init__(parent)
 
         self._cli = None
         self._cli_connect = Queue()
@@ -75,31 +227,15 @@ class ConnectionManager(QtCore.QThread):
         self._revpi = None
         self._revpi_output = None
 
-        self.address = ""
+        self.settings = RevPiSettings()
-        self.name = ""
-        self.port = 55123
 
         self.ssh_tunnel_server = None  # type: SSHLocalTunnel
-        self.ssh_use_tunnel = False
-        self.ssh_port = 22
-        self.ssh_user = "pi"
         self.ssh_pass = ""
 
-        # Sync this with revpiplclist to preserve settings
-        self.program_last_dir_upload = ""
-        self.program_last_file_upload = ""
-        self.program_last_dir_pictory = ""
-        self.program_last_dir_picontrol = ""
-        self.program_last_dir_selected = ""
-        self.program_last_pictory_file = ""
-        self.program_last_tar_file = ""
-        self.program_last_zip_file = ""
-        self.develop_watch_files = []
-        self.develop_watch_path = ""
-        self.debug_geos = {}
-
         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
@@ -178,176 +314,125 @@ class ConnectionManager(QtCore.QThread):
 
     def _clear_settings(self):
         """Clear connection settings."""
-        self.address = ""
+        self.settings = RevPiSettings()
-        self.name = ""
-        self.port = 55123
 
-        self.ssh_use_tunnel = False
-        self.ssh_port = 22
-        self.ssh_user = "pi"
         self.ssh_pass = ""
 
         self.pyload_version = (0, 0, 0)
+        self.pyload_version_str = ""
         self.xml_funcs.clear()
         self.xml_mode = -1
 
-        self.program_last_dir_upload = ""
+    def pyload_connect(self, revpi_settings: RevPiSettings, ssh_pass="") -> bool:
-        self.program_last_file_upload = ""
-        self.program_last_dir_pictory = ""
-        self.program_last_dir_picontrol = ""
-        self.program_last_dir_selected = ""
-        self.program_last_pictory_file = ""
-        self.program_last_tar_file = ""
-        self.program_last_zip_file = ""
-        self.develop_watch_files = []
-        self.develop_watch_path = ""
-        self.debug_geos = {}
-
-    def _save_settings(self):
-        """Save settings to named Revolution Pi."""
-        for i in range(settings.beginReadArray("connections")):
-            settings.setArrayIndex(i)
-            if settings.value("address") != self.address:
-                # Search used connection, because connection manager could reorganize array
-                continue
-
-            settings.setValue("last_dir_upload", self.program_last_dir_upload)
-            settings.setValue("last_file_upload", self.program_last_file_upload)
-            settings.setValue("last_dir_pictory", self.program_last_dir_pictory)
-            settings.setValue("last_dir_picontrol", self.program_last_dir_picontrol)
-            settings.setValue("last_dir_selected", self.program_last_dir_selected)
-            settings.setValue("last_pictory_file", self.program_last_pictory_file)
-            settings.setValue("last_tar_file", self.program_last_tar_file)
-            settings.setValue("last_zip_file", self.program_last_zip_file)
-            settings.setValue("watch_files", self.develop_watch_files)
-            settings.setValue("watch_path", self.develop_watch_path)
-            settings.setValue("debug_geos", self.debug_geos)
-
-            break
-
-        settings.endArray()
-
-    def pyload_connect(self, settings_index: int, parent=None) -> bool:
         """
         Create a new connection from settings object.
 
-        :param settings_index: Index of settings array 'connections'
+        :param revpi_settings: Revolution Pi saved connection settings
-        :param parent: Qt parent window for dialog positioning
+        :param ssh_pass: Use this ssh password, if revpi_settings.ssh_use_tunnel is true
         :return: True, if the connection was successfully established
         """
 
         # First disconnect to send signal and clean up values
         self.pyload_disconnect()
 
-        settings.beginReadArray("connections")
-        settings.setArrayIndex(settings_index)
-
-        address = settings.value("address", str)
-        name = settings.value("name", str)
-        port = settings.value("port", 55123, int)
-        timeout = settings.value("timeout", 5, int)
-
         ssh_tunnel_server = None
-        ssh_use_tunnel = settings.value("ssh_use_tunnel", False, bool)
-        ssh_port = settings.value("ssh_port", 22, int)
-        ssh_user = settings.value("ssh_user", "pi", str)
         ssh_tunnel_port = 0
-        ssh_pass = ""
 
-        self.program_last_dir_upload = settings.value("last_dir_upload", ".", str)
+        socket.setdefaulttimeout(revpi_settings.timeout)
-        self.program_last_file_upload = settings.value("last_file_upload", ".", str)
-        self.program_last_dir_pictory = settings.value("last_dir_pictory", ".", str)
-        self.program_last_dir_picontrol = settings.value("last_dir_picontrol", ".", str)
-        self.program_last_dir_selected = settings.value("last_dir_selected", ".", str)
-        self.program_last_pictory_file = settings.value("last_pictory_file", "{0}.rsc".format(name), str)
-        self.program_last_tar_file = settings.value("last_tar_file", "{0}.tgz".format(name), str)
-        self.program_last_zip_file = settings.value("last_zip_file", "{0}.zip".format(name), str)
-        self.develop_watch_files = settings.value("watch_files", [], list)
-        self.develop_watch_path = settings.value("watch_path", "", str)
-        self.debug_geos = settings.value("debug_geos", {}, dict)
 
-        settings.endArray()
+        if revpi_settings.ssh_use_tunnel:
-
+            ssh_tunnel_server = SSHLocalTunnel(
-        socket.setdefaulttimeout(2)
+                revpi_settings.port,
-
+                revpi_settings.address,
-        if ssh_use_tunnel:
+                revpi_settings.ssh_port
-            while True:
+            )
-                diag_ssh_auth = SSHAuth(SSHAuthType.PASS, parent)
-                diag_ssh_auth.username = ssh_user
-                if not diag_ssh_auth.exec() == QtWidgets.QDialog.Accepted:
-                    self._clear_settings()
-                    return False
-
-                ssh_user = diag_ssh_auth.username
-                ssh_pass = diag_ssh_auth.password
-                ssh_tunnel_server = SSHLocalTunnel(port, address, ssh_port)
             try:
-                    ssh_tunnel_port = ssh_tunnel_server.connect_by_credentials(ssh_user, ssh_pass)
+                ssh_tunnel_port = ssh_tunnel_server.connect_by_credentials(revpi_settings.ssh_user, ssh_pass)
-                    break
+
+                if getattr(revpi_settings, "ssh_enable_revpipyload", False):
+                    ssh_tunnel_server.send_cmd("sudo systemctl enable --now revpipyload")
+
             except AuthenticationException:
-                    QtWidgets.QMessageBox.critical(
+                self.connect_error.emit(
-                        parent, self.tr("Error"), self.tr(
+                    self.tr("Error"), self.tr(
                         "The combination of username and password was rejected from the SSH server.\n\n"
                         "Try again."
+                    ),
+                    ConnectionFail.SSH_AUTH,
+                    revpi_settings,
                 )
-                    )
+                return False
             except Exception as e:
                 # todo: Check some more kinds of exceptions and nice user info
                 self._clear_settings()
-                    QtWidgets.QMessageBox.critical(
+                self.connect_error.emit(
-                        parent, self.tr("Error"), self.tr(
+                    self.tr("Error"), self.tr(
                         "Could not establish a SSH connection to server:\n\n{0}"
-                        ).format(str(e))
+                    ).format(str(e)),
+                    ConnectionFail.SSH_CONNECT,
+                    revpi_settings,
                 )
                 return False
 
             sp = ServerProxy("http://127.0.0.1:{0}".format(ssh_tunnel_port))
 
         else:
-            sp = ServerProxy("http://{0}:{1}".format(address, port))
+            sp = ServerProxy("http://{0}:{1}".format(revpi_settings.address, revpi_settings.port))
 
         # 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:
             pi.logger.exception(e)
             self.connection_error_observed.emit(str(e))
 
-            if not self.ssh_use_tunnel:
+            if revpi_settings.ssh_use_tunnel:
-                # todo: Change message, that user can use ssh
+                self.connect_error.emit(
-                QtWidgets.QMessageBox.critical(
+                    self.tr("Error"), self.tr(
-                    parent, self.tr("Error"), self.tr(
+                        "Can not connect to RevPiPyLoad service through SSH tunnel!\n\n"
-                        "Can not connect to RevPi XML-RPC Service! \n\n"
+                        "This could have the following reasons:\n"
-                        "This could have the following reasons: The RevPi is not "
+                        "- The RevPiPyLoad service is not running (activate it on your Revolution Pi)\n"
-                        "online, the XML-RPC service is not running / bind to "
+                        "- The RevPiPyLoad XML-RPC service is NOT bind to localhost\n"
-                        "localhost or the ACL permission is not set for your "
+                        "- The ACL permission is not set for 127.0.0.1!!!"
-                        "IP!!!\n\nRun 'sudo revpipyload_secure_installation' on "
+                    ),
-                        "Revolution Pi to setup this function!"
+                    ConnectionFail.NO_XML_RPC_VIA_TUNNEL,
+                    revpi_settings,
                 )
+            else:
+                self.connect_error.emit(
+                    self.tr("Error"), self.tr(
+                        "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,
                 )
 
             return False
 
-        self.address = address
+        self.settings = revpi_settings
-        self.name = name
-        self.port = port
-        self.ssh_use_tunnel = ssh_use_tunnel
-        self.ssh_port = ssh_port
-        self.ssh_user = ssh_user
         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
 
         with self._lck_cli:
-            socket.setdefaulttimeout(timeout)
             self.ssh_tunnel_server = ssh_tunnel_server
             self._cli = sp
             self._cli_connect.put_nowait((
-                "127.0.0.1" if ssh_use_tunnel else address,
+                "127.0.0.1" if revpi_settings.ssh_use_tunnel else revpi_settings.address,
-                ssh_tunnel_port if ssh_use_tunnel else port
+                ssh_tunnel_port if revpi_settings.ssh_use_tunnel else revpi_settings.port
             ))
 
         self.connection_established.emit()
@@ -371,9 +456,9 @@ class ConnectionManager(QtCore.QThread):
 
         elif self._cli is not None:
 
-            # Tell all widget, that we want to disconnect, to save the settings
+            # Tell all widget, that we want to disconnect
             self.connection_disconnecting.emit()
-            self._save_settings()
+            self.settings.save_settings()
 
             with self._lck_cli:
                 if self._ps_started:
@@ -391,7 +476,13 @@ class ConnectionManager(QtCore.QThread):
             self.connection_disconnected.emit()
 
     def pyload_simulate(self, configrsc: str, procimg: str, clean_existing: bool):
-        """Start the simulator for piControl on local computer."""
+        """
+        Start the simulator for piControl on local computer.
+
+        :param configrsc: piCtory configuration
+        :param procimg: Process image, which is a 4 kByte file for simulation
+        :param clean_existing: Reset the file to ZERO \x00 bytes
+        """
         pi.logger.debug("ConnectionManager.start_simulate")
 
         if not exists(procimg) or clean_existing:
@@ -475,10 +566,14 @@ class ConnectionManager(QtCore.QThread):
 
                     if self.ssh_tunnel_server and not self.ssh_tunnel_server.connected:
                         self.ssh_tunnel_server.disconnect()
-                        ssh_tunnel_server = SSHLocalTunnel(self.port, self.address, self.ssh_port)
+                        ssh_tunnel_server = SSHLocalTunnel(
+                            self.settings.port,
+                            self.settings.address,
+                            self.settings.ssh_port
+                        )
                         try:
                             ssh_tunnel_port = self.ssh_tunnel_server.connect_by_credentials(
-                                self.ssh_user,
+                                self.settings.ssh_user,
                                 self.ssh_pass
                             )
                             sp = ServerProxy("http://127.0.0.1:{0}".format(ssh_tunnel_port))
@@ -563,9 +658,9 @@ class ConnectionManager(QtCore.QThread):
 
         Use connection_recovered signal to figure out new parameters.
         """
-        if not self.ssh_use_tunnel and self.address and self.port:
+        if not self.settings.ssh_use_tunnel and self.settings.address and self.settings.port:
-            return ServerProxy("http://{0}:{1}".format(self.address, self.port))
+            return ServerProxy("http://{0}:{1}".format(self.settings.address, self.settings.port))
-        if self.ssh_use_tunnel and self.ssh_tunnel_server and self.ssh_tunnel_server.connected:
+        if self.settings.ssh_use_tunnel and self.ssh_tunnel_server and self.ssh_tunnel_server.connected:
             return ServerProxy("http://127.0.0.1:{0}".format(self.ssh_tunnel_server.local_tunnel_port))
 
         return None
@@ -592,8 +687,42 @@ class ConnectionManager(QtCore.QThread):
 cm = ConnectionManager()
 """Clobal connection manager instance."""
 
-settings = QtCore.QSettings("revpipyplc", "revpipyload")
-"""Global application settings."""
 
-homedir = environ.get("HOME", "") or environ.get("APPDATA", "")
+def all_revpi_settings() -> [RevPiSettings]:
-"""Home dir of user."""
+    """Get all revpi settings objects."""
+    # Get length of array and close it, the RevPiSettings-class need it
+    count_settings = settings.beginReadArray("connections")
+    settings.endArray()
+    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):
+        return
+    settings.setValue("revpicommander/imported_settings", True)
+
+    old_settings = QtCore.QSettings("revpipyplc", "revpipyload")
+    count_settings = old_settings.beginReadArray("connections")
+    old_settings.endArray()
+
+    for i in range(count_settings):
+        try:
+            revpi_setting = RevPiSettings(i, settings_storage=old_settings)
+            revpi_setting._settings = settings
+            revpi_setting.save_settings()
+        except Exception:
+            pi.logger.warning("Could not import saved connection {0}".format(i))
+
+
+import_old_settings()

src/revpicommander/mqttmanager.py

@@ -3,7 +3,7 @@
 
 __author__ = "Sven Sager"
 __copyright__ = "Copyright (C) 2023 Sven Sager"
-__license__ = "GPLv3"
+__license__ = "GPLv2"
 
 from PyQt5 import QtGui, QtWidgets
 
@@ -15,7 +15,7 @@ class MqttManager(QtWidgets.QDialog, Ui_diag_mqtt):
     """MQTT settings for option window."""
 
     def __init__(self, parent=None):
-        super(MqttManager, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         self.setFixedSize(self.size())
 
@@ -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())
@@ -72,7 +72,7 @@ class MqttManager(QtWidgets.QDialog, Ui_diag_mqtt):
         self.dc["mqttusername"] = self.txt_username.text()
         self.dc["mqttpassword"] = self.txt_password.text()
         self.dc["mqttclient_id"] = self.txt_client_id.text()
-        super(MqttManager, self).accept()
+        super().accept()
 
     def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
         if self._changesdone():
@@ -95,12 +95,12 @@ class MqttManager(QtWidgets.QDialog, Ui_diag_mqtt):
                 )
             )
             return QtWidgets.QDialog.Rejected
-        return super(MqttManager, self).exec()
+        return super().exec()
 
     def reject(self) -> None:
         """Reject settings."""
         self._load_settings()
-        super(MqttManager, self).reject()
+        super().reject()
 
     @property
     def read_only(self):

src/revpicommander/proginit.py

@@ -2,7 +2,7 @@
 """Global program initialization."""
 __author__ = "Sven Sager"
 __copyright__ = "Copyright (C) 2023 Sven Sager"
-__license__ = "LGPLv3"
+__license__ = "GPLv2"
 
 import logging
 import sys
@@ -89,11 +89,12 @@ parser.add_argument(
     "-f", "--logfile", dest="logfile",
     help="Save log entries to this file"
 )
-
 parser.add_argument(
     "-v", "--verbose", action="count", dest="verbose", default=0,
     help="Switch on verbose logging"
 )
+# The __main__ script will process the version number argument
+parser.add_argument("--version", action="store_true", help="Print version number of program and exit")
 pargs = parser.parse_args()
 
 # Check important objects and set to default if they do not exists

src/revpicommander/revpicommander.py

@@ -4,34 +4,55 @@
 
 __author__ = "Sven Sager"
 __copyright__ = "Copyright (C) 2018 Sven Sager"
-__license__ = "GPLv3"
+__license__ = "GPLv2"
-__version__ = "0.9.10rc1"
 
 import webbrowser
-from os.path import basename, dirname, join
+from os.path import dirname, join
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
+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
 from .revpiinfo import RevPiInfo
 from .revpioption import RevPiOption
 from .revpiplclist import RevPiPlcList
 from .revpiprogram import RevPiProgram
 from .simulator import Simulator
+from .sshauth import SSHAuth
 from .ui.revpicommander_ui import Ui_win_revpicommander
 
 
+class ConnectingPyload(QtCore.QThread):
+    """
+    Try to establish a connection in background.
+
+    The pyload_connect function will emit signals for error or successful connect. This
+    signals will be used to show error messages and return to this function, if the
+    authentication failed.
+    """
+
+    def __init__(self, revpi_settings: RevPiSettings, ssh_password="", parent=None):
+        super().__init__(parent)
+        self._revpi_settings = revpi_settings
+        self._ssh_password = ssh_password
+
+    def run(self) -> None:
+        helper.cm.pyload_connect(self._revpi_settings, self._ssh_password)
+
+
 class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
     """Main application of RevPiCommander."""
 
     def __init__(self, parent=None):
         """Init main program."""
-        super(RevPiCommander, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         self.wid_debugcontrol = None  # type: DebugControl
@@ -53,22 +74,23 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
         self.win_files = RevPiFiles(self)
         self.win_log = revpilogfile.RevPiLogfile(self)
 
-        self.btn_plc_logs.pressed.connect(self.on_act_logs_triggered)
+        self.btn_plc_logs.clicked.connect(self.on_act_logs_triggered)
 
+        helper.cm.connect_error.connect(self.on_cm_connect_error)
         helper.cm.connection_disconnected.connect(self.on_cm_connection_disconnected)
         helper.cm.connection_disconnecting.connect(self.on_cm_connection_disconnecting)
         helper.cm.connection_established.connect(self.on_cm_connection_established)
         helper.cm.connection_error_observed.connect(self.on_cm_connection_error_observed)
         helper.cm.status_changed.connect(self.on_cm_status_changed)
 
-        self.restoreGeometry(helper.settings.value("geo", b''))
+        self.restoreGeometry(helper.settings.value("revpicommander/geo", b''))
 
         self.setWindowFlag(QtCore.Qt.WindowMaximizeButtonHint, False)
 
     def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
         pi.logger.debug("RevPiCommander.closeEvent")
         helper.cm.pyload_disconnect()
-        helper.settings.setValue("geo", self.saveGeometry())
+        helper.settings.setValue("revpicommander/geo", self.saveGeometry())
 
     def _set_gui_control_states(self):
         """Setup states of actions and buttons."""
@@ -96,8 +118,32 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
     # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
     # region #      REGION: Connection management
 
-    def _pyload_connect(self, settings_index: int) -> None:
+    @QtCore.pyqtSlot(str, str, ConnectionFail, RevPiSettings)
-        helper.cm.pyload_connect(settings_index, self)
+    def on_cm_connect_error(self, title: str, text: str, fail_code: ConnectionFail, revpi_settings: RevPiSettings):
+        """
+        Slot to get information of pyload_connect connection errors.
+
+        :param title: Title of error message
+        :param text: Text of error message
+        :param fail_code: Type of error
+        :param revpi_settings: Settings of the revpi with the error
+        """
+        if fail_code is ConnectionFail.NO_XML_RPC_VIA_TUNNEL:
+            # If RevPiPyLoad is not running, we can try to activate it via ssh
+            QtWidgets.QMessageBox.information(
+                self, self.tr("Information"), self.tr(
+                    "Can not connect to RevPiPyLoad service through SSH tunnel!\n\n"
+                    "We are trying to activate this service now and reconnect. The settings can be "
+                    "changed at any time via 'webstatus'."
+                ),
+            )
+            revpi_settings.ssh_enable_revpipyload = True
+            self._pyload_connect(revpi_settings, False)
+        else:
+            QtWidgets.QMessageBox.critical(self, title, text)
+            if fail_code is ConnectionFail.SSH_AUTH:
+                # On failed credentials, we try to connect again and remove password form keychain, if exists
+                self._pyload_connect(revpi_settings, True)
 
     @QtCore.pyqtSlot(str)
     def on_cm_connection_error_observed(self, message: str):
@@ -148,8 +194,8 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
                 helper.cm.simulating_procimg,
             ))
         else:
-            self.txt_host.setText(helper.cm.name)
+            self.txt_host.setText(helper.cm.settings.name)
-            self.txt_connection.setText(helper.cm.address)
+            self.txt_connection.setText(helper.cm.settings.address)
         self.win_files = RevPiFiles(self)
 
     @QtCore.pyqtSlot(str, str)
@@ -169,33 +215,76 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
         self.men_connections.clear()
         self.dict_men_connections_subfolder.clear()
 
-        for i in range(helper.settings.beginReadArray("connections")):
+        for settings in helper.all_revpi_settings():  # type: RevPiSettings
-            helper.settings.setArrayIndex(i)
+            if settings.folder:
-
+                if settings.folder not in self.dict_men_connections_subfolder:
-            if helper.settings.value("folder"):
-                if helper.settings.value("folder") not in self.dict_men_connections_subfolder:
                     men_sub = QtWidgets.QMenu(self.men_connections)
-                    men_sub.setTitle(helper.settings.value("folder"))
+                    men_sub.setTitle(settings.folder)
-                    self.dict_men_connections_subfolder[helper.settings.value("folder")] = men_sub
+                    self.dict_men_connections_subfolder[settings.folder] = men_sub
                     self.men_connections.addMenu(men_sub)
-                parent_menu = self.dict_men_connections_subfolder[helper.settings.value("folder")]
+                parent_menu = self.dict_men_connections_subfolder[settings.folder]
             else:
                 parent_menu = self.men_connections
 
-            display_name = helper.settings.value("name")
+            display_name = settings.name
-            if helper.settings.value("ssh_use_tunnel", False, bool):
+            if settings.name != settings.address:
+                display_name += " [{0}]".format(settings.address)
+            if settings.ssh_use_tunnel:
                 display_name += " (SSH)"
 
             act = QtWidgets.QAction(parent_menu)
             act.setText(display_name)
-            act.setData(i)
+            act.setData(settings)
-            act.setToolTip("{0}:{1}".format(
+            act.setToolTip("{0}:{1}".format(settings.address, settings.port))
-                helper.settings.value("address"),
-                helper.settings.value("port"),
-            ))
             parent_menu.addAction(act)
 
-        helper.settings.endArray()
+    def _pyload_connect(self, revpi_settings: RevPiSettings, remove_saved_ssh_password=False):
+        """
+        Try to async establish a connection to Revolution Pi.
+
+        :param revpi_settings: RevPi settings object
+        :param remove_saved_ssh_password: Remove password from keychain
+        """
+        ssh_password = ""
+
+        diag_connecting = BackgroundWaiter(
+            revpi_settings.timeout,
+            self.tr("Establish a connection to the Revolution Pi..."),
+            self,
+            self.tr("Revolution Pi connected!"),
+        )
+        helper.cm.connection_established.connect(diag_connecting.requestInterruption)
+
+        if revpi_settings.ssh_use_tunnel:
+            diag_ssh_auth = SSHAuth(
+                revpi_settings.ssh_user,
+                "{0}.{1}_{2}".format(
+                    helper.settings.applicationName(),
+                    helper.settings.organizationName(),
+                    revpi_settings.internal_id),
+                self,
+            )
+
+            if remove_saved_ssh_password and revpi_settings.ssh_saved_password:
+                diag_ssh_auth.remove_saved_password()
+                revpi_settings.ssh_saved_password = False
+
+            # Doesn't matter what user selects, we have to save settings to sync keychain and values
+            if diag_ssh_auth.exec() != QtWidgets.QDialog.Accepted:
+                revpi_settings.save_settings()
+                return
+
+            revpi_settings.ssh_saved_password = diag_ssh_auth.in_keyring
+            revpi_settings.ssh_user = diag_ssh_auth.username
+            ssh_password = diag_ssh_auth.password
+            revpi_settings.save_settings()
+
+        # Connect in background and show the connecting dialog to user
+        th_connecting = ConnectingPyload(revpi_settings, ssh_password, self)
+        th_connecting.finished.connect(diag_connecting.requestInterruption)
+        th_connecting.start()
+
+        diag_connecting.exec_dialog(self.tr("Connecting..."), False)
 
     @QtCore.pyqtSlot()
     def on_act_connections_triggered(self):
@@ -207,8 +296,11 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
     def on_act_search_triggered(self):
         """Search for Revolution Pi with zero conf."""
         if self.diag_search.exec() == QtWidgets.QDialog.Accepted:
-            if self.diag_search.connect_index >= 0:
+            if self.diag_search.connect_settings:
-                self._pyload_connect(self.diag_search.connect_index)
+                if self.diag_search.just_save:
+                    self.diag_connections.exec_with_presets(self.diag_search.connect_settings)
+                else:
+                    self._pyload_connect(self.diag_search.connect_settings)
 
         self._load_men_connections()
 
@@ -224,7 +316,7 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
         configrsc_file = helper.settings.value("simulator/configrsc", "", str)
         procimg_file = helper.settings.value("simulator/procimg", "", str)
 
-        if helper.cm.pyload_simulate(configrsc_file, procimg_file, diag.cbx_stop_remove.isChecked()):
+        if helper.cm.pyload_simulate(configrsc_file, procimg_file, diag.clean_procimg):
             QtWidgets.QMessageBox.information(
                 self, self.tr("Simulator started..."), self.tr(
                     "The simulator is running!\n\nYou can work with this simulator if your call "
@@ -324,8 +416,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:
+        if helper.cm.settings.address:
-            webbrowser.open("http://{0}/".format(helper.cm.address))
+            webbrowser.open("http://{0}/".format(helper.cm.settings.address))
 
     @QtCore.pyqtSlot()
     def on_act_reset_triggered(self):
@@ -470,6 +562,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'):
@@ -506,4 +599,5 @@ def main() -> int:
 
 if __name__ == "__main__":
     import sys
+
     sys.exit(main())

src/revpicommander/revpifiles.py

@@ -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
@@ -26,7 +26,7 @@ class NodeType(IntEnum):
 class UploadFiles(BackgroundWorker):
 
     def __init__(self, file_list: list, parent):
-        super(UploadFiles, self).__init__(parent)
+        super().__init__(parent)
         self.ec = 1
         self.file_list = file_list
         self.plc_program_included = False  # Will be True, when opt_program was found in files
@@ -43,14 +43,13 @@ class UploadFiles(BackgroundWorker):
             progress_counter += 1
 
             # Remove base dir of file to set relative for PyLoad
-            send_name = file_name.replace(helper.cm.develop_watch_path, "")[1:]
+            send_name = file_name.replace(helper.cm.settings.watch_path, "")[1:]
             self.status_message.emit(send_name)
 
             # Check whether this is the auto start program
             if send_name == opt_program:
                 self.plc_program_included = True
 
-
             # Transfer file
             try:
                 with open(file_name, "rb") as fh:
@@ -77,13 +76,13 @@ class UploadFiles(BackgroundWorker):
 class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
 
     def __init__(self, parent=None):
-        super(RevPiFiles, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         self.dc_settings = {}
         self.tree_files_counter = 0
         self.tree_files_counter_max = 10000
-        self.lbl_path_local.setText(helper.cm.develop_watch_path or self.tr("Please select..."))
+        self.lbl_path_local.setText(helper.cm.settings.watch_path or self.tr("Please select..."))
         self.lbl_path_local.setToolTip(self.lbl_path_local.text())
 
         self.btn_all.setEnabled(False)
@@ -91,7 +90,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
         self.btn_to_right.setEnabled(False)
         self.btn_delete_revpi.setEnabled(False)
 
-        if helper.cm.develop_watch_path:
+        if helper.cm.settings.watch_path:
             self._load_files_local(True)
         if helper.cm.connected:
             self._load_files_revpi(True)
@@ -125,7 +124,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
             return
 
         uploader = UploadFiles(self.file_list_local(), self)
-        if uploader.exec_dialog() == QtWidgets.QDialog.Rejected:
+        if uploader.exec_dialog(self.tr("File transfer...")) == QtWidgets.QDialog.Rejected:
             return
 
         if uploader.ec == 0:
@@ -176,7 +175,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
         if "plcdownload_file" not in helper.cm.xml_funcs:
             self.btn_to_left.setEnabled(False)
             self.btn_to_left.setToolTip(self.tr("The RevPiPyLoad version on the Revolution Pi is to old."))
-        elif not helper.cm.develop_watch_path:
+        elif not helper.cm.settings.watch_path:
             self.btn_to_left.setEnabled(False)
             self.btn_to_left.setToolTip(self.tr("Choose a local directory first."))
         else:
@@ -208,7 +207,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
             elif item.type() == NodeType.FILE:
                 item.setSelected(value)
 
-    def __item_selection_changed(self, tree_view: QtWidgets.QTreeView):
+    def __item_selection_changed(self, tree_view: QtWidgets.QTreeWidget):
         """Manager vor item selection of three views."""
         item = tree_view.currentItem()
         if item is None:
@@ -231,7 +230,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
     @QtCore.pyqtSlot()
     def on_tree_files_local_itemSelectionChanged(self):
         self.__item_selection_changed(self.tree_files_local)
-        helper.cm.develop_watch_files = self.file_list_local()
+        helper.cm.settings.watch_files = self.file_list_local()
 
     @QtCore.pyqtSlot()
     def on_tree_files_revpi_itemSelectionChanged(self):
@@ -288,7 +287,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
                 else:
                     self.tree_files_local.addTopLevelItem(item)
 
-                item.setSelected(de.path in helper.cm.develop_watch_files)
+                item.setSelected(de.path in helper.cm.settings.watch_files)
                 self._parent_selection_state(item)
 
     def _load_files_local(self, silent=False):
@@ -302,7 +301,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
         self.tree_files_counter = 0
         self.tree_files_local.blockSignals(True)
         self.tree_files_local.clear()
-        self.__insert_files_local(helper.cm.develop_watch_path)
+        self.__insert_files_local(helper.cm.settings.watch_path)
         self.tree_files_local.sortItems(0, QtCore.Qt.AscendingOrder)
         self.tree_files_local.blockSignals(False)
 
@@ -435,18 +434,18 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
     # endregion # # # # #
 
     @QtCore.pyqtSlot()
-    def on_btn_all_pressed(self):
+    def on_btn_all_clicked(self):
-        pi.logger.debug("RevPiFiles.on_btn_all_pressed")
+        pi.logger.debug("RevPiFiles.on_btn_all_clicked")
         self._do_my_job(True)
         self.file_list_revpi()
 
     @QtCore.pyqtSlot()
-    def on_btn_select_local_pressed(self):
+    def on_btn_select_local_clicked(self):
-        pi.logger.debug("RevPiFiles.on_btn_select_pressed")
+        pi.logger.debug("RevPiFiles.on_btn_select_clicked")
 
         diag_folder = QtWidgets.QFileDialog(
             self, self.tr("Select folder..."),
-            helper.cm.develop_watch_path,
+            helper.cm.settings.watch_path,
         )
         diag_folder.setFileMode(QtWidgets.QFileDialog.DirectoryOnly)
         if diag_folder.exec() != QtWidgets.QFileDialog.Accepted:
@@ -460,38 +459,38 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
                     "Can not access the folder '{0}' to read files."
                 )
             )
-            helper.cm.develop_watch_files = []
+            helper.cm.settings.watch_files = []
-            helper.cm.develop_watch_path = ""
+            helper.cm.settings.watch_path = ""
             return
 
         self.lbl_path_local.setText(selected_dir)
         self.lbl_path_local.setToolTip(self.lbl_path_local.text())
-        helper.cm.develop_watch_path = selected_dir
+        helper.cm.settings.watch_path = selected_dir
-        helper.cm.develop_watch_files = []
+        helper.cm.settings.watch_files = []
 
         self._load_files_local(False)
 
     @QtCore.pyqtSlot()
-    def on_btn_refresh_local_pressed(self):
+    def on_btn_refresh_local_clicked(self):
-        pi.logger.debug("RevPiFiles.on_btn_refresh_pressed")
+        pi.logger.debug("RevPiFiles.on_btn_refresh_clicked")
         self._load_files_local(False)
 
     @QtCore.pyqtSlot()
-    def on_btn_refresh_revpi_pressed(self):
+    def on_btn_refresh_revpi_clicked(self):
-        pi.logger.debug("RevPiFiles.on_btn_refresh_revpi_pressed")
+        pi.logger.debug("RevPiFiles.on_btn_refresh_revpi_clicked")
         self._load_files_revpi(False)
 
     @QtCore.pyqtSlot()
-    def on_btn_to_right_pressed(self):
+    def on_btn_to_right_clicked(self):
         """Upload selected files to revolution pi."""
-        pi.logger.debug("RevPiFiles.on_btn_to_right_pressed")
+        pi.logger.debug("RevPiFiles.on_btn_to_right_clicked")
         self._do_my_job(False)
         self._load_files_revpi(True)
 
     @QtCore.pyqtSlot()
-    def on_btn_to_left_pressed(self):
+    def on_btn_to_left_clicked(self):
         """Download selected file."""
-        pi.logger.debug("RevPiFiles.on_btn_to_left_pressed")
+        pi.logger.debug("RevPiFiles.on_btn_to_left_clicked")
 
         override = None
         for item in self.tree_files_revpi.selectedItems():
@@ -511,7 +510,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
                     ).format(file_name)
                 )
             else:
-                file_name = os.path.join(helper.cm.develop_watch_path, file_name)
+                file_name = os.path.join(helper.cm.settings.watch_path, file_name)
                 if override is None and os.path.exists(file_name):
                     rc_diag = QtWidgets.QMessageBox.question(
                         self, self.tr("Override files..."), self.tr(
@@ -530,15 +529,15 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files):
 
                 os.makedirs(os.path.dirname(file_name), exist_ok=True)
                 file_data = gzip.decompress(rc)
-                with open(os.path.join(helper.cm.develop_watch_path, file_name), "wb") as fh:
+                with open(os.path.join(helper.cm.settings.watch_path, file_name), "wb") as fh:
                     fh.write(file_data)
 
         self._load_files_local()
 
     @QtCore.pyqtSlot()
-    def on_btn_delete_revpi_pressed(self):
+    def on_btn_delete_revpi_clicked(self):
         """Remove selected files from working directory on revolution pi."""
-        pi.logger.debug("RevPiFiles.btn_delete_revpi_pressed")
+        pi.logger.debug("RevPiFiles.btn_delete_revpi_clicked")
 
         lst_delete = []
         for item in self.tree_files_revpi.selectedItems():

src/revpicommander/revpiinfo.py

@@ -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
 
@@ -14,7 +14,7 @@ class RevPiInfo(QtWidgets.QDialog, Ui_diag_revpiinfo):
     """Version information window."""
 
     def __init__(self, version: str, parent=None):
-        super(RevPiInfo, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         self._debug_load = False
@@ -24,11 +24,11 @@ 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()
-        return super(RevPiInfo, self).exec()
+        return super().exec()
 
     def lbl_version_mousePressEvent(self, a0: QtGui.QMouseEvent):
         if a0.button() == QtCore.Qt.MidButton:

src/revpicommander/revpilogfile.py

@@ -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
 
@@ -25,7 +25,7 @@ class DataThread(QtCore.QThread):
     """log_type, success, text"""
 
     def __init__(self, parent=None, cycle_time=1000):
-        super(DataThread, self).__init__(parent)
+        super().__init__(parent)
 
         self._cycle_time = cycle_time
         self._paused = True
@@ -113,7 +113,7 @@ class RevPiLogfile(QtWidgets.QMainWindow, Ui_win_revpilogfile):
 
     def __init__(self, parent=None):
         u"""Init RevPiLogfile-Class."""
-        super(RevPiLogfile, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
 
         self.th_data = DataThread(self)
@@ -138,11 +138,11 @@ class RevPiLogfile(QtWidgets.QMainWindow, Ui_win_revpilogfile):
 
     def hideEvent(self, a0: QtGui.QHideEvent) -> None:
         self.th_data.pause()
-        super(RevPiLogfile, self).hideEvent(a0)
+        super().hideEvent(a0)
 
     def showEvent(self, a0: QtGui.QShowEvent) -> None:
         self.th_data.resume()
-        super(RevPiLogfile, self).showEvent(a0)
+        super().showEvent(a0)
 
     def _load_gui_settings(self):
         self.restoreGeometry(helper.settings.value("logfile/geo", b''))
@@ -166,12 +166,12 @@ class RevPiLogfile(QtWidgets.QMainWindow, Ui_win_revpilogfile):
             self.th_data.resume()
 
     @QtCore.pyqtSlot()
-    def on_btn_daemon_pressed(self):
+    def on_btn_daemon_clicked(self):
         """Clear the daemon log view."""
         self.txt_daemon.clear()
 
     @QtCore.pyqtSlot()
-    def on_btn_app_pressed(self):
+    def on_btn_app_clicked(self):
         """Clear the app log view."""
         self.txt_app.clear()
 

src/revpicommander/revpioption.py

@@ -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
 
@@ -17,14 +17,15 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
     """Set options of RevPiPyLoad."""
 
     def __init__(self, parent=None):
-        super(RevPiOption, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         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
+            int(self.cbx_plcserver.isChecked()) != self.dc.get("plcserver", 0) or
-            self.acl_plcslave != self.dc.get("plcslaveacl", "") 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.cbx_plcserver.setChecked(bool(self.dc.get("plcserver", 0)))
-        self.acl_plcslave = self.dc.get("plcslaveacl", "")
+        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,9 +142,44 @@ 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()
+            super().accept()
             return
 
         ask = QtWidgets.QMessageBox.question(
@@ -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
+        # PLCServer Settings
-        self.dc["plcslave"] = int(self.cbx_plcslave.isChecked())
+        self.dc["plcserver"] = int(self.cbx_plcserver.isChecked())
-        self.dc["plcslaveacl"] = self.acl_plcslave
+        self.dc["plcserveracl"] = self.acl_plcserver
 
         # MQTT Settings
         self.dc["mqtt"] = int(self.cbx_mqtt.isChecked())
@@ -186,12 +222,12 @@ 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
         )
 
         if saved:
-            super(RevPiOption, self).accept()
+            super().accept()
         else:
             QtWidgets.QMessageBox.critical(
                 self, self.tr("Error"), self.tr(
@@ -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)
+        running = helper.cm.call_remote_function(
-        self.lbl_slave_status.setText(
+            "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"
         )
 
@@ -253,12 +295,12 @@ class RevPiOption(QtWidgets.QDialog, Ui_diag_options):
                 "color: green" if running else "color: red"
             )
 
-        return super(RevPiOption, self).exec()
+        return super().exec()
 
     def reject(self) -> None:
         """Reject all sub windows and reload settings."""
         self._load_settings()
-        super(RevPiOption, self).reject()
+        super().reject()
 
     @QtCore.pyqtSlot(int)
     def on_cbb_replace_io_currentIndexChanged(self, index: int):
@@ -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):

src/revpicommander/revpiplclist.py

@@ -2,14 +2,17 @@
 """Saved connections of Revolution Pi devices."""
 __author__ = "Sven Sager"
 __copyright__ = "Copyright (C) 2023 Sven Sager"
-__license__ = "GPLv3"
+__license__ = "GPLv2"
 
 from enum import IntEnum
 
+import keyring
 from PyQt5 import QtCore, QtGui, QtWidgets
+from keyring.errors import KeyringError
 
+from . import helper
 from . import proginit as pi
-from .helper import WidgetData, settings
+from .helper import RevPiSettings, WidgetData
 from .ui.revpiplclist_ui import Ui_diag_connections
 
 
@@ -22,57 +25,58 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
     """Manage your saved connections."""
 
     def __init__(self, parent=None):
-        super(RevPiPlcList, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
-        self.__default_name = self.tr("New connection")
         self.__default_port = 55123
 
         self.__current_item = QtWidgets.QTreeWidgetItem()  # type: QtWidgets.QTreeWidgetItem
         self.changes = True
+        self._keyring_cleanup_id_user = []
 
         self.tre_connections.setColumnWidth(0, 250)
         self.lbl_port.setText(self.lbl_port.text().format(self.__default_port))
         self.sbx_port.setValue(self.__default_port)
 
+        # Dirty workaround to remove default button to prevent action on ENTER key, while user edit texts
+        self.__btn_dummy = QtWidgets.QPushButton(self)
+        self.__btn_dummy.setVisible(False)
+        self.__btn_dummy.setDefault(True)
+
+    def _load_cbb_folder(self):
+        """Clean up all entries and reload existing ones from treeview."""
+        self.cbb_folder.blockSignals(True)
+
+        self.cbb_folder.clear()
+        self.cbb_folder.addItem("")
+        for i in range(self.tre_connections.topLevelItemCount()):
+            item = self.tre_connections.topLevelItem(i)
+            if item.type() != NodeType.DIR:
+                continue
+            self.cbb_folder.addItem(item.text(0))
+
+        self.cbb_folder.blockSignals(False)
+
     def _load_settings(self):
         """Load values to GUI widgets."""
         pi.logger.debug("RevPiPlcList._load_settings")
 
         self.tre_connections.clear()
-        self.cbb_folder.clear()
+
-        self.cbb_folder.addItem("")
+        # Get length of array and close it, the RevPiSettings-class need it
-        for i in range(settings.beginReadArray("connections")):
+        count_settings = helper.settings.beginReadArray("connections")
-            settings.setArrayIndex(i)
+        helper.settings.endArray()
+
+        for i in range(count_settings):
+            settings = RevPiSettings(i)
 
             con_item = QtWidgets.QTreeWidgetItem(NodeType.CON)
             con_item.setIcon(0, QtGui.QIcon(":/main/ico/cpu.ico"))
-            con_item.setText(0, settings.value("name", "Revolution Pi", str))
+            con_item.setText(0, settings.name)
-            con_item.setText(1, settings.value("address", "127.0.0.1", str))
+            con_item.setText(1, settings.address)
-            con_item.setData(0, WidgetData.port, settings.value("port", self.__default_port, int))
-            con_item.setData(0, WidgetData.timeout, settings.value("timeout", 5, int))
 
-            con_item.setData(0, WidgetData.ssh_use_tunnel, settings.value("ssh_use_tunnel", False, bool))
+            con_item.setData(0, WidgetData.revpi_settings, settings)
-            con_item.setData(0, WidgetData.ssh_port, settings.value("ssh_port", 22, int))
-            con_item.setData(0, WidgetData.ssh_user, settings.value("ssh_user", "pi", str))
 
-            con_item.setData(0, WidgetData.last_dir_upload, settings.value("last_dir_upload"))
+            folder = settings.folder
-            con_item.setData(0, WidgetData.last_file_upload, settings.value("last_file_upload"))
-            con_item.setData(0, WidgetData.last_dir_pictory, settings.value("last_dir_pictory"))
-            con_item.setData(0, WidgetData.last_dir_picontrol, settings.value("last_dir_picontrol"))
-            con_item.setData(0, WidgetData.last_dir_selected, settings.value("last_dir_selected"))
-            con_item.setData(0, WidgetData.last_pictory_file, settings.value("last_pictory_file"))
-            con_item.setData(0, WidgetData.last_tar_file, settings.value("last_tar_file"))
-            con_item.setData(0, WidgetData.last_zip_file, settings.value("last_zip_file"))
-            con_item.setData(0, WidgetData.watch_files, settings.value("watch_files"))
-            con_item.setData(0, WidgetData.watch_path, settings.value("watch_path"))
-            try:
-                # Bytes with QSettings are a little difficult sometimes
-                con_item.setData(0, WidgetData.debug_geos, settings.value("debug_geos"))
-            except Exception:
-                # Just drop the geos of IO windows
-                pass
-
-            folder = settings.value("folder", "", str)
             if folder:
                 sub_folder = self._get_folder_item(folder)
                 if sub_folder is None:
@@ -80,77 +84,47 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
                     sub_folder.setIcon(0, QtGui.QIcon(":/main/ico/folder.ico"))
                     sub_folder.setText(0, folder)
                     self.tre_connections.addTopLevelItem(sub_folder)
-                    self.cbb_folder.addItem(folder)
 
                 sub_folder.addChild(con_item)
             else:
                 self.tre_connections.addTopLevelItem(con_item)
 
-        settings.endArray()
-
         self.tre_connections.expandAll()
-        self.changes = True
+        self.changes = False
 
-        if self.tre_connections.topLevelItemCount() == 0:
         self._edit_state()
 
     def accept(self) -> None:
         pi.logger.debug("RevPiPlcList.accept")
 
-        def set_settings(node: QtWidgets.QTreeWidgetItem):
+        for internal_id, ssh_user in self._keyring_cleanup_id_user:
-            parent = node.parent()
+            service_name = "{0}.{1}_{2}".format(
-            settings.setValue("address", node.text(1))
+                helper.settings.applicationName(),
-            settings.setValue("folder", parent.text(0) if parent else "")
+                helper.settings.organizationName(),
-            settings.setValue("name", node.text(0))
+                internal_id
-            settings.setValue("port", node.data(0, WidgetData.port))
+            )
-            settings.setValue("timeout", node.data(0, WidgetData.timeout))
+            try:
-            settings.setValue("ssh_use_tunnel", node.data(0, WidgetData.ssh_use_tunnel))
+                # Remove information from os keyring, which we collected on_btn_delete_clicked
-            settings.setValue("ssh_port", node.data(0, WidgetData.ssh_port))
+                keyring.delete_password(service_name, ssh_user)
-            settings.setValue("ssh_user", node.data(0, WidgetData.ssh_user))
+            except KeyringError as e:
+                pi.logger.error(e)
 
-            if node.data(0, WidgetData.last_dir_upload):
+        helper.settings.remove("connections")
-                settings.setValue("last_dir_upload", node.data(0, WidgetData.last_dir_upload))
-            if node.data(0, WidgetData.last_file_upload):
-                settings.setValue("last_file_upload", node.data(0, WidgetData.last_file_upload))
-            if node.data(0, WidgetData.last_dir_pictory):
-                settings.setValue("last_dir_pictory", node.data(0, WidgetData.last_dir_pictory))
-            if node.data(0, WidgetData.last_dir_picontrol):
-                settings.setValue("last_dir_picontrol", node.data(0, WidgetData.last_dir_picontrol))
-            if node.data(0, WidgetData.last_dir_selected):
-                settings.setValue("last_dir_selected", node.data(0, WidgetData.last_dir_selected))
-            if node.data(0, WidgetData.last_pictory_file):
-                settings.setValue("last_pictory_file", node.data(0, WidgetData.last_pictory_file))
-            if node.data(0, WidgetData.last_tar_file):
-                settings.setValue("last_tar_file", node.data(0, WidgetData.last_tar_file))
-            if node.data(0, WidgetData.last_zip_file):
-                settings.setValue("last_zip_file", node.data(0, WidgetData.last_zip_file))
-            if node.data(0, WidgetData.watch_files):
-                settings.setValue("watch_files", node.data(0, WidgetData.watch_files))
-            if node.data(0, WidgetData.watch_path):
-                settings.setValue("watch_path", node.data(0, WidgetData.watch_path))
-            if node.data(0, WidgetData.debug_geos):
-                settings.setValue("debug_geos", node.data(0, WidgetData.debug_geos))
 
-        settings.remove("connections")
-        settings.beginWriteArray("connections")
-
-        counter_index = 0
         for i in range(self.tre_connections.topLevelItemCount()):
             root_item = self.tre_connections.topLevelItem(i)
             if root_item.type() == NodeType.DIR:
                 for k in range(root_item.childCount()):
-                    settings.setArrayIndex(counter_index)
+                    revpi_settings = root_item.child(k).data(0, WidgetData.revpi_settings)  # type: RevPiSettings
-                    set_settings(root_item.child(k))
+                    revpi_settings.folder = root_item.text(0)
-                    counter_index += 1
+                    revpi_settings.save_settings()
             elif root_item.type() == NodeType.CON:
-                settings.setArrayIndex(counter_index)
+                revpi_settings = root_item.data(0, WidgetData.revpi_settings)  # type: RevPiSettings
-                set_settings(root_item)
+                revpi_settings.folder = ""
-                counter_index += 1
+                revpi_settings.save_settings()
-
-        settings.endArray()
 
         self.changes = False
-        super(RevPiPlcList, self).accept()
+        super().accept()
 
     def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
         pi.logger.debug("RevPiPlcList.closeEvent")
@@ -168,7 +142,18 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
 
     def exec(self) -> int:
         self._load_settings()
-        return super(RevPiPlcList, self).exec()
+        return super().exec()
+
+    def exec_with_presets(self, presets: RevPiSettings) -> int:
+        """
+        Start dialog with new created settings object and presets.
+
+        :param presets: Use these settings as preset
+        :return: Dialog status
+        """
+        self._load_settings()
+        self.on_btn_add_clicked(presets)
+        return super().exec()
 
     @QtCore.pyqtSlot(QtWidgets.QAbstractButton)
     def on_btn_box_clicked(self, button: QtWidgets.QAbstractButton):
@@ -179,6 +164,9 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
     # region #      REGION: Connection management
 
     def _edit_state(self):
+        """Set enabled status of all controls, depending on selected item."""
+        pi.logger.debug("RevPiPlcList._edit_state")
+
         item = self.tre_connections.currentItem()
         if item is None:
             up_ok = False
@@ -200,12 +188,16 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
 
         self.btn_up.setEnabled(up_ok)
         self.btn_down.setEnabled(down_ok)
-        self.btn_delete.setEnabled(con_item)
+        self.btn_delete.setEnabled(con_item or dir_item)
         self.txt_name.setEnabled(con_item)
         self.txt_address.setEnabled(con_item)
         self.sbx_port.setEnabled(con_item)
         self.sbx_timeout.setEnabled(con_item)
         self.cbb_folder.setEnabled(con_item or dir_item)
+        self.cbb_folder.setEditable(dir_item)
+        if self.cbb_folder.isEditable():
+            # Disable auto complete, this would override a new typed name with existing one
+            self.cbb_folder.setCompleter(None)
 
         self.cbx_ssh_use_tunnel.setEnabled(con_item)
         self.sbx_ssh_port.setEnabled(con_item)
@@ -238,50 +230,63 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
             if 0 <= index < self.tre_connections.topLevelItemCount():
                 item = self.tre_connections.takeTopLevelItem(index)
                 self.tre_connections.insertTopLevelItem(new_index, item)
+                if item.type() == NodeType.DIR:
+                    # Expand a moved dir node, it would be collapsed after move
+                    self.tre_connections.expandItem(item)
 
         self.tre_connections.setCurrentItem(item)
-        self._edit_state()
 
     @QtCore.pyqtSlot(QtWidgets.QTreeWidgetItem, QtWidgets.QTreeWidgetItem)
     def on_tre_connections_currentItemChanged(
             self, current: QtWidgets.QTreeWidgetItem, previous: QtWidgets.QTreeWidgetItem):
 
         self._edit_state()
+        self._load_cbb_folder()
+
         if current and current.type() == NodeType.CON:
             self.__current_item = current
-            self.txt_name.setText(current.text(0))
+
-            self.txt_address.setText(current.text(1))
+            settings = current.data(0, WidgetData.revpi_settings)  # type: RevPiSettings
-            self.sbx_port.setValue(current.data(0, WidgetData.port))
+            self.txt_name.setText(settings.name)
-            self.sbx_timeout.setValue(current.data(0, WidgetData.timeout))
+            self.txt_address.setText(settings.address)
+            self.sbx_port.setValue(settings.port)
+            self.sbx_timeout.setValue(settings.timeout)
             if current.parent() is None:
                 self.cbb_folder.setCurrentIndex(0)
             else:
                 self.cbb_folder.setCurrentText(current.parent().text(0))
 
-            self.cbx_ssh_use_tunnel.setChecked(current.data(0, WidgetData.ssh_use_tunnel))
+            self.cbx_ssh_use_tunnel.setChecked(settings.ssh_use_tunnel)
-            self.sbx_ssh_port.setValue(current.data(0, WidgetData.ssh_port))
+            self.sbx_ssh_port.setValue(settings.ssh_port)
-            self.txt_ssh_user.setText(current.data(0, WidgetData.ssh_user))
+            self.txt_ssh_user.setText(settings.ssh_user)
 
         elif current and current.type() == NodeType.DIR:
             self.__current_item = current
             self.cbb_folder.setCurrentText(current.text(0))
+
         else:
             self.__current_item = QtWidgets.QTreeWidgetItem()
             self.cbb_folder.setCurrentText(current.text(0) if current else "")
 
     @QtCore.pyqtSlot()
-    def on_btn_up_pressed(self):
+    def on_btn_up_clicked(self):
         self._move_item(-1)
 
     @QtCore.pyqtSlot()
-    def on_btn_down_pressed(self):
+    def on_btn_down_clicked(self):
         self._move_item(1)
 
     @QtCore.pyqtSlot()
-    def on_btn_delete_pressed(self):
+    def on_btn_delete_clicked(self):
         """Remove selected entry."""
-        item = self.tre_connections.currentItem()
+
-        if item and item.type() == NodeType.CON:
+        def remove_item(item: QtWidgets.QTreeWidgetItem):
+            """Remove CON item and save keyring actions for save action."""
+            revpi_settings = item.data(0, WidgetData.revpi_settings)  # type: RevPiSettings
+            if revpi_settings.ssh_saved_password:
+                # Cleans up keyring in save function
+                self._keyring_cleanup_id_user.append((revpi_settings.internal_id, revpi_settings.ssh_user))
+
             dir_node = item.parent()
             if dir_node:
                 dir_node.removeChild(item)
@@ -289,130 +294,160 @@ class RevPiPlcList(QtWidgets.QDialog, Ui_diag_connections):
                 index = self.tre_connections.indexOfTopLevelItem(item)
                 self.tre_connections.takeTopLevelItem(index)
 
-        self._edit_state()
+        item_to_remove = self.tre_connections.currentItem()
+
+        if item_to_remove and item_to_remove.type() == NodeType.DIR:
+            if item_to_remove.childCount():
+                rc = QtWidgets.QMessageBox.question(
+                    self, self.tr("Question"), self.tr(
+                        "If you remote this folder, all containing elements will be removed, too. \n\n"
+                        "Do you want to delete folder and all elements?"
+                    ),
+                )
+                if rc != QtWidgets.QMessageBox.Yes:
+                    return
+
+                while item_to_remove.childCount() > 0:
+                    remove_item(item_to_remove.child(0))
+
+            item_index = self.tre_connections.indexOfTopLevelItem(item_to_remove)
+            self.tre_connections.takeTopLevelItem(item_index)
+
+        elif item_to_remove and item_to_remove.type() == NodeType.CON:
+            remove_item(item_to_remove)
 
     @QtCore.pyqtSlot()
-    def on_btn_add_pressed(self):
+    def on_btn_add_clicked(self, settings_preset: RevPiSettings = None):
         """Create new element."""
-        self.__current_item = QtWidgets.QTreeWidgetItem(NodeType.CON)
+        settings = settings_preset or RevPiSettings()
-        self.__current_item.setIcon(0, QtGui.QIcon(":/main/ico/cpu.ico"))
+        new_item = QtWidgets.QTreeWidgetItem(NodeType.CON)
-        self.__current_item.setText(0, self.__default_name)
+        new_item.setIcon(0, QtGui.QIcon(":/main/ico/cpu.ico"))
-        self.__current_item.setData(0, WidgetData.port, self.__default_port)
+        new_item.setText(0, settings.name)
-        self.__current_item.setData(0, WidgetData.timeout, 5)
+        new_item.setData(0, WidgetData.revpi_settings, settings)
-        self.__current_item.setData(0, WidgetData.ssh_use_tunnel, False)
-        self.__current_item.setData(0, WidgetData.ssh_port, 22)
-        self.__current_item.setData(0, WidgetData.ssh_user, "pi")
         sub_folder = self._get_folder_item(self.cbb_folder.currentText())
         if sub_folder:
-            sub_folder.addChild(self.__current_item)
+            sub_folder.addChild(new_item)
         else:
-            self.tre_connections.addTopLevelItem(self.__current_item)
+            self.tre_connections.addTopLevelItem(new_item)
 
-        self.tre_connections.setCurrentItem(self.__current_item)
+        # This will load all settings and prepare widgets
+        self.tre_connections.setCurrentItem(new_item)
         self.txt_name.setFocus()
         self.txt_name.selectAll()
 
+    @QtCore.pyqtSlot()
+    def on_btn_add_dir_clicked(self):
+        """Add a new folder."""
+        folder_text = self.tr("New folder")
+        sub_folder = QtWidgets.QTreeWidgetItem(NodeType.DIR)
+        sub_folder.setIcon(0, QtGui.QIcon(":/main/ico/folder.ico"))
+        sub_folder.setText(0, folder_text)
+
+        self.tre_connections.addTopLevelItem(sub_folder)
+        self.tre_connections.setCurrentItem(sub_folder)
+        self.cbb_folder.setFocus()
+
+        self.changes = True
+
     @QtCore.pyqtSlot(str)
     def on_txt_name_textEdited(self, text):
         if self.__current_item.type() != NodeType.CON:
             return
         self.__current_item.setText(0, text)
+        settings = self.__current_item.data(0, WidgetData.revpi_settings)  # type: RevPiSettings
+        settings.name = text
+        self.changes = True
 
     @QtCore.pyqtSlot(str)
     def on_txt_address_textEdited(self, text):
         if self.__current_item.type() != NodeType.CON:
             return
         self.__current_item.setText(1, text)
+        settings = self.__current_item.data(0, WidgetData.revpi_settings)  # type: RevPiSettings
+        settings.address = text
+        self.changes = True
 
     @QtCore.pyqtSlot(int)
     def on_sbx_port_valueChanged(self, value: int):
         if self.__current_item.type() != NodeType.CON:
             return
-        self.__current_item.setData(0, WidgetData.port, value)
+        settings = self.__current_item.data(0, WidgetData.revpi_settings)  # type: RevPiSettings
+        settings.port = value
+        self.changes = True
 
     @QtCore.pyqtSlot(int)
     def on_sbx_timeout_valueChanged(self, value: int):
         if self.__current_item.type() != NodeType.CON:
             return
-        self.__current_item.setData(0, WidgetData.timeout, value)
+        settings = self.__current_item.data(0, WidgetData.revpi_settings)  # type: RevPiSettings
+        settings.timeout = value
+        self.changes = True
 
     @QtCore.pyqtSlot(int)
     def on_cbx_ssh_use_tunnel_stateChanged(self, check_state: int):
         if self.__current_item.type() != NodeType.CON:
             return
-        self.__current_item.setData(0, WidgetData.ssh_use_tunnel, check_state == QtCore.Qt.CheckState.Checked)
+        settings = self.__current_item.data(0, WidgetData.revpi_settings)  # type: RevPiSettings
+        settings.ssh_use_tunnel = check_state == QtCore.Qt.CheckState.Checked
+        self.changes = True
 
     @QtCore.pyqtSlot(int)
     def on_sbx_ssh_port_valueChanged(self, value: int):
         if self.__current_item.type() != NodeType.CON:
             return
-        self.__current_item.setData(0, WidgetData.ssh_port, value)
+        settings = self.__current_item.data(0, WidgetData.revpi_settings)  # type: RevPiSettings
+        settings.ssh_port = value
+        self.changes = True
 
     @QtCore.pyqtSlot(str)
     def on_txt_ssh_user_textEdited(self, text):
         if self.__current_item.type() != NodeType.CON:
             return
-        self.__current_item.setData(0, WidgetData.ssh_user, text)
+        settings = self.__current_item.data(0, WidgetData.revpi_settings)  # type: RevPiSettings
+        settings.ssh_user = text
+        self.changes = True
+
+    @QtCore.pyqtSlot(str)
+    def on_cbb_folder_currentIndexChanged(self, text: str):
+        pi.logger.debug("RevPiPlcList.on_cbb_folder_currentIndexChanged({0})".format(text))
+
+        if self.__current_item.type() == NodeType.CON:
+            new_dir_node = self._get_folder_item(text)
+            current_dir_node = self.__current_item.parent()
+            if current_dir_node == new_dir_node:
+                # No change required, both nodes are the same
+                return
+
+            change_item = self.__current_item
+            self.tre_connections.blockSignals(True)
+            self.changes = True
+
+            if current_dir_node:
+                # Move an element to other folder or root
+                index = current_dir_node.indexOfChild(change_item)
+                change_item = current_dir_node.takeChild(index)
+
+            else:
+                # Move a root element to a folder
+                index = self.tre_connections.indexOfTopLevelItem(change_item)
+                change_item = self.tre_connections.takeTopLevelItem(index)
+
+            if text == "":
+                self.tre_connections.addTopLevelItem(change_item)
+
+            else:
+                new_dir_node.addChild(change_item)
+
+            self.tre_connections.blockSignals(False)
+            self.tre_connections.setCurrentItem(change_item)
 
     @QtCore.pyqtSlot(str)
     def on_cbb_folder_editTextChanged(self, text: str):
         pi.logger.debug("RevPiPlcList.on_cbb_folder_editTextChanged({0})".format(text))
 
-        if self.__current_item.type() == NodeType.DIR:
+        if self.__current_item.type() == NodeType.DIR and self.__current_item.text(0) != text:
             # We just have to rename the dir node
             self.__current_item.setText(0, text)
-
+            self.changes = True
-        elif self.__current_item.type() == NodeType.CON:
-            sub_folder = self._get_folder_item(text)
-            dir_node = self.__current_item.parent()
-            if dir_node:
-                if dir_node.text(0) == text:
-                    # It is the same folder
-                    return
-
-                if text != "" and dir_node.childCount() == 1 and not sub_folder:
-                    # The folder hold just one item, so we can rename that
-                    for i in range(self.cbb_folder.count()):
-                        if self.cbb_folder.itemText(i) == dir_node.text(0):
-                            self.cbb_folder.setItemText(i, text)
-                            break
-                    dir_node.setText(0, text)
-                    return
-
-                index = dir_node.indexOfChild(self.__current_item)
-                self.__current_item = dir_node.takeChild(index)
-
-            elif text != "":
-                # Move root to folder
-                index = self.tre_connections.indexOfTopLevelItem(self.__current_item)
-                self.__current_item = self.tre_connections.takeTopLevelItem(index)
-
-            else:
-                # Root stays root
-                return
-
-            if text == "":
-                self.tre_connections.addTopLevelItem(self.__current_item)
-
-            else:
-                if sub_folder is None:
-                    sub_folder = QtWidgets.QTreeWidgetItem(NodeType.DIR)
-                    sub_folder.setIcon(0, QtGui.QIcon(":/main/ico/folder.ico"))
-                    sub_folder.setText(0, text)
-                    self.tre_connections.addTopLevelItem(sub_folder)
-                    self.cbb_folder.addItem(text)
-                sub_folder.addChild(self.__current_item)
-
-            if dir_node and dir_node.childCount() == 0:
-                # Remove empty folders
-                for i in range(self.cbb_folder.count()):
-                    if self.cbb_folder.itemText(i) == dir_node.text(0):
-                        self.cbb_folder.removeItem(i)
-                        break
-                index = self.tre_connections.indexOfTopLevelItem(dir_node)
-                self.tre_connections.takeTopLevelItem(index)
-
-            self.tre_connections.setCurrentItem(self.__current_item)
-            self.cbb_folder.setFocus()
 
     # endregion # # # # #

src/revpicommander/revpiprogram.py

@@ -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
@@ -23,7 +23,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
     """Program options of RevPiPyLoad."""
 
     def __init__(self, parent=None):
-        super(RevPiProgram, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         self.setFixedSize(self.size())
 
@@ -58,8 +58,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
 
         :return: True, if unsaved changes was found
         """
-        return \
+        return self.cbb_plcprogram.currentText() != self.dc.get("plcprogram", "") or \
-            self.cbb_plcprogram.currentText() != self.dc.get("plcprogram", "") or \
             self.txt_plcarguments.text() != self.dc.get("plcarguments", "") or \
             self.rbn_pythonversion_2.isChecked() != (self.dc.get("pythonversion", 3) == 2) or \
             self.rbn_pythonversion_3.isChecked() != (self.dc.get("pythonversion", 3) == 3) or \
@@ -104,7 +103,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
     def accept(self) -> None:
         # todo: After upload ask for restart pcl program?
         if not self._changesdone():
-            super(RevPiProgram, self).accept()
+            super().accept()
             return
 
         if self.cbb_plcprogram.currentText() == "":
@@ -139,7 +138,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
         )
 
         if saved:
-            super(RevPiProgram, self).accept()
+            super().accept()
         else:
             QtWidgets.QMessageBox.critical(
                 self, self.tr("Error"), self.tr(
@@ -168,19 +167,19 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
             return QtWidgets.QDialog.Rejected
 
         self.dc = helper.cm.call_remote_function("get_config", default_value={})
-        self.lst_files = helper.cm.call_remote_function("get_filelist", default_value=[])
+        self.lst_files = helper.cm.call_remote_function("get_filelist", default_value=None)
-        if len(self.dc) == 0 or len(self.lst_files) == 0:
+        if len(self.dc) == 0 or self.lst_files is None:
             return QtWidgets.QDialog.Rejected
 
         self._load_settings()
         self._apply_acl()
 
-        return super(RevPiProgram, self).exec()
+        return super().exec()
 
     def reject(self) -> None:
         """Reject all sub windows and reload settings."""
         self._load_settings()
-        super(RevPiProgram, self).reject()
+        super().reject()
 
     # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
     # region #      REGION: PLC program
@@ -213,7 +212,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
                 )
             )
         elif ec == 0:
-            helper.cm.program_last_pictory_file = filename
+            helper.cm.settings.last_pictory_file = filename
             if ask == QtWidgets.QMessageBox.Yes:
                 QtWidgets.QMessageBox.information(
                     self, self.tr("Success"), self.tr(
@@ -319,21 +318,16 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
         self.cbx_pictory.setEnabled(index >= 1)
 
     @QtCore.pyqtSlot()
-    def on_btn_program_download_pressed(self):
+    def on_btn_program_download_clicked(self):
         """Download plc program from Revolution Pi."""
         if not helper.cm.connected:
             return
 
-        selected_dir = ""
-
         if self.cbb_format.currentIndex() == 0:
             # Save files as zip archive
             diag_save = QtWidgets.QFileDialog(
                 self, self.tr("Save ZIP archive..."),
-                os.path.join(
+                helper.cm.settings.last_zip_file or "{0}.zip".format(helper.cm.settings.name),
-                    helper.cm.program_last_zip_file,
-                    "{0}.zip".format(helper.cm.name)
-                ),
                 self.tr("ZIP archive (*.zip);;All files (*.*)")
             )
             diag_save.setAcceptMode(QtWidgets.QFileDialog.AcceptSave)
@@ -345,16 +339,13 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
             filename = diag_save.selectedFiles()[0]
             fh = open(filename, "wb")
 
-            helper.cm.program_last_zip_file = filename
+            helper.cm.settings.last_zip_file = filename
 
         elif self.cbb_format.currentIndex() == 1:
             # Save files as TarGz archive
             diag_save = QtWidgets.QFileDialog(
                 self, self.tr("Save TGZ archive..."),
-                os.path.join(
+                helper.cm.settings.last_tar_file or "{0}.tgz".format(helper.cm.settings.name),
-                    helper.cm.program_last_tar_file,
-                    "{0}.tgz".format(helper.cm.name)
-                ),
                 self.tr("TGZ archive (*.tgz);;All files (*.*)")
             )
             diag_save.setAcceptMode(QtWidgets.QFileDialog.AcceptSave)
@@ -366,7 +357,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
             filename = diag_save.selectedFiles()[0]
             fh = open(filename, "wb")
 
-            helper.cm.program_last_tar_file = filename
+            helper.cm.settings.last_tar_file = filename
 
         else:
             # Other indexes are not allowed for download
@@ -405,7 +396,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
                 )
 
     @QtCore.pyqtSlot()
-    def on_btn_program_upload_pressed(self):
+    def on_btn_program_upload_clicked(self):
         """Upload plc program to Revolution Pi."""
         if not helper.cm.connected:
             return
@@ -426,7 +417,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
             # Upload zip archive content
             diag_open = QtWidgets.QFileDialog(
                 self, self.tr("Upload content of ZIP archive..."),
-                helper.cm.program_last_file_upload,
+                helper.cm.settings.last_file_upload,
                 self.tr("ZIP archive (*.zip);;All files (*.*)")
             )
             diag_open.setAcceptMode(QtWidgets.QFileDialog.AcceptOpen)
@@ -438,7 +429,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
                 return
 
             filename = diag_open.selectedFiles()[0]
-            helper.cm.program_last_file_upload = filename
+            helper.cm.settings.last_file_upload = filename
             if zipfile.is_zipfile(filename):
                 dirtmp = mkdtemp()
                 fhz = zipfile.ZipFile(filename)
@@ -460,7 +451,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
             # Upload TarGz content
             diag_open = QtWidgets.QFileDialog(
                 self, self.tr("Upload content of TAR archive..."),
-                helper.cm.program_last_file_upload,
+                helper.cm.settings.last_file_upload,
                 self.tr("TAR archive (*.tgz);;All files (*.*)")
             )
             diag_open.setAcceptMode(QtWidgets.QFileDialog.AcceptOpen)
@@ -472,7 +463,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
                 return
 
             filename = diag_open.selectedFiles()[0]
-            helper.cm.program_last_file_upload = filename
+            helper.cm.settings.last_file_upload = filename
             if tarfile.is_tarfile(filename):
                 dirtmp = mkdtemp()
                 fht = tarfile.open(filename)
@@ -598,7 +589,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
     # region #      REGION: Control files
 
     @QtCore.pyqtSlot()
-    def on_btn_pictory_download_pressed(self):
+    def on_btn_pictory_download_clicked(self):
         """Download piCtory configuration."""
         if not helper.cm.connected:
             return
@@ -606,8 +597,8 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
         diag_save = QtWidgets.QFileDialog(
             self, self.tr("Save piCtory file..."),
             os.path.join(
-                helper.cm.program_last_dir_pictory,
+                helper.cm.settings.last_dir_pictory,
-                "{0}.rsc".format(helper.cm.name)
+                "{0}.rsc".format(helper.cm.settings.name)
             ),
             self.tr("piCtory file (*.rsc);;All files (*.*)")
         )
@@ -619,7 +610,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
             return
 
         filename = diag_save.selectedFiles()[0]
-        helper.cm.program_last_dir_pictory = os.path.dirname(filename)
+        helper.cm.settings.last_dir_pictory = os.path.dirname(filename)
         bin_buffer = helper.cm.call_remote_function("get_pictoryrsc")  # type: Binary
         if bin_buffer is None:
             QtWidgets.QMessageBox.critical(
@@ -639,13 +630,13 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
             )
 
     @QtCore.pyqtSlot()
-    def on_btn_pictory_upload_pressed(self):
+    def on_btn_pictory_upload_clicked(self):
         if not helper.cm.connected:
             return
 
         diag_open = QtWidgets.QFileDialog(
             self, self.tr("Upload piCtory file..."),
-            helper.cm.program_last_pictory_file,
+            helper.cm.settings.last_pictory_file or "{0}.rsc".format(helper.cm.settings.name),
             self.tr("piCtory file (*.rsc);;All files (*.*)")
         )
         diag_open.setAcceptMode(QtWidgets.QFileDialog.AcceptOpen)
@@ -659,7 +650,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
         self._upload_pictory(diag_open.selectedFiles()[0])
 
     @QtCore.pyqtSlot()
-    def on_btn_procimg_download_pressed(self):
+    def on_btn_procimg_download_clicked(self):
         """Download process image."""
         if not helper.cm.connected:
             return
@@ -668,8 +659,8 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
             self,
             self.tr("Save piControl file..."),
             os.path.join(
-                helper.cm.program_last_dir_picontrol,
+                helper.cm.settings.last_dir_picontrol,
-                "{0}.img".format(helper.cm.name)
+                "{0}.img".format(helper.cm.settings.name)
             ),
             self.tr("Process image file (*.img);;All files (*.*)")
         )
@@ -681,7 +672,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
             return
 
         filename = diag_save.selectedFiles()[0]
-        helper.cm.program_last_dir_picontrol = os.path.dirname(filename)
+        helper.cm.settings.last_dir_picontrol = os.path.dirname(filename)
         bin_buffer = helper.cm.call_remote_function("get_procimg")  # type: Binary
 
         if bin_buffer is None:

src/revpicommander/simulator.py

@@ -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
@@ -21,7 +21,7 @@ class Simulator(QtWidgets.QDialog, Ui_diag_simulator):
     """
 
     def __init__(self, parent=None):
-        super(Simulator, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         self.clean_procimg = False
         self.max_items = 5
@@ -69,7 +69,7 @@ class Simulator(QtWidgets.QDialog, Ui_diag_simulator):
 
         self.clean_procimg = self.sender() is self.btn_start_empty
 
-        super(Simulator, self).accept()
+        super().accept()
 
     def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
         self._save_gui()

src/revpicommander/ssh_tunneling/__init__.py

@@ -2,4 +2,4 @@
 """Package of ssh tunnel connections."""
 __author__ = "Sven Sager"
 __copyright__ = "Copyright (C) 2023 Sven Sager"
-__license__ = "GPLv3"
+__license__ = "GPLv2"

src/revpicommander/ssh_tunneling/server.py

@@ -7,17 +7,21 @@ 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 logging import getLogger
 from socketserver import BaseRequestHandler, ThreadingTCPServer
 from threading import Thread
+from typing import Tuple, Union
 
-from paramiko.client import SSHClient, WarningPolicy
+from paramiko.client import MissingHostKeyPolicy, SSHClient
 from paramiko.rsakey import RSAKey
 from paramiko.ssh_exception import PasswordRequiredException
 from paramiko.transport import Transport
 
+log = getLogger("ssh_tunneling")
+
 
 class ForwardServer(ThreadingTCPServer):
     daemon_threads = True
@@ -33,10 +37,14 @@ class Handler(BaseRequestHandler):
                 self.request.getpeername(),
             )
         except Exception as e:
+            log.error(e)
             return
         if chan is None:
+            log.error("Could not create a ssh channel")
             return
 
+        log.info("Starting tunnel exchange loop")
+
         while True:
             r, w, x = select.select([self.request, chan], [], [], 5.0)
             if self.request in r:
@@ -50,6 +58,8 @@ class Handler(BaseRequestHandler):
                     break
                 self.request.send(data)
 
+        log.info("Stopped tunnel exchange loop")
+
         chan.close()
         self.request.close()
 
@@ -71,8 +81,7 @@ class SSHLocalTunnel:
         self._th_server = Thread()
 
         self._ssh_client = SSHClient()
-        self._ssh_client.load_system_host_keys()
+        self._ssh_client.set_missing_host_key_policy(MissingHostKeyPolicy())
-        self._ssh_client.set_missing_host_key_policy(WarningPolicy())
 
         self._ssh_transport = None  # type: Transport
         self._forward_server = None  # type: ThreadingTCPServer
@@ -163,6 +172,30 @@ class SSHLocalTunnel:
             return True
         return False
 
+    def send_cmd(self, cmd: str, timeout: float = None) -> Union[Tuple[str, str], Tuple[None, None]]:
+        """
+        Send simple command to ssh host.
+
+        The output of stdout and stderr is returned as a tuple of two elements.
+        This elements could be None, in case of an internal error.
+
+        :param cmd: Shell command to execute on remote host
+        :param timeout: Timeout for execution
+        :return: Tuple with stdout and stderr
+        """
+        if not self._th_server.is_alive():
+            raise RuntimeError("Not connected")
+
+        try:
+            _, stdout, stderr = self._ssh_client.exec_command(cmd, 1024, timeout)
+            buffer_out = stdout.read()
+            buffer_err = stderr.read()
+
+            return buffer_out.decode(), buffer_err.decode()
+        except Exception as e:
+            log.error(e)
+            return None, None
+
     @property
     def connected(self):
         """Check connection state of ssh tunnel."""

src/revpicommander/sshauth.py

@@ -2,37 +2,103 @@
 """Authentication dialog for SSH."""
 __author__ = "Sven Sager"
 __copyright__ = "Copyright (C) 2023 Sven Sager"
-__license__ = "GPLv3"
+__license__ = "GPLv2"
 
-from enum import Enum
+from logging import getLogger
 
+import keyring
 from PyQt5 import QtWidgets
+from keyring.errors import KeyringError
 
-from revpicommander.ui.sshauth_ui import Ui_diag_sshauth
+from .ui.sshauth_ui import Ui_diag_sshauth
 
+log = getLogger()
 
-class SSHAuthType(Enum):
-    PASS = "pass"
-    KEYS = "keys"
 
 class SSHAuth(QtWidgets.QDialog, Ui_diag_sshauth):
-    """Version information window."""
 
-    def __init__(self, auth_type: SSHAuthType, parent=None):
+    def __init__(self, user_name="", service_name: str = None, parent=None):
-        super(SSHAuth, self).__init__(parent)
+        """
+        Ask the user for username and password or use saved entries.
+
+        If you want to use the operating system's password storage, you have
+        to set a 'service_name'. The value must be unique for your application
+        or for each user, if the username is the same.
+
+        :param user_name: Preset username, also used to check password save
+        :param service_name: Identity to save passwords in os's password save
+        :param parent: Qt parent for this dialog
+        """
+        log.debug("SSHAuth.__init__")
+
+        super().__init__(parent)
         self.setupUi(self)
 
-        self.wid_password.setVisible(auth_type is SSHAuthType.PASS)
+        self._in_keyring = False
-        self.wid_keys.setVisible(auth_type is SSHAuthType.KEYS)
+        self._service_name = service_name
+        self.cbx_save_password.setVisible(bool(service_name))
+        self.txt_username.setText(user_name)
+
+    def accept(self) -> None:
+        log.debug("SSHAuth.accept")
+
+        if self._service_name and self.cbx_save_password.isChecked():
+            try:
+                keyring.set_password(self._service_name, self.username, self.password)
+            except KeyringError as e:
+                log.error(e)
+                self._in_keyring = False
+                QtWidgets.QMessageBox.warning(
+                    self, self.tr("Could not save password"), self.tr(
+                        "Could not save password to operating systems password save.\n\n"
+                        "Maybe your operating system does not support saving passwords. "
+                        "This could be due to missing libraries or programs.\n\n"
+                        "This is not an error of RevPi Commander."
+                    )
+                )
+            else:
+                self._in_keyring = True
+
+        super().accept()
+
+    def exec(self) -> int:
+        log.debug("SSHAuth.exec")
+
+        if self._service_name:
+            try:
+                saved_password = keyring.get_password(self._service_name, self.username)
+            except KeyringError as e:
+                log.error(e)
+                self._in_keyring = False
+            else:
+                if saved_password:
+                    self._in_keyring = True
+                    self.txt_password.setText(saved_password)
+                    return QtWidgets.QDialog.Accepted
+
+        return super().exec()
+
+    def remove_saved_password(self) -> None:
+        """Remove saved password."""
+        log.debug("SSHAuth.remove_saved_password")
+
+        if self._service_name:
+            try:
+                keyring.delete_password(self._service_name, self.username)
+            except KeyringError as e:
+                log.error(e)
+
+    @property
+    def in_keyring(self) -> bool:
+        """True, if password is in keyring."""
+        return self._in_keyring
 
     @property
     def password(self) -> str:
+        """Get the saved or entered password."""
         return self.txt_password.text()
 
     @property
     def username(self) -> str:
+        """Get the entered username."""
         return self.txt_username.text()
-
-    @username.setter
-    def username(self, value: str):
-        self.txt_username.setText(value)

src/revpicommander/ui/__init__.py

@@ -2,4 +2,4 @@
 """Package of compiled Qt ui files."""
 __author__ = "Sven Sager"
 __copyright__ = "Copyright (C) 2023 Sven Sager"
-__license__ = "GPLv3"
+__license__ = "GPLv2"

src/revpicommander/ui/avahisearch_ui.py

@@ -75,6 +75,8 @@ class Ui_diag_search(object):
         self.act_connect_ssh.setObjectName("act_connect_ssh")
         self.act_connect_xmlrpc = QtWidgets.QAction(diag_search)
         self.act_connect_xmlrpc.setObjectName("act_connect_xmlrpc")
+        self.act_connect = QtWidgets.QAction(diag_search)
+        self.act_connect.setObjectName("act_connect")
 
         self.retranslateUi(diag_search)
         self.btn_box.rejected.connect(diag_search.reject) # type: ignore
@@ -99,6 +101,8 @@ class Ui_diag_search(object):
         self.act_connect_ssh.setToolTip(_translate("diag_search", "Establish a connection via encrypted SSH tunnel"))
         self.act_connect_xmlrpc.setText(_translate("diag_search", "Connect via XML-RPC"))
         self.act_connect_xmlrpc.setToolTip(_translate("diag_search", "You have to configure your Revolution Pi to accept this connections"))
+        self.act_connect.setText(_translate("diag_search", "Connect"))
+        self.act_connect.setToolTip(_translate("diag_search", "Connect to Revoluton Pi"))
 from . import ressources_rc
 
 

src/revpicommander/ui/backgroundworker_ui.py

@@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_diag_backgroundworker(object):
     def setupUi(self, diag_backgroundworker):
         diag_backgroundworker.setObjectName("diag_backgroundworker")
-        diag_backgroundworker.resize(418, 97)
+        diag_backgroundworker.resize(424, 104)
         diag_backgroundworker.setModal(True)
         self.verticalLayout = QtWidgets.QVBoxLayout(diag_backgroundworker)
         self.verticalLayout.setObjectName("verticalLayout")
@@ -37,8 +37,7 @@ class Ui_diag_backgroundworker(object):
         QtCore.QMetaObject.connectSlotsByName(diag_backgroundworker)
 
     def retranslateUi(self, diag_backgroundworker):
-        _translate = QtCore.QCoreApplication.translate
+        pass
-        diag_backgroundworker.setWindowTitle(_translate("diag_backgroundworker", "File transfer..."))
 
 
 if __name__ == "__main__":

src/revpicommander/ui/debugcontrol_ui.py

@@ -36,15 +36,18 @@ class Ui_wid_debugcontrol(object):
         self.verticalLayout = QtWidgets.QVBoxLayout(self.gb_control)
         self.verticalLayout.setObjectName("verticalLayout")
         self.btn_read_io = QtWidgets.QPushButton(self.gb_control)
-        self.btn_read_io.setShortcut("F4")
+        self.btn_read_io.setAutoRepeat(True)
+        self.btn_read_io.setAutoRepeatDelay(100)
+        self.btn_read_io.setAutoRepeatInterval(200)
         self.btn_read_io.setObjectName("btn_read_io")
         self.verticalLayout.addWidget(self.btn_read_io)
         self.btn_refresh_io = QtWidgets.QPushButton(self.gb_control)
-        self.btn_refresh_io.setShortcut("F5")
+        self.btn_refresh_io.setAutoRepeat(True)
+        self.btn_refresh_io.setAutoRepeatDelay(100)
+        self.btn_refresh_io.setAutoRepeatInterval(200)
         self.btn_refresh_io.setObjectName("btn_refresh_io")
         self.verticalLayout.addWidget(self.btn_refresh_io)
         self.btn_write_o = QtWidgets.QPushButton(self.gb_control)
-        self.btn_write_o.setShortcut("F6")
         self.btn_write_o.setObjectName("btn_write_o")
         self.verticalLayout.addWidget(self.btn_write_o)
         self.cbx_refresh = QtWidgets.QCheckBox(self.gb_control)
@@ -65,9 +68,13 @@ class Ui_wid_debugcontrol(object):
         self.gb_devices.setTitle(_translate("wid_debugcontrol", "Revolution Pi devices"))
         self.cbx_stay_on_top.setText(_translate("wid_debugcontrol", "Open to stay on top"))
         self.gb_control.setTitle(_translate("wid_debugcontrol", "IO Control"))
-        self.btn_read_io.setToolTip(_translate("wid_debugcontrol", "Read all IO values and discard local changes (F4)"))
+        self.btn_read_io.setToolTip(_translate("wid_debugcontrol", "Read all IO values and discard local changes (F4)\n"
+"\n"
+"Hold this button pressed and it will refresh the IOs every 200 ms."))
         self.btn_read_io.setText(_translate("wid_debugcontrol", "Read &all IO values"))
-        self.btn_refresh_io.setToolTip(_translate("wid_debugcontrol", "Refresh all IO values which are locally not changed (F5)"))
+        self.btn_refresh_io.setToolTip(_translate("wid_debugcontrol", "Refresh all IO values which are locally not changed (F5)\n"
+"\n"
+"Hold this button pressed and it will refresh the IOs every 200 ms."))
         self.btn_refresh_io.setText(_translate("wid_debugcontrol", "&Refresh unchanged IOs"))
         self.btn_write_o.setToolTip(_translate("wid_debugcontrol", "Write locally changed output values to process image (F6)"))
         self.btn_write_o.setText(_translate("wid_debugcontrol", "&Write changed outputs"))

src/revpicommander/ui/revpiinfo_ui.py

@@ -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__":

src/revpicommander/ui/revpioption_ui.py

@@ -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_aclplcserver = QtWidgets.QPushButton(self.gb_server)
-        self.btn_aclplcslave.setObjectName("btn_aclplcslave")
+        self.btn_aclplcserver.setObjectName("btn_aclplcserver")
-        self.gridLayout_2.addWidget(self.btn_aclplcslave, 0, 1, 1, 1)
+        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_plcserver = QtWidgets.QCheckBox(self.gb_server)
-        self.cbx_plcslave.setObjectName("cbx_plcslave")
+        self.cbx_plcserver.setObjectName("cbx_plcserver")
-        self.gridLayout_2.addWidget(self.cbx_plcslave, 0, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.cbx_plcserver, 0, 0, 1, 1)
-        self.lbl_slave_status = QtWidgets.QLabel(self.gb_server)
+        self.lbl_server_status = QtWidgets.QLabel(self.gb_server)
-        self.lbl_slave_status.setAlignment(QtCore.Qt.AlignCenter)
+        self.lbl_server_status.setAlignment(QtCore.Qt.AlignCenter)
-        self.lbl_slave_status.setObjectName("lbl_slave_status")
+        self.lbl_server_status.setObjectName("lbl_server_status")
-        self.gridLayout_2.addWidget(self.lbl_slave_status, 1, 1, 1, 1)
+        self.gridLayout_2.addWidget(self.lbl_server_status, 1, 1, 1, 1)
-        self.lbl_lbl_slave_status = QtWidgets.QLabel(self.gb_server)
+        self.lbl_lbl_server_status = QtWidgets.QLabel(self.gb_server)
-        self.lbl_lbl_slave_status.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.lbl_lbl_server_status.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.lbl_lbl_slave_status.setObjectName("lbl_lbl_slave_status")
+        self.lbl_lbl_server_status.setObjectName("lbl_lbl_server_status")
-        self.gridLayout_2.addWidget(self.lbl_lbl_slave_status, 1, 0, 1, 1)
+        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.cbx_plcserver.setText(_translate("diag_options", "Start RevPi piControl server"))
-        self.lbl_slave_status.setText(_translate("diag_options", "status"))
+        self.lbl_server_status.setText(_translate("diag_options", "status"))
-        self.lbl_lbl_slave_status.setText(_translate("diag_options", "piControl server is:"))
+        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"))

src/revpicommander/ui/revpiplclist_ui.py

@@ -67,6 +67,7 @@ class Ui_diag_connections(object):
         self.formLayout_2.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.lbl_folder)
         self.cbb_folder = QtWidgets.QComboBox(self.tab_connection)
         self.cbb_folder.setEditable(True)
+        self.cbb_folder.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
         self.cbb_folder.setObjectName("cbb_folder")
         self.cbb_folder.addItem("")
         self.cbb_folder.setItemText(0, "")
@@ -115,39 +116,41 @@ class Ui_diag_connections(object):
         spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
         self.vl_edit.addItem(spacerItem)
         self.btn_up = QtWidgets.QPushButton(diag_connections)
-        self.btn_up.setText("")
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(":/action/ico/arrow-up.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.btn_up.setIcon(icon)
         self.btn_up.setObjectName("btn_up")
         self.vl_edit.addWidget(self.btn_up)
         self.btn_down = QtWidgets.QPushButton(diag_connections)
-        self.btn_down.setText("")
         icon1 = QtGui.QIcon()
         icon1.addPixmap(QtGui.QPixmap(":/action/ico/arrow-down.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.btn_down.setIcon(icon1)
         self.btn_down.setObjectName("btn_down")
         self.vl_edit.addWidget(self.btn_down)
         self.btn_delete = QtWidgets.QPushButton(diag_connections)
-        self.btn_delete.setText("")
         icon2 = QtGui.QIcon()
-        icon2.addPixmap(QtGui.QPixmap(":/action/ico/edit-delete.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon2.addPixmap(QtGui.QPixmap(":/action/ico/edit-delete-6.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.btn_delete.setIcon(icon2)
         self.btn_delete.setObjectName("btn_delete")
         self.vl_edit.addWidget(self.btn_delete)
-        self.btn_add = QtWidgets.QPushButton(diag_connections)
+        self.btn_add_dir = QtWidgets.QPushButton(diag_connections)
-        self.btn_add.setText("")
         icon3 = QtGui.QIcon()
-        icon3.addPixmap(QtGui.QPixmap(":/action/ico/edit-add.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon3.addPixmap(QtGui.QPixmap(":/action/ico/folder-open.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.btn_add.setIcon(icon3)
+        self.btn_add_dir.setIcon(icon3)
+        self.btn_add_dir.setObjectName("btn_add_dir")
+        self.vl_edit.addWidget(self.btn_add_dir)
+        self.btn_add = QtWidgets.QPushButton(diag_connections)
+        icon4 = QtGui.QIcon()
+        icon4.addPixmap(QtGui.QPixmap(":/action/ico/edit-add.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.btn_add.setIcon(icon4)
         self.btn_add.setObjectName("btn_add")
         self.vl_edit.addWidget(self.btn_add)
         self.gridLayout.addLayout(self.vl_edit, 0, 1, 1, 1)
 
         self.retranslateUi(diag_connections)
         self.tab_properties.setCurrentIndex(0)
-        self.btn_box.accepted.connect(diag_connections.accept) # type: ignore
         self.btn_box.rejected.connect(diag_connections.reject) # type: ignore
+        self.btn_box.accepted.connect(diag_connections.accept) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(diag_connections)
 
     def retranslateUi(self, diag_connections):

src/revpicommander/ui/sshauth_ui.py

@@ -15,8 +15,9 @@ class Ui_diag_sshauth(object):
     def setupUi(self, diag_sshauth):
         diag_sshauth.setObjectName("diag_sshauth")
         diag_sshauth.setWindowModality(QtCore.Qt.ApplicationModal)
-        diag_sshauth.resize(275, 170)
+        diag_sshauth.resize(331, 225)
         self.verticalLayout = QtWidgets.QVBoxLayout(diag_sshauth)
+        self.verticalLayout.setSizeConstraint(QtWidgets.QLayout.SetFixedSize)
         self.verticalLayout.setObjectName("verticalLayout")
         self.wid_password = QtWidgets.QWidget(diag_sshauth)
         self.wid_password.setObjectName("wid_password")
@@ -36,18 +37,28 @@ class Ui_diag_sshauth(object):
         self.txt_username.setObjectName("txt_username")
         self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.txt_username)
         self.verticalLayout.addWidget(self.wid_password)
-        self.wid_keys = QtWidgets.QWidget(diag_sshauth)
+        self.cbx_save_password = QtWidgets.QCheckBox(diag_sshauth)
-        self.wid_keys.setObjectName("wid_keys")
+        self.cbx_save_password.setObjectName("cbx_save_password")
-        self.verticalLayout.addWidget(self.wid_keys)
+        self.verticalLayout.addWidget(self.cbx_save_password)
-        self.buttonBox = QtWidgets.QDialogButtonBox(diag_sshauth)
+        self.btn_box = QtWidgets.QDialogButtonBox(diag_sshauth)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.btn_box.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.btn_box.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
+        self.btn_box.setObjectName("btn_box")
-        self.verticalLayout.addWidget(self.buttonBox)
+        self.verticalLayout.addWidget(self.btn_box)
+        self.lbl_info = QtWidgets.QLabel(diag_sshauth)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.lbl_info.sizePolicy().hasHeightForWidth())
+        self.lbl_info.setSizePolicy(sizePolicy)
+        self.lbl_info.setWordWrap(True)
+        self.lbl_info.setObjectName("lbl_info")
+        self.verticalLayout.addWidget(self.lbl_info)
+        self.verticalLayout.setStretch(3, 1)
 
         self.retranslateUi(diag_sshauth)
-        self.buttonBox.accepted.connect(diag_sshauth.accept) # type: ignore
+        self.btn_box.accepted.connect(diag_sshauth.accept) # type: ignore
-        self.buttonBox.rejected.connect(diag_sshauth.reject) # type: ignore
+        self.btn_box.rejected.connect(diag_sshauth.reject) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(diag_sshauth)
 
     def retranslateUi(self, diag_sshauth):
@@ -55,6 +66,9 @@ class Ui_diag_sshauth(object):
         diag_sshauth.setWindowTitle(_translate("diag_sshauth", "SSH authentication"))
         self.lbl_username.setText(_translate("diag_sshauth", "SSH username:"))
         self.lbl_password.setText(_translate("diag_sshauth", "SSH password:"))
+        self.cbx_save_password.setToolTip(_translate("diag_sshauth", "Username and password will be saved in secured operating systems\'s password storage."))
+        self.cbx_save_password.setText(_translate("diag_sshauth", "Save username and password"))
+        self.lbl_info.setText(_translate("diag_sshauth", "Note: The default user for SSH is \"pi\" which differs from the web configuration. You can find the password on the sticker on the device."))
 
 
 if __name__ == "__main__":

stdeb.cfg

@@ -1,6 +0,0 @@
-[DEFAULT]
-Debian-Version=1
-Depends3=python3-pyqt5, python3-revpimodio2 (>= 2.5.0), python3-zeroconf (>= 0.24.4)
-Section=universe/x11
-Suite=stable
-X-Python3-Version: >=3.4

translate.pro

@@ -11,6 +11,7 @@ SOURCES       = src/revpicommander/aclmanager.py \
                 src/revpicommander/revpiplclist.py \
                 src/revpicommander/revpiprogram.py \
                 src/revpicommander/simulator.py \
+                src/revpicommander/sshauth.py \
                 src/revpicommander/revpicommander.py
 
 FORMS         = ui_dev/aclmanager.ui \

ui_dev/avahisearch.ui

@@ -151,6 +151,14 @@
     <string>You have to configure your Revolution Pi to accept this connections</string>
    </property>
   </action>
+  <action name="act_connect">
+   <property name="text">
+    <string>Connect</string>
+   </property>
+   <property name="toolTip">
+    <string>Connect to Revoluton Pi</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="ressources.qrc"/>

ui_dev/backgroundworker.ui

@@ -6,13 +6,10 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>418</width>
+    <width>424</width>
-    <height>97</height>
+    <height>104</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>File transfer...</string>
-  </property>
   <property name="modal">
    <bool>true</bool>
   </property>

ui_dev/debugcontrol.ui

@@ -53,26 +53,42 @@
       <item>
        <widget class="QPushButton" name="btn_read_io">
         <property name="toolTip">
-         <string>Read all IO values and discard local changes (F4)</string>
+         <string>Read all IO values and discard local changes (F4)
+
+Hold this button pressed and it will refresh the IOs every 200 ms.</string>
         </property>
         <property name="text">
          <string>Read &amp;all IO values</string>
         </property>
-        <property name="shortcut">
+        <property name="autoRepeat">
-         <string notr="true">F4</string>
+         <bool>true</bool>
+        </property>
+        <property name="autoRepeatDelay">
+         <number>100</number>
+        </property>
+        <property name="autoRepeatInterval">
+         <number>200</number>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QPushButton" name="btn_refresh_io">
         <property name="toolTip">
-         <string>Refresh all IO values which are locally not changed (F5)</string>
+         <string>Refresh all IO values which are locally not changed (F5)
+
+Hold this button pressed and it will refresh the IOs every 200 ms.</string>
         </property>
         <property name="text">
          <string>&amp;Refresh unchanged IOs</string>
         </property>
-        <property name="shortcut">
+        <property name="autoRepeat">
-         <string notr="true">F5</string>
+         <bool>true</bool>
+        </property>
+        <property name="autoRepeatDelay">
+         <number>100</number>
+        </property>
+        <property name="autoRepeatInterval">
+         <number>200</number>
         </property>
        </widget>
       </item>
@@ -84,9 +100,6 @@
         <property name="text">
          <string>&amp;Write changed outputs</string>
         </property>
-        <property name="shortcut">
-         <string notr="true">F6</string>
-        </property>
        </widget>
       </item>
       <item>

ui_dev/ressources.qrc

@@ -9,6 +9,7 @@
     <file>ico/file-python.ico</file>
   </qresource>
   <qresource prefix="action">
+    <file>ico/edit-delete-6.ico</file>
     <file>ico/applications-utilities.ico</file>
     <file>ico/edit-find.ico</file>
     <file>ico/process-stop.ico</file>

ui_dev/revpiinfo.ui

@@ -63,16 +63,6 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="lbl_link">
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://revpimodio.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://revpimodio.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://revpimodio.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://revpimodio.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

ui_dev/revpioption.ui

@@ -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>

ui_dev/revpiplclist.ui

@@ -108,6 +108,9 @@
          <property name="editable">
           <bool>true</bool>
          </property>
+         <property name="sizeAdjustPolicy">
+          <enum>QComboBox::AdjustToContents</enum>
+         </property>
          <item>
           <property name="text">
            <string/>
@@ -218,9 +221,6 @@
      </item>
      <item>
       <widget class="QPushButton" name="btn_up">
-       <property name="text">
-        <string/>
-       </property>
        <property name="icon">
         <iconset resource="ressources.qrc">
          <normaloff>:/action/ico/arrow-up.ico</normaloff>:/action/ico/arrow-up.ico</iconset>
@@ -229,9 +229,6 @@
      </item>
      <item>
       <widget class="QPushButton" name="btn_down">
-       <property name="text">
-        <string/>
-       </property>
        <property name="icon">
         <iconset resource="ressources.qrc">
          <normaloff>:/action/ico/arrow-down.ico</normaloff>:/action/ico/arrow-down.ico</iconset>
@@ -240,20 +237,22 @@
      </item>
      <item>
       <widget class="QPushButton" name="btn_delete">
-       <property name="text">
-        <string/>
-       </property>
        <property name="icon">
         <iconset resource="ressources.qrc">
-         <normaloff>:/action/ico/edit-delete.ico</normaloff>:/action/ico/edit-delete.ico</iconset>
+         <normaloff>:/action/ico/edit-delete-6.ico</normaloff>:/action/ico/edit-delete-6.ico</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="btn_add_dir">
+       <property name="icon">
+        <iconset resource="ressources.qrc">
+         <normaloff>:/action/ico/folder-open.ico</normaloff>:/action/ico/folder-open.ico</iconset>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="btn_add">
-       <property name="text">
-        <string/>
-       </property>
        <property name="icon">
         <iconset resource="ressources.qrc">
          <normaloff>:/action/ico/edit-add.ico</normaloff>:/action/ico/edit-add.ico</iconset>
@@ -268,22 +267,6 @@
   <include location="ressources.qrc"/>
  </resources>
  <connections>
-  <connection>
-   <sender>btn_box</sender>
-   <signal>accepted()</signal>
-   <receiver>diag_connections</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>btn_box</sender>
    <signal>rejected()</signal>
@@ -291,8 +274,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>316</x>
+     <x>322</x>
-     <y>260</y>
+     <y>564</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
@@ -300,5 +283,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>btn_box</sender>
+   <signal>accepted()</signal>
+   <receiver>diag_connections</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>254</x>
+     <y>564</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>

ui_dev/sshauth.ui

@@ -9,14 +9,17 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>275</width>
+    <width>331</width>
-    <height>170</height>
+    <height>225</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>SSH authentication</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,1">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetFixedSize</enum>
+   </property>
    <item>
     <widget class="QWidget" name="wid_password" native="true">
      <layout class="QFormLayout" name="formLayout">
@@ -48,10 +51,17 @@
     </widget>
    </item>
    <item>
-    <widget class="QWidget" name="wid_keys" native="true"/>
+    <widget class="QCheckBox" name="cbx_save_password">
+     <property name="toolTip">
+      <string>Username and password will be saved in secured operating systems's password storage.</string>
+     </property>
+     <property name="text">
+      <string>Save username and password</string>
+     </property>
+    </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
+    <widget class="QDialogButtonBox" name="btn_box">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
@@ -60,12 +70,28 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QLabel" name="lbl_info">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Note: The default user for SSH is &quot;pi&quot; which differs from the web configuration. You can find the password on the sticker on the device.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
  <connections>
   <connection>
-   <sender>buttonBox</sender>
+   <sender>btn_box</sender>
    <signal>accepted()</signal>
    <receiver>diag_sshauth</receiver>
    <slot>accept()</slot>
@@ -81,7 +107,7 @@
    </hints>
   </connection>
   <connection>
-   <sender>buttonBox</sender>
+   <sender>btn_box</sender>
    <signal>rejected()</signal>
    <receiver>diag_sshauth</receiver>
    <slot>reject()</slot>