diff --git a/src/musredit_qt5/musrStep/LICENSE b/src/musredit_qt5/musrStep/LICENSE new file mode 100644 index 00000000..53503fbf --- /dev/null +++ b/src/musredit_qt5/musrStep/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +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 +the "copyright" line and a pointer to where the full notice is found. + + musrStep_qt5 + Copyright (C) 2016 Andreas Suter + + 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 program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + musrStep_qt5 Copyright (C) 2016 Andreas Suter + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/src/musredit_qt5/musrStep/PMusrStep.cpp b/src/musredit_qt5/musrStep/PMusrStep.cpp new file mode 100644 index 00000000..4bded029 --- /dev/null +++ b/src/musredit_qt5/musrStep/PMusrStep.cpp @@ -0,0 +1,605 @@ +/*************************************************************************** + + PMusrStep.cpp + + Author: Andreas Suter + e-mail: andreas.suter@psi.ch + +***************************************************************************/ + +/*************************************************************************** + * Copyright (C) 2007-2016 by Andreas Suter * + * andreas.suter@psi.ch * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "PMusrStep.h" + +//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +/** + * + */ +PModSelect::PModSelect(QWidget *parent) : + QDialog(parent) +{ + setWindowTitle("Modify Selected"); + + fScaleByFactor = new QPushButton("Scale by &Factor"); + fScaleByFactor->setWhatsThis("if pressed it will use the Factor value, and the absolut value selection to change the selected parameter steps."); + fFactorLabel = new QLabel("Factor"); + fFactorLineEdit = new QLineEdit("0.01"); + fFactorLineEdit->setValidator(new QDoubleValidator); + fAbsVal = new QCheckBox("Absolute Value"); + fAbsVal->setWhatsThis("if checked, the factor is used as an absolut value rather than a multiplication factor for the selected steps."); + + QHBoxLayout *top = new QHBoxLayout; + top->addWidget(fScaleByFactor); + top->addWidget(fFactorLabel); + top->addWidget(fFactorLineEdit); + top->addWidget(fAbsVal); + + fScaleAutomatic = new QPushButton("Scale &Automatically"); + fScaleAutomatic->setWhatsThis("Will try to reset the step size of the selected items based on some crude rules"); + fCancel = new QPushButton("&Cancel"); + + QHBoxLayout *bottom = new QHBoxLayout; + bottom->addWidget(fScaleAutomatic); + bottom->addWidget(fCancel); + + QVBoxLayout *main = new QVBoxLayout; + main->addLayout(top); + main->addLayout(bottom); + + setLayout(main); + + connect(fScaleAutomatic, SIGNAL(pressed()), this, SLOT(scaleAuto())); + connect(fScaleByFactor, SIGNAL(pressed()), this, SLOT(getFactor())); + connect(fCancel, SIGNAL(pressed()), this, SLOT(reject())); +} + +//------------------------------------------------------------------------- +/** + * + */ +void PModSelect::scaleAuto() +{ + emit scale(true, 0.01, false); + done(1); +} + +//------------------------------------------------------------------------- +/** + * + */ +void PModSelect::getFactor() +{ + double factor = fFactorLineEdit->text().toDouble(); + bool state = fAbsVal->isChecked(); + + emit scale(false, factor, state); + done(1); +} + +//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +/** + * + */ +PMusrStep::PMusrStep(const char *fln, QWidget *parent) : + QDialog(parent), + fMsrFileName(fln) +{ + setWindowTitle("musrStep"); + QString str = QIcon::themeName(); + bool isDarkTheme = false; + if (str.contains("dark", Qt::CaseInsensitive)) + isDarkTheme = true; + + if (isDarkTheme) + str = QString(":/icons/musrStep-22x22-dark.svg"); + else + str = QString(":/icons/musrStep-22x22.svg"); + setWindowIcon(QIcon(QPixmap(str))); + + fValid = false; + + QString title = QString("%1").arg(fMsrFileName); + fTitleLabel = new QLabel(title); + QLabel *icon = new QLabel(); + if (isDarkTheme) + str = QString(":/icons/musrStep-32x32-dark.svg"); + else + str = QString(":/icons/musrStep-32x32.svg"); + icon->setPixmap(QPixmap(str)); + + QHBoxLayout *titleLayout = new QHBoxLayout; + titleLayout->addWidget(fTitleLabel); + titleLayout->addWidget(icon); + titleLayout->insertStretch(1); + + int status = 0; + if ((status=readMsrFile()) == 1) { + fValid = true; + } else { + QString msg = QString("Failed to read msr-file: %1 (status=%2)").arg(fMsrFileName).arg(status); + QMessageBox::critical(0, "ERROR", msg); + } + + int height; + if (fParamVec.size() < 70) + height = 20*fParamVec.size(); + else + height = 900; + setMinimumSize(400, height); + + // populate dialog + fParamTable = new QTableWidget(fParamVec.size(), 3); + QStringList strL; + strL << "name" << "value" << "step"; + fParamTable->setHorizontalHeaderLabels(strL); + + QTableWidgetItem *item; + for (int i=0; isetFlags(Qt::ItemIsEnabled | Qt::ItemIsUserCheckable); + item->setCheckState(Qt::Unchecked); + fParamTable->setItem(i, 0, item); + item = new QTableWidgetItem(fParamVec[i].value); + item->setFlags(Qt::ItemIsEnabled); + fParamTable->setItem(i, 1, item); + item = new QTableWidgetItem(fParamVec[i].step); + fParamTable->setItem(i, 2, item); + } + fCheckSpecific = new QPushButton("Check S&pecific"); + fCheckSpecific->setWhatsThis("Allows to specify a template name which is used\nto select parameter names fitting to it."); + fCheckAll = new QPushButton("Check A&ll"); + fCheckAll->setWhatsThis("Select all parameter names,\nexcept the ones with step == 0"); + fUnCheckAll = new QPushButton("&Uncheck All"); + fUnCheckAll->setWhatsThis("Unselect all parameter names"); + + QHBoxLayout *checkLayout = new QHBoxLayout; + checkLayout->addWidget(fCheckSpecific); + checkLayout->addWidget(fCheckAll); + checkLayout->addWidget(fUnCheckAll); + + fModifyAuto = new QPushButton("Modify &Automatic"); + fModifyAuto->setWhatsThis("Will try to reset the step size,\nbased on some crude rules"); + fModifyAuto->setDefault(true); + fModifySelected = new QPushButton("&Modify Selected"); + fModifySelected->setWhatsThis("Will call a dialog which all to specify how\nto proceed with the selected parameter steps."); + + QHBoxLayout *modifyLayout = new QHBoxLayout; + modifyLayout->addWidget(fModifyAuto); + modifyLayout->addWidget(fModifySelected); + + fSave = new QPushButton("&Save&&Quit"); + fCancel = new QPushButton("&Cancel"); + + QHBoxLayout *buttomLayout = new QHBoxLayout; + buttomLayout->addWidget(fSave); + buttomLayout->addWidget(fCancel); + + QVBoxLayout *mainLayout = new QVBoxLayout; + mainLayout->addLayout(titleLayout); + mainLayout->addWidget(fParamTable); + mainLayout->addLayout(checkLayout); + mainLayout->addLayout(modifyLayout); + mainLayout->addLayout(buttomLayout); + + setLayout(mainLayout); + + connect(fParamTable, SIGNAL(cellChanged(int, int)), this, SLOT(handleCellChanged(int, int))); + + connect(fCheckSpecific, SIGNAL(pressed()), this, SLOT(checkSpecific())); + connect(fCheckAll, SIGNAL(pressed()), this, SLOT(checkAll())); + connect(fUnCheckAll, SIGNAL(pressed()), this, SLOT(unCheckAll())); + + connect(fModifyAuto, SIGNAL(pressed()), this, SLOT(modifyAuto())); + connect(fModifySelected, SIGNAL(pressed()), this, SLOT(modifyChecked())); + connect(fSave, SIGNAL(pressed()), this, SLOT(saveAndQuit())); + connect(fCancel, SIGNAL(pressed()), this, SLOT(reject())); + + fModSelect = new PModSelect(this); + connect(fModSelect, SIGNAL(scale(bool,double,bool)), this, SLOT(handleModSelect(bool,double,bool))); +} + +//------------------------------------------------------------------------- +/** + * + */ +void PMusrStep::handleCellChanged(int row, int column) +{ + QString str; + bool ok; + if (column == 0) { + str = fParamTable->item(row, 2)->text(); + if ((fParamTable->item(row, column)->checkState() == Qt::Checked) && + ((str == "0") || (str == "0.0"))) { + fParamTable->item(row, column)->setCheckState(Qt::Unchecked); + QMessageBox::warning(0, "WARNING", "You cannot select a fixed value (step == 0)."); + } + } else if (column == 2) { + str = fParamTable->item(row, column)->text(); + str.toDouble(&ok); // result is of no interest + if (ok) { + fParamVec[row].step = str; + } else { + fParamTable->item(row, column)->setText(fParamVec[row].step); + } + } +} + +//------------------------------------------------------------------------- +/** + * + */ +void PMusrStep::checkSpecific() +{ + bool ok; + QString str = QInputDialog::getText(this, "Enter Param Name Template", "Template:", + QLineEdit::Normal, "", &ok); + if (!ok) + return; + + QString step(""); + for (int i=0; irowCount(); i++) { + if (fParamTable->item(i,0)->text().contains(str)) { + step = fParamTable->item(i,2)->text(); + if ((step != "0") && (step != "0.0")) + fParamTable->item(i,0)->setCheckState(Qt::Checked); + } + } +} + +//------------------------------------------------------------------------- +/** + * + */ +void PMusrStep::checkAll() +{ + QString str(""); + for (int i=0; irowCount(); i++) { + str = fParamTable->item(i,2)->text(); + if ((str != "0") && (str != "0.0")) + fParamTable->item(i,0)->setCheckState(Qt::Checked); + } +} + +//------------------------------------------------------------------------- +/** + * + */ +void PMusrStep::unCheckAll() +{ + for (int i=0; irowCount(); i++) { + fParamTable->item(i,0)->setCheckState(Qt::Unchecked); + } +} + +//------------------------------------------------------------------------- +/** + * + */ +void PMusrStep::modifyAuto() +{ + QString str; + bool absVal; + double factor; + for (int i=0; irowCount(); i++) { + str = fParamTable->item(i,2)->text(); + if ((str != "0") && (str != "0.0")) { + factor = lookupTable(fParamTable->item(i,0)->text(), absVal); + str = adoptStep(fParamTable->item(i,1)->text(), factor, absVal); + fParamTable->item(i,2)->setText(str); + fParamVec[i].step = str; + } + } +} + +//------------------------------------------------------------------------- +/** + * + */ +void PMusrStep::modifyChecked() +{ + fModSelect->show(); +} + +//------------------------------------------------------------------------- +/** + * + */ +void PMusrStep::handleModSelect(bool automatic, double factor, bool absVal) +{ + QString str; + for (int i=0; irowCount(); i++) { + if (fParamTable->item(i,0)->checkState() == Qt::Checked) { + if (automatic) { + factor = lookupTable(fParamTable->item(i,0)->text(), absVal); + } + str = adoptStep(fParamTable->item(i,1)->text(), factor, absVal); + fParamTable->item(i,2)->setText(str); + fParamVec[i].step = str; + } + } +} + +//------------------------------------------------------------------------- +/** + * + */ +void PMusrStep::saveAndQuit() +{ + writeMsrFile(); + accept(); +} + +//------------------------------------------------------------------------- +/** + * + */ +void PMusrStep::initParam(PParam ¶m) +{ + param.number = ""; + param.name = ""; + param.value = ""; + param.step = ""; + param.posErr = ""; + param.boundLow = ""; + param.boundHigh = ""; +} + +//------------------------------------------------------------------------- +/** + * + */ +double PMusrStep::lookupTable(const QString str, bool &absVal) +{ + double factor = 0.01; + absVal = false; + + if (str.startsWith("freq", Qt::CaseInsensitive) || + str.startsWith("frq", Qt::CaseInsensitive) || + str.startsWith("field", Qt::CaseInsensitive)) { + factor = 1.0e-3; + } else if (str.startsWith("lambda", Qt::CaseInsensitive) || + str.startsWith("sigma", Qt::CaseInsensitive) || + str.startsWith("rlx", Qt::CaseInsensitive) || + str.startsWith("rate", Qt::CaseInsensitive)) { + factor = 0.1; + } else if (str.startsWith("phase", Qt::CaseInsensitive) || + str.startsWith("phs", Qt::CaseInsensitive)) { + factor = 5.0; + absVal = true; + } else if (str.startsWith("N0", Qt::CaseInsensitive) || + str.startsWith("Nrm", Qt::CaseInsensitive) || + str.startsWith("N_bkg", Qt::CaseInsensitive) || + str.startsWith("Bgr", Qt::CaseInsensitive)) { + factor = 0.01; + } + + return factor; +} + +//------------------------------------------------------------------------- +/** + * + */ +QString PMusrStep::adoptStep(const QString str, double factor, bool absVal) +{ + bool ok; + double dval = str.toDouble(&ok); + + QString step(""); + if (absVal) + step = QString("%1").arg(factor); + else + step = QString("%1").arg(factor*dval); + + return step; +} + +//------------------------------------------------------------------------- +/** + * + */ +int PMusrStep::readMsrFile() +{ + fParamVec.clear(); + + QFile fin(fMsrFileName); + + if (!fin.open(QIODevice::ReadOnly|QIODevice::Text)) + return -1; + + bool done = false, parameter = false; + QByteArray line; + QString str; + QStringList strL; + PParam param; + + while(!done && !fin.atEnd()) { + line = fin.readLine(); + str = line.data(); + str = str.trimmed(); + if (str.isEmpty() || str.startsWith("#")) { + continue; + } else if (str.startsWith("FITPARAMETER")) { + parameter = true; + continue; + } else if (str.startsWith("THEORY")) { + done = true; + continue; + } + + if (parameter) { + strL = str.split(" ", QString::SkipEmptyParts); + if ((strL.size() != 5) && (strL.size() != 7)) { + fin.close(); + return -2; + } + initParam(param); + + param.number = strL[0]; + param.name = strL[1]; + param.value = strL[2]; + param.step = strL[3]; + param.posErr = strL[4]; + if (strL.size() == 7) { + param.boundLow = strL[5]; + param.boundHigh= strL[6]; + } + fParamVec.push_back(param); + } + } + + fin.close(); + + return 1; +} + +//------------------------------------------------------------------------- +/** + * + */ +int PMusrStep::writeMsrFile() +{ + // read whole msr-file + QFile fin(fMsrFileName); + + if (!fin.open(QIODevice::ReadOnly|QIODevice::Text)) + return -1; + + QByteArray data = fin.readAll(); + + fin.close(); + + QFile fileOut(fMsrFileName); + + if (!fileOut.open(QIODevice::WriteOnly|QIODevice::Text)) + return -2; + + QTextStream fout(&fileOut); + + int idx = 0; + QString line, paramLine; + bool done = false; + bool paramBlock = false; + do { + line = getLine(data, idx); + if ((idx == -1) || (idx == data.count())) { + done = true; + } else { + if (line.startsWith("FITPARAMETER")) { + paramBlock = true; + } else if (line.startsWith("THEORY")) { + paramBlock = false; + } + if (paramBlock) { + paramLine = updateParamLine(line); + if (paramLine == "") // comment line, etc. + fout << line << "\n"; + else + fout << paramLine << "\n"; + } else { + fout << line << "\n"; + } + } + } while (!done); + fout << "*** FIT DID NOT CONVERGE ***\n"; + + fileOut.close(); + + return 1; +} + +//------------------------------------------------------------------------- +/** + * + */ +QString PMusrStep::getLine(QByteArray &data, int &idx) +{ + int newIdx = data.indexOf('\n', idx); + QString line(""); + + if (newIdx != -1) { + line = data.mid(idx, newIdx-idx).data(); + idx = newIdx+1; + } + + return line; +} + +//------------------------------------------------------------------------- +/** + * + */ +QString PMusrStep::updateParamLine(const QString str) +{ + // find proper parameter index + int idx = -1; + QString paramStr; + for (int i=0; i= 12) + width = fParamVec[idx].name.length()+1; + ss.setFieldWidth(width); + ss << fParamVec[idx].name; + ss.setFieldWidth(11); + ss << fParamVec[idx].value; + ss << fParamVec[idx].step; + ss << fParamVec[idx].posErr; + if (fParamVec[idx].boundLow != "") { + ss << fParamVec[idx].boundLow; + ss << fParamVec[idx].boundHigh; + } + + return result; +} diff --git a/src/musredit_qt5/musrStep/PMusrStep.h b/src/musredit_qt5/musrStep/PMusrStep.h new file mode 100644 index 00000000..a66e80da --- /dev/null +++ b/src/musredit_qt5/musrStep/PMusrStep.h @@ -0,0 +1,121 @@ +/*************************************************************************** + + PMusrStep.h + + Author: Andreas Suter + e-mail: andreas.suter@psi.ch + +***************************************************************************/ + +/*************************************************************************** + * Copyright (C) 2007-2016 by Andreas Suter * + * andreas.suter@psi.ch * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#ifndef _PMUSRSTEP_H_ +#define _PMUSRSTEP_H_ + +#include +#include +#include +#include +#include +#include +#include + +typedef struct { + QString number; + QString name; + QString value; + QString step; + QString posErr; + QString boundLow; + QString boundHigh; +} PParam; + +//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +class PModSelect : public QDialog +{ + Q_OBJECT + + public: + PModSelect(QWidget *parent=Q_NULLPTR); + + signals: + void scale(bool automatic, double factor, bool absVal); + + private slots: + void scaleAuto(); + void getFactor(); + + private: + QCheckBox *fAbsVal; + QLabel *fFactorLabel; + QLineEdit *fFactorLineEdit; + QPushButton *fScaleByFactor; + QPushButton *fScaleAutomatic; + QPushButton *fCancel; +}; + +//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +class PMusrStep : public QDialog +{ + Q_OBJECT + + public: + PMusrStep(const char *fln, QWidget *parent=Q_NULLPTR); + bool isValid() { return fValid; } + + private slots: + void handleCellChanged(int row, int column); + void checkSpecific(); + void checkAll(); + void unCheckAll(); + void modifyAuto(); + void modifyChecked(); + void saveAndQuit(); + void handleModSelect(bool automatic, double factor, bool absVal); + + private: + QString fMsrFileName; + bool fValid; + + QVector fParamVec; + + QLabel *fTitleLabel; + QTableWidget *fParamTable; + QPushButton *fCheckSpecific; + QPushButton *fCheckAll; + QPushButton *fUnCheckAll; + QPushButton *fModifyAuto; + QPushButton *fModifySelected; + QPushButton *fSave; + QPushButton *fCancel; + + PModSelect *fModSelect; + + void initParam(PParam ¶m); + double lookupTable(const QString str, bool &absVal); + QString adoptStep(const QString str, double factor, bool absVal); + int readMsrFile(); + int writeMsrFile(); + QString getLine(QByteArray &data, int &idx); + QString updateParamLine(const QString str); +}; + +#endif // _PMUSRSTEP_H_ diff --git a/src/musredit_qt5/musrStep/README.md b/src/musredit_qt5/musrStep/README.md new file mode 100644 index 00000000..e4ed1aea --- /dev/null +++ b/src/musredit_qt5/musrStep/README.md @@ -0,0 +1,2 @@ +musrStep helps to intelligently reset the steps of a msr-file after a fit. +Often this is needed for refinement purposes. \ No newline at end of file diff --git a/src/musredit_qt5/musrStep/icons/musrStep-22x22-dark.svg b/src/musredit_qt5/musrStep/icons/musrStep-22x22-dark.svg new file mode 100644 index 00000000..a4855a18 --- /dev/null +++ b/src/musredit_qt5/musrStep/icons/musrStep-22x22-dark.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/musrStep/icons/musrStep-22x22.svg b/src/musredit_qt5/musrStep/icons/musrStep-22x22.svg new file mode 100644 index 00000000..0532ca29 --- /dev/null +++ b/src/musredit_qt5/musrStep/icons/musrStep-22x22.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/musrStep/icons/musrStep-32x32-dark.svg b/src/musredit_qt5/musrStep/icons/musrStep-32x32-dark.svg new file mode 100644 index 00000000..b7a44516 --- /dev/null +++ b/src/musredit_qt5/musrStep/icons/musrStep-32x32-dark.svg @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/musrStep/icons/musrStep-32x32.svg b/src/musredit_qt5/musrStep/icons/musrStep-32x32.svg new file mode 100644 index 00000000..a0c6dbe1 --- /dev/null +++ b/src/musredit_qt5/musrStep/icons/musrStep-32x32.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/musrStep/musrStep b/src/musredit_qt5/musrStep/musrStep new file mode 100755 index 00000000..de79630e Binary files /dev/null and b/src/musredit_qt5/musrStep/musrStep differ diff --git a/src/musredit_qt5/musrStep/musrStep.cpp b/src/musredit_qt5/musrStep/musrStep.cpp new file mode 100644 index 00000000..b2314b26 --- /dev/null +++ b/src/musredit_qt5/musrStep/musrStep.cpp @@ -0,0 +1,57 @@ +#include +#include + +#include + +#include + +#include "git-revision.h" +#include "PMusrStep.h" + +//------------------------------------------------------------------------- +void musrStep_syntax() +{ + std::cout << std::endl; + std::cout << "usage: musrStep | [-v | --version] | [-h | --help]" << std::endl; + std::cout << " : msr-file name." << std::endl; + std::cout << " -v, --version: print the current git-version to the stdout" << std::endl; + std::cout << " -h, --help: print this help" << std::endl; + std::cout << std::endl << std::endl; +} + +//------------------------------------------------------------------------- +int main(int argc, char *argv[]) +{ + char fln[1024]; + + if (argc != 2) { + musrStep_syntax(); + return 1; + } else { + if (!strcmp(argv[1], "--version") || (!strcmp(argv[1], "-v"))) { + std::cout << std::endl << "musrStep git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; + return 0; + } else if (!strcmp(argv[1], "--help") || (!strcmp(argv[1], "-h"))) { + musrStep_syntax(); + return 0; + } else { + strncpy(fln, argv[1], sizeof(fln)); + } + } + + Q_INIT_RESOURCE(musrStep); + + QApplication app(argc, argv); + + PMusrStep musrStep(fln); + if (!musrStep.isValid()) + return 1; + + musrStep.show(); + + app.exec(); + + int result = musrStep.result(); + + return result; +} diff --git a/src/musredit_qt5/musrStep/musrStep.pro b/src/musredit_qt5/musrStep/musrStep.pro new file mode 100644 index 00000000..8db5b34f --- /dev/null +++ b/src/musredit_qt5/musrStep/musrStep.pro @@ -0,0 +1,25 @@ +TEMPLATE = app +TARGET = musrStep + +# install path for the application +unix:target.path = $$(ROOTSYS)/bin +INSTALLS += target + +CONFIG += qt \ + warn_on \ + debug \ +CONFIG += console + +QT += widgets +QT += svg + +INCLUDEPATH += "../../include" + +HEADERS = ../../include/git-revision.h \ + PMusrStep.h + +SOURCES = PMusrStep.cpp \ + musrStep.cpp + +RESOURCES = musrStep.qrc + diff --git a/src/musredit_qt5/musrStep/musrStep.qrc b/src/musredit_qt5/musrStep/musrStep.qrc new file mode 100644 index 00000000..24bbe5af --- /dev/null +++ b/src/musredit_qt5/musrStep/musrStep.qrc @@ -0,0 +1,8 @@ + + + icons/musrStep-22x22.svg + icons/musrStep-22x22-dark.svg + icons/musrStep-32x32.svg + icons/musrStep-32x32-dark.svg + + diff --git a/src/musredit_qt5/PAdmin.cpp b/src/musredit_qt5/musredit/PAdmin.cpp similarity index 100% rename from src/musredit_qt5/PAdmin.cpp rename to src/musredit_qt5/musredit/PAdmin.cpp diff --git a/src/musredit_qt5/PAdmin.h b/src/musredit_qt5/musredit/PAdmin.h similarity index 100% rename from src/musredit_qt5/PAdmin.h rename to src/musredit_qt5/musredit/PAdmin.h diff --git a/src/musredit_qt5/PChangeDefaultPathsDialog.cpp b/src/musredit_qt5/musredit/PChangeDefaultPathsDialog.cpp similarity index 100% rename from src/musredit_qt5/PChangeDefaultPathsDialog.cpp rename to src/musredit_qt5/musredit/PChangeDefaultPathsDialog.cpp diff --git a/src/musredit_qt5/PChangeDefaultPathsDialog.h b/src/musredit_qt5/musredit/PChangeDefaultPathsDialog.h similarity index 100% rename from src/musredit_qt5/PChangeDefaultPathsDialog.h rename to src/musredit_qt5/musredit/PChangeDefaultPathsDialog.h diff --git a/src/musredit_qt5/PDumpOutputHandler.cpp b/src/musredit_qt5/musredit/PDumpOutputHandler.cpp similarity index 100% rename from src/musredit_qt5/PDumpOutputHandler.cpp rename to src/musredit_qt5/musredit/PDumpOutputHandler.cpp diff --git a/src/musredit_qt5/PDumpOutputHandler.h b/src/musredit_qt5/musredit/PDumpOutputHandler.h similarity index 100% rename from src/musredit_qt5/PDumpOutputHandler.h rename to src/musredit_qt5/musredit/PDumpOutputHandler.h diff --git a/src/musredit_qt5/PFindDialog.cpp b/src/musredit_qt5/musredit/PFindDialog.cpp similarity index 100% rename from src/musredit_qt5/PFindDialog.cpp rename to src/musredit_qt5/musredit/PFindDialog.cpp diff --git a/src/musredit_qt5/PFindDialog.h b/src/musredit_qt5/musredit/PFindDialog.h similarity index 100% rename from src/musredit_qt5/PFindDialog.h rename to src/musredit_qt5/musredit/PFindDialog.h diff --git a/src/musredit_qt5/PFitOutputHandler.cpp b/src/musredit_qt5/musredit/PFitOutputHandler.cpp similarity index 100% rename from src/musredit_qt5/PFitOutputHandler.cpp rename to src/musredit_qt5/musredit/PFitOutputHandler.cpp diff --git a/src/musredit_qt5/PFitOutputHandler.h b/src/musredit_qt5/musredit/PFitOutputHandler.h similarity index 100% rename from src/musredit_qt5/PFitOutputHandler.h rename to src/musredit_qt5/musredit/PFitOutputHandler.h diff --git a/src/musredit_qt5/PGetAsymmetryRunBlockDialog.cpp b/src/musredit_qt5/musredit/PGetAsymmetryRunBlockDialog.cpp similarity index 100% rename from src/musredit_qt5/PGetAsymmetryRunBlockDialog.cpp rename to src/musredit_qt5/musredit/PGetAsymmetryRunBlockDialog.cpp diff --git a/src/musredit_qt5/PGetAsymmetryRunBlockDialog.h b/src/musredit_qt5/musredit/PGetAsymmetryRunBlockDialog.h similarity index 100% rename from src/musredit_qt5/PGetAsymmetryRunBlockDialog.h rename to src/musredit_qt5/musredit/PGetAsymmetryRunBlockDialog.h diff --git a/src/musredit_qt5/PGetDefaultDialog.cpp b/src/musredit_qt5/musredit/PGetDefaultDialog.cpp similarity index 100% rename from src/musredit_qt5/PGetDefaultDialog.cpp rename to src/musredit_qt5/musredit/PGetDefaultDialog.cpp diff --git a/src/musredit_qt5/PGetDefaultDialog.h b/src/musredit_qt5/musredit/PGetDefaultDialog.h similarity index 100% rename from src/musredit_qt5/PGetDefaultDialog.h rename to src/musredit_qt5/musredit/PGetDefaultDialog.h diff --git a/src/musredit_qt5/PGetFourierBlockDialog.cpp b/src/musredit_qt5/musredit/PGetFourierBlockDialog.cpp similarity index 100% rename from src/musredit_qt5/PGetFourierBlockDialog.cpp rename to src/musredit_qt5/musredit/PGetFourierBlockDialog.cpp diff --git a/src/musredit_qt5/PGetFourierBlockDialog.h b/src/musredit_qt5/musredit/PGetFourierBlockDialog.h similarity index 100% rename from src/musredit_qt5/PGetFourierBlockDialog.h rename to src/musredit_qt5/musredit/PGetFourierBlockDialog.h diff --git a/src/musredit_qt5/PGetFunctionsBlockDialog.cpp b/src/musredit_qt5/musredit/PGetFunctionsBlockDialog.cpp similarity index 100% rename from src/musredit_qt5/PGetFunctionsBlockDialog.cpp rename to src/musredit_qt5/musredit/PGetFunctionsBlockDialog.cpp diff --git a/src/musredit_qt5/PGetFunctionsBlockDialog.h b/src/musredit_qt5/musredit/PGetFunctionsBlockDialog.h similarity index 100% rename from src/musredit_qt5/PGetFunctionsBlockDialog.h rename to src/musredit_qt5/musredit/PGetFunctionsBlockDialog.h diff --git a/src/musredit_qt5/PGetMusrFTOptionsDialog.cpp b/src/musredit_qt5/musredit/PGetMusrFTOptionsDialog.cpp similarity index 100% rename from src/musredit_qt5/PGetMusrFTOptionsDialog.cpp rename to src/musredit_qt5/musredit/PGetMusrFTOptionsDialog.cpp diff --git a/src/musredit_qt5/PGetMusrFTOptionsDialog.h b/src/musredit_qt5/musredit/PGetMusrFTOptionsDialog.h similarity index 100% rename from src/musredit_qt5/PGetMusrFTOptionsDialog.h rename to src/musredit_qt5/musredit/PGetMusrFTOptionsDialog.h diff --git a/src/musredit_qt5/PGetNonMusrRunBlockDialog.cpp b/src/musredit_qt5/musredit/PGetNonMusrRunBlockDialog.cpp similarity index 100% rename from src/musredit_qt5/PGetNonMusrRunBlockDialog.cpp rename to src/musredit_qt5/musredit/PGetNonMusrRunBlockDialog.cpp diff --git a/src/musredit_qt5/PGetNonMusrRunBlockDialog.h b/src/musredit_qt5/musredit/PGetNonMusrRunBlockDialog.h similarity index 100% rename from src/musredit_qt5/PGetNonMusrRunBlockDialog.h rename to src/musredit_qt5/musredit/PGetNonMusrRunBlockDialog.h diff --git a/src/musredit_qt5/PGetParameterBlockDialog.cpp b/src/musredit_qt5/musredit/PGetParameterBlockDialog.cpp similarity index 100% rename from src/musredit_qt5/PGetParameterBlockDialog.cpp rename to src/musredit_qt5/musredit/PGetParameterBlockDialog.cpp diff --git a/src/musredit_qt5/PGetParameterBlockDialog.h b/src/musredit_qt5/musredit/PGetParameterBlockDialog.h similarity index 100% rename from src/musredit_qt5/PGetParameterBlockDialog.h rename to src/musredit_qt5/musredit/PGetParameterBlockDialog.h diff --git a/src/musredit_qt5/PGetPlotBlockDialog.cpp b/src/musredit_qt5/musredit/PGetPlotBlockDialog.cpp similarity index 100% rename from src/musredit_qt5/PGetPlotBlockDialog.cpp rename to src/musredit_qt5/musredit/PGetPlotBlockDialog.cpp diff --git a/src/musredit_qt5/PGetPlotBlockDialog.h b/src/musredit_qt5/musredit/PGetPlotBlockDialog.h similarity index 100% rename from src/musredit_qt5/PGetPlotBlockDialog.h rename to src/musredit_qt5/musredit/PGetPlotBlockDialog.h diff --git a/src/musredit_qt5/PGetSingleHistoRunBlockDialog.cpp b/src/musredit_qt5/musredit/PGetSingleHistoRunBlockDialog.cpp similarity index 100% rename from src/musredit_qt5/PGetSingleHistoRunBlockDialog.cpp rename to src/musredit_qt5/musredit/PGetSingleHistoRunBlockDialog.cpp diff --git a/src/musredit_qt5/PGetSingleHistoRunBlockDialog.h b/src/musredit_qt5/musredit/PGetSingleHistoRunBlockDialog.h similarity index 100% rename from src/musredit_qt5/PGetSingleHistoRunBlockDialog.h rename to src/musredit_qt5/musredit/PGetSingleHistoRunBlockDialog.h diff --git a/src/musredit_qt5/PGetTheoryBlockDialog.cpp b/src/musredit_qt5/musredit/PGetTheoryBlockDialog.cpp similarity index 100% rename from src/musredit_qt5/PGetTheoryBlockDialog.cpp rename to src/musredit_qt5/musredit/PGetTheoryBlockDialog.cpp diff --git a/src/musredit_qt5/PGetTheoryBlockDialog.h b/src/musredit_qt5/musredit/PGetTheoryBlockDialog.h similarity index 100% rename from src/musredit_qt5/PGetTheoryBlockDialog.h rename to src/musredit_qt5/musredit/PGetTheoryBlockDialog.h diff --git a/src/musredit_qt5/PGetTitleBlockDialog.cpp b/src/musredit_qt5/musredit/PGetTitleBlockDialog.cpp similarity index 100% rename from src/musredit_qt5/PGetTitleBlockDialog.cpp rename to src/musredit_qt5/musredit/PGetTitleBlockDialog.cpp diff --git a/src/musredit_qt5/PGetTitleBlockDialog.h b/src/musredit_qt5/musredit/PGetTitleBlockDialog.h similarity index 100% rename from src/musredit_qt5/PGetTitleBlockDialog.h rename to src/musredit_qt5/musredit/PGetTitleBlockDialog.h diff --git a/src/musredit_qt5/PHelp.cpp b/src/musredit_qt5/musredit/PHelp.cpp similarity index 100% rename from src/musredit_qt5/PHelp.cpp rename to src/musredit_qt5/musredit/PHelp.cpp diff --git a/src/musredit_qt5/PHelp.h b/src/musredit_qt5/musredit/PHelp.h similarity index 100% rename from src/musredit_qt5/PHelp.h rename to src/musredit_qt5/musredit/PHelp.h diff --git a/src/musredit_qt5/PMsr2DataDialog.cpp b/src/musredit_qt5/musredit/PMsr2DataDialog.cpp similarity index 100% rename from src/musredit_qt5/PMsr2DataDialog.cpp rename to src/musredit_qt5/musredit/PMsr2DataDialog.cpp diff --git a/src/musredit_qt5/PMsr2DataDialog.h b/src/musredit_qt5/musredit/PMsr2DataDialog.h similarity index 100% rename from src/musredit_qt5/PMsr2DataDialog.h rename to src/musredit_qt5/musredit/PMsr2DataDialog.h diff --git a/src/musredit_qt5/PMusrEditAbout.cpp b/src/musredit_qt5/musredit/PMusrEditAbout.cpp similarity index 100% rename from src/musredit_qt5/PMusrEditAbout.cpp rename to src/musredit_qt5/musredit/PMusrEditAbout.cpp diff --git a/src/musredit_qt5/PMusrEditAbout.h b/src/musredit_qt5/musredit/PMusrEditAbout.h similarity index 100% rename from src/musredit_qt5/PMusrEditAbout.h rename to src/musredit_qt5/musredit/PMusrEditAbout.h diff --git a/src/musredit_qt5/PPrefsDialog.cpp b/src/musredit_qt5/musredit/PPrefsDialog.cpp similarity index 100% rename from src/musredit_qt5/PPrefsDialog.cpp rename to src/musredit_qt5/musredit/PPrefsDialog.cpp diff --git a/src/musredit_qt5/PPrefsDialog.h b/src/musredit_qt5/musredit/PPrefsDialog.h similarity index 100% rename from src/musredit_qt5/PPrefsDialog.h rename to src/musredit_qt5/musredit/PPrefsDialog.h diff --git a/src/musredit_qt5/PReplaceConfirmationDialog.cpp b/src/musredit_qt5/musredit/PReplaceConfirmationDialog.cpp similarity index 100% rename from src/musredit_qt5/PReplaceConfirmationDialog.cpp rename to src/musredit_qt5/musredit/PReplaceConfirmationDialog.cpp diff --git a/src/musredit_qt5/PReplaceConfirmationDialog.h b/src/musredit_qt5/musredit/PReplaceConfirmationDialog.h similarity index 100% rename from src/musredit_qt5/PReplaceConfirmationDialog.h rename to src/musredit_qt5/musredit/PReplaceConfirmationDialog.h diff --git a/src/musredit_qt5/PReplaceDialog.cpp b/src/musredit_qt5/musredit/PReplaceDialog.cpp similarity index 100% rename from src/musredit_qt5/PReplaceDialog.cpp rename to src/musredit_qt5/musredit/PReplaceDialog.cpp diff --git a/src/musredit_qt5/PReplaceDialog.h b/src/musredit_qt5/musredit/PReplaceDialog.h similarity index 100% rename from src/musredit_qt5/PReplaceDialog.h rename to src/musredit_qt5/musredit/PReplaceDialog.h diff --git a/src/musredit_qt5/PSubTextEdit.cpp b/src/musredit_qt5/musredit/PSubTextEdit.cpp similarity index 100% rename from src/musredit_qt5/PSubTextEdit.cpp rename to src/musredit_qt5/musredit/PSubTextEdit.cpp diff --git a/src/musredit_qt5/PSubTextEdit.h b/src/musredit_qt5/musredit/PSubTextEdit.h similarity index 100% rename from src/musredit_qt5/PSubTextEdit.h rename to src/musredit_qt5/musredit/PSubTextEdit.h diff --git a/src/musredit_qt5/PTextEdit.cpp b/src/musredit_qt5/musredit/PTextEdit.cpp similarity index 100% rename from src/musredit_qt5/PTextEdit.cpp rename to src/musredit_qt5/musredit/PTextEdit.cpp diff --git a/src/musredit_qt5/PTextEdit.h b/src/musredit_qt5/musredit/PTextEdit.h similarity index 100% rename from src/musredit_qt5/PTextEdit.h rename to src/musredit_qt5/musredit/PTextEdit.h diff --git a/src/musredit_qt5/README b/src/musredit_qt5/musredit/README similarity index 100% rename from src/musredit_qt5/README rename to src/musredit_qt5/musredit/README diff --git a/src/musredit_qt5/forms/PChangeDefaultPathsDialog.ui b/src/musredit_qt5/musredit/forms/PChangeDefaultPathsDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PChangeDefaultPathsDialog.ui rename to src/musredit_qt5/musredit/forms/PChangeDefaultPathsDialog.ui diff --git a/src/musredit_qt5/forms/PFindDialog.ui b/src/musredit_qt5/musredit/forms/PFindDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PFindDialog.ui rename to src/musredit_qt5/musredit/forms/PFindDialog.ui diff --git a/src/musredit_qt5/forms/PGetAsymmetryRunBlockDialog.ui b/src/musredit_qt5/musredit/forms/PGetAsymmetryRunBlockDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PGetAsymmetryRunBlockDialog.ui rename to src/musredit_qt5/musredit/forms/PGetAsymmetryRunBlockDialog.ui diff --git a/src/musredit_qt5/forms/PGetFourierBlockDialog.ui b/src/musredit_qt5/musredit/forms/PGetFourierBlockDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PGetFourierBlockDialog.ui rename to src/musredit_qt5/musredit/forms/PGetFourierBlockDialog.ui diff --git a/src/musredit_qt5/forms/PGetFunctionsBlockDialog.ui b/src/musredit_qt5/musredit/forms/PGetFunctionsBlockDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PGetFunctionsBlockDialog.ui rename to src/musredit_qt5/musredit/forms/PGetFunctionsBlockDialog.ui diff --git a/src/musredit_qt5/forms/PGetMusrFTOptionsDialog.ui b/src/musredit_qt5/musredit/forms/PGetMusrFTOptionsDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PGetMusrFTOptionsDialog.ui rename to src/musredit_qt5/musredit/forms/PGetMusrFTOptionsDialog.ui diff --git a/src/musredit_qt5/forms/PGetNonMusrRunBlockDialog.ui b/src/musredit_qt5/musredit/forms/PGetNonMusrRunBlockDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PGetNonMusrRunBlockDialog.ui rename to src/musredit_qt5/musredit/forms/PGetNonMusrRunBlockDialog.ui diff --git a/src/musredit_qt5/forms/PGetParameterBlockDialog.ui b/src/musredit_qt5/musredit/forms/PGetParameterBlockDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PGetParameterBlockDialog.ui rename to src/musredit_qt5/musredit/forms/PGetParameterBlockDialog.ui diff --git a/src/musredit_qt5/forms/PGetPlotBlockDialog.ui b/src/musredit_qt5/musredit/forms/PGetPlotBlockDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PGetPlotBlockDialog.ui rename to src/musredit_qt5/musredit/forms/PGetPlotBlockDialog.ui diff --git a/src/musredit_qt5/forms/PGetSingleHistoRunBlockDialog.ui b/src/musredit_qt5/musredit/forms/PGetSingleHistoRunBlockDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PGetSingleHistoRunBlockDialog.ui rename to src/musredit_qt5/musredit/forms/PGetSingleHistoRunBlockDialog.ui diff --git a/src/musredit_qt5/forms/PGetTheoryBlockDialog.ui b/src/musredit_qt5/musredit/forms/PGetTheoryBlockDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PGetTheoryBlockDialog.ui rename to src/musredit_qt5/musredit/forms/PGetTheoryBlockDialog.ui diff --git a/src/musredit_qt5/forms/PGetTitleBlockDialog.ui b/src/musredit_qt5/musredit/forms/PGetTitleBlockDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PGetTitleBlockDialog.ui rename to src/musredit_qt5/musredit/forms/PGetTitleBlockDialog.ui diff --git a/src/musredit_qt5/forms/PMsr2DataDialog.ui b/src/musredit_qt5/musredit/forms/PMsr2DataDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PMsr2DataDialog.ui rename to src/musredit_qt5/musredit/forms/PMsr2DataDialog.ui diff --git a/src/musredit_qt5/forms/PMusrEditAbout.ui b/src/musredit_qt5/musredit/forms/PMusrEditAbout.ui similarity index 100% rename from src/musredit_qt5/forms/PMusrEditAbout.ui rename to src/musredit_qt5/musredit/forms/PMusrEditAbout.ui diff --git a/src/musredit_qt5/forms/PPrefsDialog.ui b/src/musredit_qt5/musredit/forms/PPrefsDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PPrefsDialog.ui rename to src/musredit_qt5/musredit/forms/PPrefsDialog.ui diff --git a/src/musredit_qt5/forms/PReplaceConfirmationDialog.ui b/src/musredit_qt5/musredit/forms/PReplaceConfirmationDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PReplaceConfirmationDialog.ui rename to src/musredit_qt5/musredit/forms/PReplaceConfirmationDialog.ui diff --git a/src/musredit_qt5/forms/PReplaceDialog.ui b/src/musredit_qt5/musredit/forms/PReplaceDialog.ui similarity index 100% rename from src/musredit_qt5/forms/PReplaceDialog.ui rename to src/musredit_qt5/musredit/forms/PReplaceDialog.ui diff --git a/src/musredit_qt5/icons/MuonSpin-Avatar.gif b/src/musredit_qt5/musredit/icons/MuonSpin-Avatar.gif similarity index 100% rename from src/musredit_qt5/icons/MuonSpin-Avatar.gif rename to src/musredit_qt5/musredit/icons/MuonSpin-Avatar.gif diff --git a/src/musredit_qt5/icons/MuonSpin-Avatar.nb b/src/musredit_qt5/musredit/icons/MuonSpin-Avatar.nb similarity index 100% rename from src/musredit_qt5/icons/MuonSpin-Avatar.nb rename to src/musredit_qt5/musredit/icons/MuonSpin-Avatar.nb diff --git a/src/musredit_qt5/icons/document-new-dark.svg b/src/musredit_qt5/musredit/icons/document-new-dark.svg similarity index 100% rename from src/musredit_qt5/icons/document-new-dark.svg rename to src/musredit_qt5/musredit/icons/document-new-dark.svg diff --git a/src/musredit_qt5/icons/document-new-plain.svg b/src/musredit_qt5/musredit/icons/document-new-plain.svg similarity index 100% rename from src/musredit_qt5/icons/document-new-plain.svg rename to src/musredit_qt5/musredit/icons/document-new-plain.svg diff --git a/src/musredit_qt5/icons/document-open-dark.svg b/src/musredit_qt5/musredit/icons/document-open-dark.svg similarity index 100% rename from src/musredit_qt5/icons/document-open-dark.svg rename to src/musredit_qt5/musredit/icons/document-open-dark.svg diff --git a/src/musredit_qt5/icons/document-open-plain.svg b/src/musredit_qt5/musredit/icons/document-open-plain.svg similarity index 100% rename from src/musredit_qt5/icons/document-open-plain.svg rename to src/musredit_qt5/musredit/icons/document-open-plain.svg diff --git a/src/musredit_qt5/icons/document-print-dark.svg b/src/musredit_qt5/musredit/icons/document-print-dark.svg similarity index 100% rename from src/musredit_qt5/icons/document-print-dark.svg rename to src/musredit_qt5/musredit/icons/document-print-dark.svg diff --git a/src/musredit_qt5/icons/document-print-plain.svg b/src/musredit_qt5/musredit/icons/document-print-plain.svg similarity index 100% rename from src/musredit_qt5/icons/document-print-plain.svg rename to src/musredit_qt5/musredit/icons/document-print-plain.svg diff --git a/src/musredit_qt5/icons/document-save-dark.svg b/src/musredit_qt5/musredit/icons/document-save-dark.svg similarity index 100% rename from src/musredit_qt5/icons/document-save-dark.svg rename to src/musredit_qt5/musredit/icons/document-save-dark.svg diff --git a/src/musredit_qt5/icons/document-save-plain.svg b/src/musredit_qt5/musredit/icons/document-save-plain.svg similarity index 100% rename from src/musredit_qt5/icons/document-save-plain.svg rename to src/musredit_qt5/musredit/icons/document-save-plain.svg diff --git a/src/musredit_qt5/icons/edit-copy-dark.svg b/src/musredit_qt5/musredit/icons/edit-copy-dark.svg similarity index 100% rename from src/musredit_qt5/icons/edit-copy-dark.svg rename to src/musredit_qt5/musredit/icons/edit-copy-dark.svg diff --git a/src/musredit_qt5/icons/edit-copy-plain.svg b/src/musredit_qt5/musredit/icons/edit-copy-plain.svg similarity index 100% rename from src/musredit_qt5/icons/edit-copy-plain.svg rename to src/musredit_qt5/musredit/icons/edit-copy-plain.svg diff --git a/src/musredit_qt5/icons/edit-cut-dark.svg b/src/musredit_qt5/musredit/icons/edit-cut-dark.svg similarity index 100% rename from src/musredit_qt5/icons/edit-cut-dark.svg rename to src/musredit_qt5/musredit/icons/edit-cut-dark.svg diff --git a/src/musredit_qt5/icons/edit-cut-plain.svg b/src/musredit_qt5/musredit/icons/edit-cut-plain.svg similarity index 100% rename from src/musredit_qt5/icons/edit-cut-plain.svg rename to src/musredit_qt5/musredit/icons/edit-cut-plain.svg diff --git a/src/musredit_qt5/icons/edit-find-dark.svg b/src/musredit_qt5/musredit/icons/edit-find-dark.svg similarity index 100% rename from src/musredit_qt5/icons/edit-find-dark.svg rename to src/musredit_qt5/musredit/icons/edit-find-dark.svg diff --git a/src/musredit_qt5/icons/edit-find-plain.svg b/src/musredit_qt5/musredit/icons/edit-find-plain.svg similarity index 100% rename from src/musredit_qt5/icons/edit-find-plain.svg rename to src/musredit_qt5/musredit/icons/edit-find-plain.svg diff --git a/src/musredit_qt5/icons/edit-paste-dark.svg b/src/musredit_qt5/musredit/icons/edit-paste-dark.svg similarity index 100% rename from src/musredit_qt5/icons/edit-paste-dark.svg rename to src/musredit_qt5/musredit/icons/edit-paste-dark.svg diff --git a/src/musredit_qt5/icons/edit-paste-plain.svg b/src/musredit_qt5/musredit/icons/edit-paste-plain.svg similarity index 100% rename from src/musredit_qt5/icons/edit-paste-plain.svg rename to src/musredit_qt5/musredit/icons/edit-paste-plain.svg diff --git a/src/musredit_qt5/icons/edit-redo-dark.svg b/src/musredit_qt5/musredit/icons/edit-redo-dark.svg similarity index 100% rename from src/musredit_qt5/icons/edit-redo-dark.svg rename to src/musredit_qt5/musredit/icons/edit-redo-dark.svg diff --git a/src/musredit_qt5/icons/edit-redo-plain.svg b/src/musredit_qt5/musredit/icons/edit-redo-plain.svg similarity index 100% rename from src/musredit_qt5/icons/edit-redo-plain.svg rename to src/musredit_qt5/musredit/icons/edit-redo-plain.svg diff --git a/src/musredit_qt5/icons/edit-undo-dark.svg b/src/musredit_qt5/musredit/icons/edit-undo-dark.svg similarity index 100% rename from src/musredit_qt5/icons/edit-undo-dark.svg rename to src/musredit_qt5/musredit/icons/edit-undo-dark.svg diff --git a/src/musredit_qt5/icons/edit-undo-plain.svg b/src/musredit_qt5/musredit/icons/edit-undo-plain.svg similarity index 100% rename from src/musredit_qt5/icons/edit-undo-plain.svg rename to src/musredit_qt5/musredit/icons/edit-undo-plain.svg diff --git a/src/musredit_qt5/icons/go-next-use-dark.svg b/src/musredit_qt5/musredit/icons/go-next-use-dark.svg similarity index 100% rename from src/musredit_qt5/icons/go-next-use-dark.svg rename to src/musredit_qt5/musredit/icons/go-next-use-dark.svg diff --git a/src/musredit_qt5/icons/go-next-use-plain.svg b/src/musredit_qt5/musredit/icons/go-next-use-plain.svg similarity index 100% rename from src/musredit_qt5/icons/go-next-use-plain.svg rename to src/musredit_qt5/musredit/icons/go-next-use-plain.svg diff --git a/src/musredit_qt5/icons/go-previous-use-dark.svg b/src/musredit_qt5/musredit/icons/go-previous-use-dark.svg similarity index 100% rename from src/musredit_qt5/icons/go-previous-use-dark.svg rename to src/musredit_qt5/musredit/icons/go-previous-use-dark.svg diff --git a/src/musredit_qt5/icons/go-previous-use-plain.svg b/src/musredit_qt5/musredit/icons/go-previous-use-plain.svg similarity index 100% rename from src/musredit_qt5/icons/go-previous-use-plain.svg rename to src/musredit_qt5/musredit/icons/go-previous-use-plain.svg diff --git a/src/musredit_qt5/icons/inkscape/document-new.svg b/src/musredit_qt5/musredit/icons/inkscape/document-new.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/document-new.svg rename to src/musredit_qt5/musredit/icons/inkscape/document-new.svg diff --git a/src/musredit_qt5/icons/inkscape/document-open.svg b/src/musredit_qt5/musredit/icons/inkscape/document-open.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/document-open.svg rename to src/musredit_qt5/musredit/icons/inkscape/document-open.svg diff --git a/src/musredit_qt5/icons/inkscape/document-print.svg b/src/musredit_qt5/musredit/icons/inkscape/document-print.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/document-print.svg rename to src/musredit_qt5/musredit/icons/inkscape/document-print.svg diff --git a/src/musredit_qt5/icons/inkscape/document-save.svg b/src/musredit_qt5/musredit/icons/inkscape/document-save.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/document-save.svg rename to src/musredit_qt5/musredit/icons/inkscape/document-save.svg diff --git a/src/musredit_qt5/icons/inkscape/edit-copy.svg b/src/musredit_qt5/musredit/icons/inkscape/edit-copy.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/edit-copy.svg rename to src/musredit_qt5/musredit/icons/inkscape/edit-copy.svg diff --git a/src/musredit_qt5/icons/inkscape/edit-cut.svg b/src/musredit_qt5/musredit/icons/inkscape/edit-cut.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/edit-cut.svg rename to src/musredit_qt5/musredit/icons/inkscape/edit-cut.svg diff --git a/src/musredit_qt5/icons/inkscape/edit-find.svg b/src/musredit_qt5/musredit/icons/inkscape/edit-find.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/edit-find.svg rename to src/musredit_qt5/musredit/icons/inkscape/edit-find.svg diff --git a/src/musredit_qt5/icons/inkscape/edit-paste.svg b/src/musredit_qt5/musredit/icons/inkscape/edit-paste.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/edit-paste.svg rename to src/musredit_qt5/musredit/icons/inkscape/edit-paste.svg diff --git a/src/musredit_qt5/icons/inkscape/edit-redo.svg b/src/musredit_qt5/musredit/icons/inkscape/edit-redo.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/edit-redo.svg rename to src/musredit_qt5/musredit/icons/inkscape/edit-redo.svg diff --git a/src/musredit_qt5/icons/inkscape/edit-undo.svg b/src/musredit_qt5/musredit/icons/inkscape/edit-undo.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/edit-undo.svg rename to src/musredit_qt5/musredit/icons/inkscape/edit-undo.svg diff --git a/src/musredit_qt5/icons/inkscape/go-next-use.svg b/src/musredit_qt5/musredit/icons/inkscape/go-next-use.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/go-next-use.svg rename to src/musredit_qt5/musredit/icons/inkscape/go-next-use.svg diff --git a/src/musredit_qt5/icons/inkscape/go-previous-use.svg b/src/musredit_qt5/musredit/icons/inkscape/go-previous-use.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/go-previous-use.svg rename to src/musredit_qt5/musredit/icons/inkscape/go-previous-use.svg diff --git a/src/musredit_qt5/icons/inkscape/msr2data.svg b/src/musredit_qt5/musredit/icons/inkscape/msr2data.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/msr2data.svg rename to src/musredit_qt5/musredit/icons/inkscape/msr2data.svg diff --git a/src/musredit_qt5/icons/inkscape/musrAsym.svg b/src/musredit_qt5/musredit/icons/inkscape/musrAsym.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrAsym.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrAsym.svg diff --git a/src/musredit_qt5/icons/inkscape/musrFT.svg b/src/musredit_qt5/musredit/icons/inkscape/musrFT.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrFT.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrFT.svg diff --git a/src/musredit_qt5/icons/inkscape/musrSingleHisto.svg b/src/musredit_qt5/musredit/icons/inkscape/musrSingleHisto.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrSingleHisto.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrSingleHisto.svg diff --git a/src/musredit_qt5/icons/inkscape/musrchisq.svg b/src/musredit_qt5/musredit/icons/inkscape/musrchisq.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrchisq.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrchisq.svg diff --git a/src/musredit_qt5/icons/inkscape/musrdump.svg b/src/musredit_qt5/musredit/icons/inkscape/musrdump.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrdump.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrdump.svg diff --git a/src/musredit_qt5/icons/inkscape/musrfit.svg b/src/musredit_qt5/musredit/icons/inkscape/musrfit.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrfit.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrfit.svg diff --git a/src/musredit_qt5/icons/inkscape/musrprefs.svg b/src/musredit_qt5/musredit/icons/inkscape/musrprefs.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrprefs.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrprefs.svg diff --git a/src/musredit_qt5/icons/inkscape/musrswap.svg b/src/musredit_qt5/musredit/icons/inkscape/musrswap.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrswap.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrswap.svg diff --git a/src/musredit_qt5/icons/inkscape/musrt0.svg b/src/musredit_qt5/musredit/icons/inkscape/musrt0.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrt0.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrt0.svg diff --git a/src/musredit_qt5/icons/inkscape/musrview.svg b/src/musredit_qt5/musredit/icons/inkscape/musrview.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrview.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrview.svg diff --git a/src/musredit_qt5/icons/inkscape/view-refresh.svg b/src/musredit_qt5/musredit/icons/inkscape/view-refresh.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/view-refresh.svg rename to src/musredit_qt5/musredit/icons/inkscape/view-refresh.svg diff --git a/src/musredit_qt5/icons/msr2data-dark.svg b/src/musredit_qt5/musredit/icons/msr2data-dark.svg similarity index 100% rename from src/musredit_qt5/icons/msr2data-dark.svg rename to src/musredit_qt5/musredit/icons/msr2data-dark.svg diff --git a/src/musredit_qt5/icons/msr2data-plain.svg b/src/musredit_qt5/musredit/icons/msr2data-plain.svg similarity index 100% rename from src/musredit_qt5/icons/msr2data-plain.svg rename to src/musredit_qt5/musredit/icons/msr2data-plain.svg diff --git a/src/musredit_qt5/icons/musrAsym-plain.svg b/src/musredit_qt5/musredit/icons/musrAsym-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrAsym-plain.svg rename to src/musredit_qt5/musredit/icons/musrAsym-plain.svg diff --git a/src/musredit_qt5/icons/musrFT-dark.svg b/src/musredit_qt5/musredit/icons/musrFT-dark.svg similarity index 100% rename from src/musredit_qt5/icons/musrFT-dark.svg rename to src/musredit_qt5/musredit/icons/musrFT-dark.svg diff --git a/src/musredit_qt5/icons/musrFT-plain.svg b/src/musredit_qt5/musredit/icons/musrFT-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrFT-plain.svg rename to src/musredit_qt5/musredit/icons/musrFT-plain.svg diff --git a/src/musredit_qt5/icons/musrSingleHisto-plain.svg b/src/musredit_qt5/musredit/icons/musrSingleHisto-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrSingleHisto-plain.svg rename to src/musredit_qt5/musredit/icons/musrSingleHisto-plain.svg diff --git a/src/musredit_qt5/icons/musrStep-32x32-dark.svg b/src/musredit_qt5/musredit/icons/musrStep-32x32-dark.svg similarity index 100% rename from src/musredit_qt5/icons/musrStep-32x32-dark.svg rename to src/musredit_qt5/musredit/icons/musrStep-32x32-dark.svg diff --git a/src/musredit_qt5/icons/musrStep-32x32.svg b/src/musredit_qt5/musredit/icons/musrStep-32x32.svg similarity index 100% rename from src/musredit_qt5/icons/musrStep-32x32.svg rename to src/musredit_qt5/musredit/icons/musrStep-32x32.svg diff --git a/src/musredit_qt5/icons/musrWiz-32x32-dark.svg b/src/musredit_qt5/musredit/icons/musrWiz-32x32-dark.svg similarity index 100% rename from src/musredit_qt5/icons/musrWiz-32x32-dark.svg rename to src/musredit_qt5/musredit/icons/musrWiz-32x32-dark.svg diff --git a/src/musredit_qt5/icons/musrWiz-32x32.svg b/src/musredit_qt5/musredit/icons/musrWiz-32x32.svg similarity index 100% rename from src/musredit_qt5/icons/musrWiz-32x32.svg rename to src/musredit_qt5/musredit/icons/musrWiz-32x32.svg diff --git a/src/musredit_qt5/icons/musrchisq-dark.svg b/src/musredit_qt5/musredit/icons/musrchisq-dark.svg similarity index 100% rename from src/musredit_qt5/icons/musrchisq-dark.svg rename to src/musredit_qt5/musredit/icons/musrchisq-dark.svg diff --git a/src/musredit_qt5/icons/musrchisq-plain.svg b/src/musredit_qt5/musredit/icons/musrchisq-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrchisq-plain.svg rename to src/musredit_qt5/musredit/icons/musrchisq-plain.svg diff --git a/src/musredit_qt5/icons/musrdump-dark.svg b/src/musredit_qt5/musredit/icons/musrdump-dark.svg similarity index 100% rename from src/musredit_qt5/icons/musrdump-dark.svg rename to src/musredit_qt5/musredit/icons/musrdump-dark.svg diff --git a/src/musredit_qt5/icons/musrdump-plain.svg b/src/musredit_qt5/musredit/icons/musrdump-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrdump-plain.svg rename to src/musredit_qt5/musredit/icons/musrdump-plain.svg diff --git a/src/musredit_qt5/icons/musredit.icns b/src/musredit_qt5/musredit/icons/musredit.icns similarity index 100% rename from src/musredit_qt5/icons/musredit.icns rename to src/musredit_qt5/musredit/icons/musredit.icns diff --git a/src/musredit_qt5/icons/musredit.ico b/src/musredit_qt5/musredit/icons/musredit.ico similarity index 100% rename from src/musredit_qt5/icons/musredit.ico rename to src/musredit_qt5/musredit/icons/musredit.ico diff --git a/src/musredit_qt5/icons/musrfit-16x16.gif b/src/musredit_qt5/musredit/icons/musrfit-16x16.gif similarity index 100% rename from src/musredit_qt5/icons/musrfit-16x16.gif rename to src/musredit_qt5/musredit/icons/musrfit-16x16.gif diff --git a/src/musredit_qt5/icons/musrfit-16x16.ico b/src/musredit_qt5/musredit/icons/musrfit-16x16.ico similarity index 100% rename from src/musredit_qt5/icons/musrfit-16x16.ico rename to src/musredit_qt5/musredit/icons/musrfit-16x16.ico diff --git a/src/musredit_qt5/icons/musrfit-16x16.png b/src/musredit_qt5/musredit/icons/musrfit-16x16.png similarity index 100% rename from src/musredit_qt5/icons/musrfit-16x16.png rename to src/musredit_qt5/musredit/icons/musrfit-16x16.png diff --git a/src/musredit_qt5/icons/musrfit-16x16.xpm b/src/musredit_qt5/musredit/icons/musrfit-16x16.xpm similarity index 100% rename from src/musredit_qt5/icons/musrfit-16x16.xpm rename to src/musredit_qt5/musredit/icons/musrfit-16x16.xpm diff --git a/src/musredit_qt5/icons/musrfit-dark.svg b/src/musredit_qt5/musredit/icons/musrfit-dark.svg similarity index 100% rename from src/musredit_qt5/icons/musrfit-dark.svg rename to src/musredit_qt5/musredit/icons/musrfit-dark.svg diff --git a/src/musredit_qt5/icons/musrfit-plain.svg b/src/musredit_qt5/musredit/icons/musrfit-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrfit-plain.svg rename to src/musredit_qt5/musredit/icons/musrfit-plain.svg diff --git a/src/musredit_qt5/icons/musrfit.gif b/src/musredit_qt5/musredit/icons/musrfit.gif similarity index 100% rename from src/musredit_qt5/icons/musrfit.gif rename to src/musredit_qt5/musredit/icons/musrfit.gif diff --git a/src/musredit_qt5/icons/musrprefs-dark.svg b/src/musredit_qt5/musredit/icons/musrprefs-dark.svg similarity index 100% rename from src/musredit_qt5/icons/musrprefs-dark.svg rename to src/musredit_qt5/musredit/icons/musrprefs-dark.svg diff --git a/src/musredit_qt5/icons/musrprefs-plain.svg b/src/musredit_qt5/musredit/icons/musrprefs-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrprefs-plain.svg rename to src/musredit_qt5/musredit/icons/musrprefs-plain.svg diff --git a/src/musredit_qt5/icons/musrswap-dark.svg b/src/musredit_qt5/musredit/icons/musrswap-dark.svg similarity index 100% rename from src/musredit_qt5/icons/musrswap-dark.svg rename to src/musredit_qt5/musredit/icons/musrswap-dark.svg diff --git a/src/musredit_qt5/icons/musrswap-plain.svg b/src/musredit_qt5/musredit/icons/musrswap-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrswap-plain.svg rename to src/musredit_qt5/musredit/icons/musrswap-plain.svg diff --git a/src/musredit_qt5/icons/musrt0-dark.svg b/src/musredit_qt5/musredit/icons/musrt0-dark.svg similarity index 100% rename from src/musredit_qt5/icons/musrt0-dark.svg rename to src/musredit_qt5/musredit/icons/musrt0-dark.svg diff --git a/src/musredit_qt5/icons/musrt0-plain.svg b/src/musredit_qt5/musredit/icons/musrt0-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrt0-plain.svg rename to src/musredit_qt5/musredit/icons/musrt0-plain.svg diff --git a/src/musredit_qt5/icons/musrview-dark.svg b/src/musredit_qt5/musredit/icons/musrview-dark.svg similarity index 100% rename from src/musredit_qt5/icons/musrview-dark.svg rename to src/musredit_qt5/musredit/icons/musrview-dark.svg diff --git a/src/musredit_qt5/icons/musrview-plain.svg b/src/musredit_qt5/musredit/icons/musrview-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrview-plain.svg rename to src/musredit_qt5/musredit/icons/musrview-plain.svg diff --git a/src/musredit_qt5/icons/view-refresh-dark.svg b/src/musredit_qt5/musredit/icons/view-refresh-dark.svg similarity index 100% rename from src/musredit_qt5/icons/view-refresh-dark.svg rename to src/musredit_qt5/musredit/icons/view-refresh-dark.svg diff --git a/src/musredit_qt5/icons/view-refresh-plain.svg b/src/musredit_qt5/musredit/icons/view-refresh-plain.svg similarity index 100% rename from src/musredit_qt5/icons/view-refresh-plain.svg rename to src/musredit_qt5/musredit/icons/view-refresh-plain.svg diff --git a/src/musredit_qt5/latex_images/abragam.png b/src/musredit_qt5/musredit/latex_images/abragam.png similarity index 100% rename from src/musredit_qt5/latex_images/abragam.png rename to src/musredit_qt5/musredit/latex_images/abragam.png diff --git a/src/musredit_qt5/latex_images/abragam.tex b/src/musredit_qt5/musredit/latex_images/abragam.tex similarity index 100% rename from src/musredit_qt5/latex_images/abragam.tex rename to src/musredit_qt5/musredit/latex_images/abragam.tex diff --git a/src/musredit_qt5/latex_images/asymmetry.png b/src/musredit_qt5/musredit/latex_images/asymmetry.png similarity index 100% rename from src/musredit_qt5/latex_images/asymmetry.png rename to src/musredit_qt5/musredit/latex_images/asymmetry.png diff --git a/src/musredit_qt5/latex_images/asymmetry.tex b/src/musredit_qt5/musredit/latex_images/asymmetry.tex similarity index 100% rename from src/musredit_qt5/latex_images/asymmetry.tex rename to src/musredit_qt5/musredit/latex_images/asymmetry.tex diff --git a/src/musredit_qt5/latex_images/bessel.png b/src/musredit_qt5/musredit/latex_images/bessel.png similarity index 100% rename from src/musredit_qt5/latex_images/bessel.png rename to src/musredit_qt5/musredit/latex_images/bessel.png diff --git a/src/musredit_qt5/latex_images/bessel.tex b/src/musredit_qt5/musredit/latex_images/bessel.tex similarity index 100% rename from src/musredit_qt5/latex_images/bessel.tex rename to src/musredit_qt5/musredit/latex_images/bessel.tex diff --git a/src/musredit_qt5/latex_images/combiLGKT.png b/src/musredit_qt5/musredit/latex_images/combiLGKT.png similarity index 100% rename from src/musredit_qt5/latex_images/combiLGKT.png rename to src/musredit_qt5/musredit/latex_images/combiLGKT.png diff --git a/src/musredit_qt5/latex_images/combiLGKT.tex b/src/musredit_qt5/musredit/latex_images/combiLGKT.tex similarity index 100% rename from src/musredit_qt5/latex_images/combiLGKT.tex rename to src/musredit_qt5/musredit/latex_images/combiLGKT.tex diff --git a/src/musredit_qt5/latex_images/generalExp.png b/src/musredit_qt5/musredit/latex_images/generalExp.png similarity index 100% rename from src/musredit_qt5/latex_images/generalExp.png rename to src/musredit_qt5/musredit/latex_images/generalExp.png diff --git a/src/musredit_qt5/latex_images/generalExp.tex b/src/musredit_qt5/musredit/latex_images/generalExp.tex similarity index 100% rename from src/musredit_qt5/latex_images/generalExp.tex rename to src/musredit_qt5/musredit/latex_images/generalExp.tex diff --git a/src/musredit_qt5/latex_images/internalBessel.png b/src/musredit_qt5/musredit/latex_images/internalBessel.png similarity index 100% rename from src/musredit_qt5/latex_images/internalBessel.png rename to src/musredit_qt5/musredit/latex_images/internalBessel.png diff --git a/src/musredit_qt5/latex_images/internalBessel.tex b/src/musredit_qt5/musredit/latex_images/internalBessel.tex similarity index 100% rename from src/musredit_qt5/latex_images/internalBessel.tex rename to src/musredit_qt5/musredit/latex_images/internalBessel.tex diff --git a/src/musredit_qt5/latex_images/internalField.png b/src/musredit_qt5/musredit/latex_images/internalField.png similarity index 100% rename from src/musredit_qt5/latex_images/internalField.png rename to src/musredit_qt5/musredit/latex_images/internalField.png diff --git a/src/musredit_qt5/latex_images/internalField.tex b/src/musredit_qt5/musredit/latex_images/internalField.tex similarity index 100% rename from src/musredit_qt5/latex_images/internalField.tex rename to src/musredit_qt5/musredit/latex_images/internalField.tex diff --git a/src/musredit_qt5/latex_images/internalFieldGK.png b/src/musredit_qt5/musredit/latex_images/internalFieldGK.png similarity index 100% rename from src/musredit_qt5/latex_images/internalFieldGK.png rename to src/musredit_qt5/musredit/latex_images/internalFieldGK.png diff --git a/src/musredit_qt5/latex_images/internalFieldLL.png b/src/musredit_qt5/musredit/latex_images/internalFieldLL.png similarity index 100% rename from src/musredit_qt5/latex_images/internalFieldLL.png rename to src/musredit_qt5/musredit/latex_images/internalFieldLL.png diff --git a/src/musredit_qt5/latex_images/polynom.png b/src/musredit_qt5/musredit/latex_images/polynom.png similarity index 100% rename from src/musredit_qt5/latex_images/polynom.png rename to src/musredit_qt5/musredit/latex_images/polynom.png diff --git a/src/musredit_qt5/latex_images/polynom.tex b/src/musredit_qt5/musredit/latex_images/polynom.tex similarity index 100% rename from src/musredit_qt5/latex_images/polynom.tex rename to src/musredit_qt5/musredit/latex_images/polynom.tex diff --git a/src/musredit_qt5/latex_images/simpleExp.png b/src/musredit_qt5/musredit/latex_images/simpleExp.png similarity index 100% rename from src/musredit_qt5/latex_images/simpleExp.png rename to src/musredit_qt5/musredit/latex_images/simpleExp.png diff --git a/src/musredit_qt5/latex_images/simpleExp.tex b/src/musredit_qt5/musredit/latex_images/simpleExp.tex similarity index 100% rename from src/musredit_qt5/latex_images/simpleExp.tex rename to src/musredit_qt5/musredit/latex_images/simpleExp.tex diff --git a/src/musredit_qt5/latex_images/simpleGauss.png b/src/musredit_qt5/musredit/latex_images/simpleGauss.png similarity index 100% rename from src/musredit_qt5/latex_images/simpleGauss.png rename to src/musredit_qt5/musredit/latex_images/simpleGauss.png diff --git a/src/musredit_qt5/latex_images/simpleGauss.tex b/src/musredit_qt5/musredit/latex_images/simpleGauss.tex similarity index 100% rename from src/musredit_qt5/latex_images/simpleGauss.tex rename to src/musredit_qt5/musredit/latex_images/simpleGauss.tex diff --git a/src/musredit_qt5/latex_images/statExpKT.png b/src/musredit_qt5/musredit/latex_images/statExpKT.png similarity index 100% rename from src/musredit_qt5/latex_images/statExpKT.png rename to src/musredit_qt5/musredit/latex_images/statExpKT.png diff --git a/src/musredit_qt5/latex_images/statExpKT.tex b/src/musredit_qt5/musredit/latex_images/statExpKT.tex similarity index 100% rename from src/musredit_qt5/latex_images/statExpKT.tex rename to src/musredit_qt5/musredit/latex_images/statExpKT.tex diff --git a/src/musredit_qt5/latex_images/statGssKT.png b/src/musredit_qt5/musredit/latex_images/statGssKT.png similarity index 100% rename from src/musredit_qt5/latex_images/statGssKT.png rename to src/musredit_qt5/musredit/latex_images/statGssKT.png diff --git a/src/musredit_qt5/latex_images/statGssKT.tex b/src/musredit_qt5/musredit/latex_images/statGssKT.tex similarity index 100% rename from src/musredit_qt5/latex_images/statGssKT.tex rename to src/musredit_qt5/musredit/latex_images/statGssKT.tex diff --git a/src/musredit_qt5/latex_images/textogif b/src/musredit_qt5/musredit/latex_images/textogif similarity index 100% rename from src/musredit_qt5/latex_images/textogif rename to src/musredit_qt5/musredit/latex_images/textogif diff --git a/src/musredit_qt5/latex_images/tfCos.png b/src/musredit_qt5/musredit/latex_images/tfCos.png similarity index 100% rename from src/musredit_qt5/latex_images/tfCos.png rename to src/musredit_qt5/musredit/latex_images/tfCos.png diff --git a/src/musredit_qt5/latex_images/tfCos.tex b/src/musredit_qt5/musredit/latex_images/tfCos.tex similarity index 100% rename from src/musredit_qt5/latex_images/tfCos.tex rename to src/musredit_qt5/musredit/latex_images/tfCos.tex diff --git a/src/musredit_qt5/main.cpp b/src/musredit_qt5/musredit/main.cpp similarity index 100% rename from src/musredit_qt5/main.cpp rename to src/musredit_qt5/musredit/main.cpp diff --git a/src/musredit_qt5/musredit.cfg b/src/musredit_qt5/musredit/musredit.cfg similarity index 100% rename from src/musredit_qt5/musredit.cfg rename to src/musredit_qt5/musredit/musredit.cfg diff --git a/src/musredit_qt5/musredit.dox b/src/musredit_qt5/musredit/musredit.dox similarity index 100% rename from src/musredit_qt5/musredit.dox rename to src/musredit_qt5/musredit/musredit.dox diff --git a/src/musredit_qt5/musredit.h b/src/musredit_qt5/musredit/musredit.h similarity index 100% rename from src/musredit_qt5/musredit.h rename to src/musredit_qt5/musredit/musredit.h diff --git a/src/musredit_qt5/musredit.pro b/src/musredit_qt5/musredit/musredit.pro similarity index 97% rename from src/musredit_qt5/musredit.pro rename to src/musredit_qt5/musredit/musredit.pro index 4a412554..aea89506 100644 --- a/src/musredit_qt5/musredit.pro +++ b/src/musredit_qt5/musredit/musredit.pro @@ -75,10 +75,11 @@ QT += network QT += printsupport QT += svg -INCLUDEPATH += "../include" +INCLUDEPATH += "../" +INCLUDEPATH += "../../include" HEADERS = musredit.h \ - musrfit-info.h \ + ../musrfit-info.h \ PHelp.h \ PTextEdit.h \ PSubTextEdit.h \ @@ -102,7 +103,7 @@ HEADERS = musredit.h \ PMsr2DataDialog.h \ PChangeDefaultPathsDialog.h \ PMusrEditAbout.h \ - ../include/git-revision.h + ../../include/git-revision.h SOURCES = PHelp.cpp \ PTextEdit.cpp \ diff --git a/src/musredit_qt5/musredit.qrc b/src/musredit_qt5/musredit/musredit.qrc similarity index 100% rename from src/musredit_qt5/musredit.qrc rename to src/musredit_qt5/musredit/musredit.qrc