diff options
242 files changed, 6686 insertions, 2116 deletions
@@ -1,7 +1,7 @@ # This file is used to ignore files that should not be committed # -------------------------------------------------------------- -examples/quick/enterprise/virtualkeyboard/virtualkeyboard/virtualkeyboard +examples/virtualkeyboard/basic !src/virtualkeyboard/3rdparty/hunspell/hunspell.pro src/virtualkeyboard/3rdparty/hunspell/* src/virtualkeyboard/3rdparty/hunspell/doc/html diff --git a/.qmake.conf b/.qmake.conf index 70bb6fbe..a2a0d418 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 2.0 +MODULE_VERSION = 5.7.1 diff --git a/LICENSE.GPL3 b/LICENSE.GPL3 new file mode 100644 index 00000000..94a9ed02 --- /dev/null +++ b/LICENSE.GPL3 @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + 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. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + 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 <http://www.gnu.org/licenses/>. + +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: + + <program> Copyright (C) <year> <name of author> + 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 +<http://www.gnu.org/licenses/>. + + 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 +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/dist/changes-5.7.0 b/dist/changes-5.7.0 new file mode 100644 index 00000000..10733805 --- /dev/null +++ b/dist/changes-5.7.0 @@ -0,0 +1,29 @@ +Qt 5.7 introduces many new features and improvements as well as bugfixes +over the 5.6.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://doc.qt.io/qt-5/index.html + +The Qt version 5.7 series is binary compatible with the 5.6.x series. +Applications compiled for 5.6 will continue to run with 5.7. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Important Changes * +**************************************************************************** + + - Renamed QML import from + "import QtQuick.Enterprise.VirtualKeyboard" to + "import QtQuick.VirtualKeyboard", as the module is now also available + under the open-source GPLv3 license. + + - Added support for selection handles. Currently, it's only supported for + the integrated VKB. Support for the dedicated VKB will be a separate + commit. diff --git a/examples/virtualkeyboard/basic/Basic.qml b/examples/virtualkeyboard/basic/Basic.qml index dc4f1309..c8b9ad41 100644 --- a/examples/virtualkeyboard/basic/Basic.qml +++ b/examples/virtualkeyboard/basic/Basic.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 import "content" Rectangle { diff --git a/examples/virtualkeyboard/basic/basic-b2qt.qml b/examples/virtualkeyboard/basic/basic-b2qt.qml index 3285afb3..10e5c780 100644 --- a/examples/virtualkeyboard/basic/basic-b2qt.qml +++ b/examples/virtualkeyboard/basic/basic-b2qt.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Window 2.2 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 import "content" Item { diff --git a/examples/virtualkeyboard/basic/basic.pro b/examples/virtualkeyboard/basic/basic.pro index 1d58fcac..2e0c6f68 100644 --- a/examples/virtualkeyboard/basic/basic.pro +++ b/examples/virtualkeyboard/basic/basic.pro @@ -7,12 +7,8 @@ static { QT += svg QTPLUGIN += qtvirtualkeyboardplugin } -android-no-sdk|!isEmpty(CROSS_COMPILE) { - TARGETPATH = /data/user/qt/virtualkeyboard/basic -} else { - TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic -} -target.path = $$TARGETPATH + +target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic INSTALLS += target RESOURCES += \ @@ -33,7 +29,7 @@ disable-xcb { CONFIG += disable-desktop } -disable-desktop|android-no-sdk|!isEmpty(CROSS_COMPILE)|qnx { +disable-desktop|!isEmpty(CROSS_COMPILE)|qnx { DEFINES += MAIN_QML=\\\"basic-b2qt.qml\\\" } else { DEFINES += MAIN_QML=\\\"Basic.qml\\\" diff --git a/examples/virtualkeyboard/basic/content/AutoScroller.qml b/examples/virtualkeyboard/basic/content/AutoScroller.qml index 33aab92a..d8d84a50 100644 --- a/examples/virtualkeyboard/basic/content/AutoScroller.qml +++ b/examples/virtualkeyboard/basic/content/AutoScroller.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 Item { diff --git a/examples/virtualkeyboard/basic/content/HandwritingModeButton.qml b/examples/virtualkeyboard/basic/content/HandwritingModeButton.qml index c135729b..6b2f9dbc 100644 --- a/examples/virtualkeyboard/basic/content/HandwritingModeButton.qml +++ b/examples/virtualkeyboard/basic/content/HandwritingModeButton.qml @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 diff --git a/examples/virtualkeyboard/basic/content/ScrollBar.qml b/examples/virtualkeyboard/basic/content/ScrollBar.qml index a77ff20b..db0e47b3 100644 --- a/examples/virtualkeyboard/basic/content/ScrollBar.qml +++ b/examples/virtualkeyboard/basic/content/ScrollBar.qml @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 diff --git a/examples/virtualkeyboard/basic/content/TextArea.qml b/examples/virtualkeyboard/basic/content/TextArea.qml index 91046582..1b66a475 100644 --- a/examples/virtualkeyboard/basic/content/TextArea.qml +++ b/examples/virtualkeyboard/basic/content/TextArea.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 TextBase { id: textArea diff --git a/examples/virtualkeyboard/basic/content/TextBase.qml b/examples/virtualkeyboard/basic/content/TextBase.qml index 59777f01..c8fe8168 100644 --- a/examples/virtualkeyboard/basic/content/TextBase.qml +++ b/examples/virtualkeyboard/basic/content/TextBase.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 FocusScope { id: textBase diff --git a/examples/virtualkeyboard/basic/content/TextField.qml b/examples/virtualkeyboard/basic/content/TextField.qml index 8ae8fa3f..7817f3bd 100644 --- a/examples/virtualkeyboard/basic/content/TextField.qml +++ b/examples/virtualkeyboard/basic/content/TextField.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 TextBase { id: textField diff --git a/examples/virtualkeyboard/basic/main.cpp b/examples/virtualkeyboard/basic/main.cpp index 5bf6b75d..883808b8 100644 --- a/examples/virtualkeyboard/basic/main.cpp +++ b/examples/virtualkeyboard/basic/main.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include <QQuickView> #include <QGuiApplication> diff --git a/virtualkeyboard.pro b/qtvirtualkeyboard.pro index 2f211cd4..2f211cd4 100644 --- a/virtualkeyboard.pro +++ b/qtvirtualkeyboard.pro diff --git a/src/config.pri b/src/config.pri index 6c4bc0d0..5a80d1c6 100644 --- a/src/config.pri +++ b/src/config.pri @@ -11,6 +11,15 @@ handwriting:!lipi-toolkit:!t9write { else: CONFIG += lipi-toolkit } +# Default language +!contains(CONFIG, lang-.*) { + contains(QT_CONFIG, private_tests) { # CI or developer build, use all languages + CONFIG += lang-all + } else { + CONFIG += lang-en_GB + } +} + # Flag for activating all languages lang-all: CONFIG += \ lang-ar_AR \ @@ -33,9 +42,6 @@ lang-all: CONFIG += \ lang-zh_CN \ lang-zh_TW -# Default language -!contains(CONFIG, lang-.*): CONFIG += lang-en_GB - # Enable features by languages contains(CONFIG, lang-ja.*): CONFIG += openwnn contains(CONFIG, lang-ko.*): CONFIG += hangul diff --git a/src/src.pro b/src/src.pro index 542db7f3..06ad0b6a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -34,4 +34,5 @@ t9write { SUBDIRS += \ virtualkeyboard \ + virtualkeyboard/import \ virtualkeyboard/styles diff --git a/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro b/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro index ce5a90f6..a5056e82 100644 --- a/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro +++ b/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro @@ -1,35 +1,12 @@ -TEMPLATE = lib -QT -= core gui -DEFINES += BUILDING_LIBHUNSPELL -CONFIG += dll -#CONFIG += staticlib +TARGET = qthunspell + +DEFINES += HUNSPELL_STATIC +CONFIG += static CONFIG += precompile_header warn_off -debug { +CONFIG(debug, debug|release) { DEFINES += HUNSPELL_WARNING_ON } -build_pass { - CONFIG(debug, debug|release) { - SUBPATH = debug - win32: TARGET_SUFFIX = d - } else { - SUBPATH = release - } -} else { - debug_and_release: CONFIG += build_all - else:win32:CONFIG(debug, debug|release): TARGET_SUFFIX = d -} - -DESTDIR = $$SUBPATH - -TARGET = hunspell$$TARGET_SUFFIX - -dll { - win32: CONFIG += skip_target_version_ext - target.path = $$[QT_INSTALL_LIBS] - INSTALLS += target -} - config_file = "/* Version number of package */" "$${LITERAL_HASH}define VERSION \"$$VERSION\"" write_file($$PWD/config.h, config_file) @@ -75,3 +52,5 @@ OTHER_FILES +=\ src/hunspell/license.hunspell \ src/hunspell/license.myspell \ src/hunspell/utf_info.cxx + +load(qt_helper_lib) diff --git a/src/virtualkeyboard/3rdparty/openwnn/openwnn.pro b/src/virtualkeyboard/3rdparty/openwnn/openwnn.pro index 0068df18..6ca93d36 100644 --- a/src/virtualkeyboard/3rdparty/openwnn/openwnn.pro +++ b/src/virtualkeyboard/3rdparty/openwnn/openwnn.pro @@ -1,20 +1,9 @@ -TEMPLATE = lib -QT += core-private -QT -= gui -TARGET = openwnn +TARGET = qtopenwnn + VERSION = 1.3.6 -CONFIG += staticlib +CONFIG += static CONFIG += warn_off -build_pass { - CONFIG(debug, debug|release): SUBPATH = debug - else: SUBPATH = release -} else { - debug_and_release: CONFIG += build_all -} - -DESTDIR = $$SUBPATH - INCLUDEPATH += \ wnnDictionary/include \ wnnEngine/include @@ -59,3 +48,8 @@ HEADERS += \ wnnEngine/include/romkan.h \ wnnEngine/include/romkanfullkatakana.h \ wnnEngine/include/romkanhalfkatakana.h + +load(qt_helper_lib) + +CONFIG += qt +QT = core-private diff --git a/src/virtualkeyboard/3rdparty/openwnn/wnnEngine/include/letterconverter.h b/src/virtualkeyboard/3rdparty/openwnn/wnnEngine/include/letterconverter.h index 4a4c5d9e..ddbb45fa 100644 --- a/src/virtualkeyboard/3rdparty/openwnn/wnnEngine/include/letterconverter.h +++ b/src/virtualkeyboard/3rdparty/openwnn/wnnEngine/include/letterconverter.h @@ -25,7 +25,9 @@ #include <QObject> #include "composingtext.h" +QT_BEGIN_NAMESPACE class QObjectPrivate; +QT_END_NAMESPACE class LetterConverter : public QObject { diff --git a/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro b/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro index 9668f668..8aab0eef 100644 --- a/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro +++ b/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro @@ -1,20 +1,9 @@ -TEMPLATE = lib -win32: QT -= gui -else: CONFIG -= qt -TARGET = pinyin +TARGET = qtpinyin + VERSION = 1.0.0 -CONFIG += staticlib +CONFIG += static CONFIG += warn_off -build_pass { - CONFIG(debug, debug|release): SUBPATH = debug - else: SUBPATH = release -} else { - debug_and_release: CONFIG += build_all -} - -DESTDIR = $$SUBPATH - INCLUDEPATH += \ include @@ -59,3 +48,11 @@ HEADERS += \ OTHER_FILES +=\ data/rawdict_utf16_65105_freq.txt \ data/valid_utf16.txt + +load(qt_helper_lib) + +# On Windows, the library uses Qt for platform abstraction. +win32 { + CONFIG += qt + QT = core +} diff --git a/src/virtualkeyboard/3rdparty/t9write/t9write.pro b/src/virtualkeyboard/3rdparty/t9write/t9write.pro index 197d1015..8d6b4b91 100644 --- a/src/virtualkeyboard/3rdparty/t9write/t9write.pro +++ b/src/virtualkeyboard/3rdparty/t9write/t9write.pro @@ -1,15 +1,6 @@ -TEMPLATE = lib -CONFIG += staticlib -TARGET = t9write_db +TARGET = qtt9write_db -build_pass { - CONFIG(debug, debug|release): SUBPATH = debug - else: SUBPATH = release -} else { - debug_and_release: CONFIG += build_all -} - -DESTDIR = $$SUBPATH +CONFIG += static T9WRITE_LDBS = $$files(databases/XT9_LDBs/*.ldb) @@ -23,3 +14,8 @@ QMAKE_RESOURCE_FLAGS += -no-compress include(../../generateresource.pri) RESOURCES += $$generate_resource(t9write_db.qrc, $$T9WRITE_RESOURCE_FILES) + +load(qt_helper_lib) + +# Needed for resources +CONFIG += qt diff --git a/src/virtualkeyboard/3rdparty/tcime/tcime.pro b/src/virtualkeyboard/3rdparty/tcime/tcime.pro index 218563a6..86755635 100644 --- a/src/virtualkeyboard/3rdparty/tcime/tcime.pro +++ b/src/virtualkeyboard/3rdparty/tcime/tcime.pro @@ -1,16 +1,6 @@ -TEMPLATE = lib -QT -= gui -TARGET = tcime -CONFIG += staticlib +TARGET = qttcime -build_pass { - CONFIG(debug, debug|release): SUBPATH = debug - else: SUBPATH = release -} else { - debug_and_release: CONFIG += build_all -} - -DESTDIR = $$SUBPATH +CONFIG += static SOURCES += \ cangjiedictionary.cpp \ @@ -31,3 +21,8 @@ HEADERS += \ OTHER_FILES += \ data/dict_cangjie.dat \ data/dict_phrases.dat + +load(qt_helper_lib) + +CONFIG += qt +QT = core diff --git a/src/virtualkeyboard/abstractinputmethod.cpp b/src/virtualkeyboard/abstractinputmethod.cpp index 8485031b..05c60e79 100644 --- a/src/virtualkeyboard/abstractinputmethod.cpp +++ b/src/virtualkeyboard/abstractinputmethod.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "abstractinputmethod.h" @@ -36,6 +44,7 @@ AbstractInputMethodPrivate::AbstractInputMethodPrivate() : /*! \class QtVirtualKeyboard::AbstractInputMethod + \internal \inmodule qtvirtualkeyboard @@ -158,7 +167,7 @@ void AbstractInputMethod::selectionListItemSelected(SelectionListModel::Type typ } /*! - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 Returns list of supported pattern recognition modes. @@ -171,7 +180,7 @@ QList<InputEngine::PatternRecognitionMode> AbstractInputMethod::patternRecogniti } /*! - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 This method is called when a trace interaction starts with the specified \a patternRecognitionMode. The trace is uniquely identified by the \a traceId. @@ -193,7 +202,7 @@ Trace *AbstractInputMethod::traceBegin(int traceId, InputEngine::PatternRecognit } /*! - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 This method is called when the trace interaction ends. The input method should destroy the \a trace object at some point after this function is called. See the \l Trace API how to access the gathered @@ -208,7 +217,7 @@ bool AbstractInputMethod::traceEnd(Trace *trace) } /*! - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 This function attempts to reselect a word located at the \a cursorPosition. The \a reselectFlags define the rules for how the word should be selected in diff --git a/src/virtualkeyboard/abstractinputmethod.h b/src/virtualkeyboard/abstractinputmethod.h index 9a1cc6b3..168245de 100644 --- a/src/virtualkeyboard/abstractinputmethod.h +++ b/src/virtualkeyboard/abstractinputmethod.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef ABSTRACTINPUTMETHOD_H #define ABSTRACTINPUTMETHOD_H diff --git a/src/virtualkeyboard/abstractinputpanel.cpp b/src/virtualkeyboard/abstractinputpanel.cpp index f64552ed..564582fb 100644 --- a/src/virtualkeyboard/abstractinputpanel.cpp +++ b/src/virtualkeyboard/abstractinputpanel.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "abstractinputpanel.h" #include <QtCore/QRect> @@ -26,7 +34,7 @@ namespace QtVirtualKeyboard { /*! \class QtVirtualKeyboard::AbstractInputPanel - + \internal \inmodule qtvirtualkeyboard \brief Base class for an input panel. diff --git a/src/virtualkeyboard/abstractinputpanel.h b/src/virtualkeyboard/abstractinputpanel.h index 92408baa..efce0234 100644 --- a/src/virtualkeyboard/abstractinputpanel.h +++ b/src/virtualkeyboard/abstractinputpanel.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef ABSTRACTINPUTPANEL_H #define ABSTRACTINPUTPANEL_H diff --git a/src/virtualkeyboard/appinputpanel.cpp b/src/virtualkeyboard/appinputpanel.cpp index 0583888b..94834cd1 100644 --- a/src/virtualkeyboard/appinputpanel.cpp +++ b/src/virtualkeyboard/appinputpanel.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "appinputpanel.h" diff --git a/src/virtualkeyboard/appinputpanel.h b/src/virtualkeyboard/appinputpanel.h index 0b84bbf7..5df05008 100644 --- a/src/virtualkeyboard/appinputpanel.h +++ b/src/virtualkeyboard/appinputpanel.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef APPINPUTPANEL_H #define APPINPUTPANEL_H diff --git a/src/virtualkeyboard/content/HandwritingInputPanel.qml b/src/virtualkeyboard/content/HandwritingInputPanel.qml index 1e70fda1..6492ab26 100644 --- a/src/virtualkeyboard/content/HandwritingInputPanel.qml +++ b/src/virtualkeyboard/content/HandwritingInputPanel.qml @@ -1,32 +1,40 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Window 2.2 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 /*! \qmltype HandwritingInputPanel - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \inqmlmodule QtQuick.VirtualKeyboard + \since QtQuick.VirtualKeyboard 2.0 \brief Provides a handwriting panel add-on for the virtual keyboard UI. \ingroup qtvirtualkeyboard-qml diff --git a/src/virtualkeyboard/content/InputPanel.qml b/src/virtualkeyboard/content/InputPanel.qml index 9546bf3d..2e500a1b 100644 --- a/src/virtualkeyboard/content/InputPanel.qml +++ b/src/virtualkeyboard/content/InputPanel.qml @@ -1,30 +1,38 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 /*! \qmltype InputPanel - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \brief Provides the virtual keyboard UI. \ingroup qtvirtualkeyboard-qml @@ -40,7 +48,7 @@ Item { /*! \qmlproperty bool InputPanel::active - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 This property reflects the active status of the input panel. The keyboard should be made visible to the user when this property is @@ -51,6 +59,11 @@ Item { /*! \internal */ property alias keyboard: keyboard + SelectionControl { + x: -parent.x + y: -parent.y + } + implicitHeight: keyboard.height Keyboard { id: keyboard diff --git a/src/virtualkeyboard/content/components/AlternativeKeys.qml b/src/virtualkeyboard/content/components/AlternativeKeys.qml index 59a26935..8801099c 100644 --- a/src/virtualkeyboard/content/components/AlternativeKeys.qml +++ b/src/virtualkeyboard/content/components/AlternativeKeys.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 Item { property bool active: listView.currentIndex != -1 diff --git a/src/virtualkeyboard/content/components/BackspaceKey.qml b/src/virtualkeyboard/content/components/BackspaceKey.qml index 096b5333..126f6e2c 100644 --- a/src/virtualkeyboard/content/components/BackspaceKey.qml +++ b/src/virtualkeyboard/content/components/BackspaceKey.qml @@ -1,29 +1,37 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype BackspaceKey - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits BaseKey diff --git a/src/virtualkeyboard/content/components/BaseKey.qml b/src/virtualkeyboard/content/components/BaseKey.qml index df06c374..c45efb32 100644 --- a/src/virtualkeyboard/content/components/BaseKey.qml +++ b/src/virtualkeyboard/content/components/BaseKey.qml @@ -1,30 +1,38 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 /*! \qmltype BaseKey - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits Item @@ -64,7 +72,7 @@ Item { */ property string displayText: text - /*! \since QtQuick.Enterprise.VirtualKeyboard 2.0 + /*! \since QtQuick.VirtualKeyboard 2.0 Sets the small text rendered in the corner of the key. @@ -72,7 +80,7 @@ Item { */ property string smallText: effectiveAlternativeKeysHighlightIndex !== -1 ? effectiveAlternativeKeys[effectiveAlternativeKeysHighlightIndex] : "" - /*! \since QtQuick.Enterprise.VirtualKeyboard 2.0 + /*! \since QtQuick.VirtualKeyboard 2.0 Sets the visibility of small text. @@ -97,7 +105,7 @@ Item { */ property var alternativeKeys: [] - /*! \since QtQuick.Enterprise.VirtualKeyboard 2.0 + /*! \since QtQuick.VirtualKeyboard 2.0 This property contains the effective alternative keys presented to user. @@ -111,7 +119,7 @@ Item { return alternativeKeys.slice(0, textIndex).concat(alternativeKeys.slice(textIndex + 1)) } - /*! \since QtQuick.Enterprise.VirtualKeyboard 2.0 + /*! \since QtQuick.VirtualKeyboard 2.0 This property contains the index of highlighted item in the \c effectiveAlternativeKeys. @@ -132,7 +140,7 @@ Item { */ property int key: Qt.Key_unknown - /*! \since QtQuick.Enterprise.VirtualKeyboard 1.3 + /*! \since QtQuick.VirtualKeyboard 1.3 This property controls whether the key emits key events for input method processing. When true, the key events are disabled. @@ -148,7 +156,7 @@ Item { */ property bool active: false - /*! \since QtQuick.Enterprise.VirtualKeyboard 1.3 + /*! \since QtQuick.VirtualKeyboard 1.3 Disables key modifiers on the emitted key. @@ -211,7 +219,7 @@ Item { property alias keyPanelDelegate: keyPanel.sourceComponent /*! - \since QtQuick.Enterprise.VirtualKeyboard 1.1 + \since QtQuick.VirtualKeyboard 1.1 This property holds the sound effect to be played on key press. diff --git a/src/virtualkeyboard/content/components/ChangeLanguageKey.qml b/src/virtualkeyboard/content/components/ChangeLanguageKey.qml index 80bb4065..a152ed22 100644 --- a/src/virtualkeyboard/content/components/ChangeLanguageKey.qml +++ b/src/virtualkeyboard/content/components/ChangeLanguageKey.qml @@ -1,29 +1,37 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype ChangeLanguageKey - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits BaseKey diff --git a/src/virtualkeyboard/content/components/CharacterPreviewBubble.qml b/src/virtualkeyboard/content/components/CharacterPreviewBubble.qml index 28549381..3a7490aa 100644 --- a/src/virtualkeyboard/content/components/CharacterPreviewBubble.qml +++ b/src/virtualkeyboard/content/components/CharacterPreviewBubble.qml @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 diff --git a/src/virtualkeyboard/content/components/EnterKey.qml b/src/virtualkeyboard/content/components/EnterKey.qml index 1fb8ecdd..74b3984c 100644 --- a/src/virtualkeyboard/content/components/EnterKey.qml +++ b/src/virtualkeyboard/content/components/EnterKey.qml @@ -1,30 +1,38 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 /*! \qmltype EnterKey - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits BaseKey diff --git a/src/virtualkeyboard/content/components/FillerKey.qml b/src/virtualkeyboard/content/components/FillerKey.qml index b15685c5..b06d4aed 100644 --- a/src/virtualkeyboard/content/components/FillerKey.qml +++ b/src/virtualkeyboard/content/components/FillerKey.qml @@ -1,29 +1,37 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype FillerKey - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits BaseKey diff --git a/src/virtualkeyboard/content/components/HandwritingModeKey.qml b/src/virtualkeyboard/content/components/HandwritingModeKey.qml index 8d8d7948..b07cdcd6 100644 --- a/src/virtualkeyboard/content/components/HandwritingModeKey.qml +++ b/src/virtualkeyboard/content/components/HandwritingModeKey.qml @@ -1,32 +1,40 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype HandwritingModeKey - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits Key - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 \brief Hand writing mode key for keyboard layouts. diff --git a/src/virtualkeyboard/content/components/HideKeyboardKey.qml b/src/virtualkeyboard/content/components/HideKeyboardKey.qml index ce98fd1f..e9de1002 100644 --- a/src/virtualkeyboard/content/components/HideKeyboardKey.qml +++ b/src/virtualkeyboard/content/components/HideKeyboardKey.qml @@ -1,30 +1,38 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 /*! \qmltype HideKeyboardKey - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits BaseKey diff --git a/src/virtualkeyboard/content/components/Key.qml b/src/virtualkeyboard/content/components/Key.qml index 17c12523..620a3a7b 100644 --- a/src/virtualkeyboard/content/components/Key.qml +++ b/src/virtualkeyboard/content/components/Key.qml @@ -1,29 +1,37 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype Key - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits BaseKey diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml index 29eed63b..6956898f 100644 --- a/src/virtualkeyboard/content/components/Keyboard.qml +++ b/src/virtualkeyboard/content/components/Keyboard.qml @@ -1,29 +1,37 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 -import QtQuick.Enterprise.VirtualKeyboard.Styles 2.0 -import QtQuick.Enterprise.VirtualKeyboard.Settings 2.0 +import QtQuick.VirtualKeyboard 2.1 +import QtQuick.VirtualKeyboard.Styles 2.1 +import QtQuick.VirtualKeyboard.Settings 2.1 import Qt.labs.folderlistmodel 2.0 Item { @@ -67,7 +75,7 @@ Item { function initDefaultInputMethod() { try { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HunspellInputMethod {}', keyboard, "defaultInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HunspellInputMethod {}', keyboard, "defaultInputMethod") } catch (e) { } return plainInputMethod } @@ -320,8 +328,8 @@ Item { id: layoutsModel nameFilters: ["$"] Component.onCompleted: { - if (InputContext.fileExists("qrc:/QtQuick/Enterprise/VirtualKeyboard/content/layouts")) - layoutsModel.folder = "qrc:/QtQuick/Enterprise/VirtualKeyboard/content/layouts" + if (InputContext.fileExists("qrc:/QtQuick/VirtualKeyboard/content/layouts")) + layoutsModel.folder = "qrc:/QtQuick/VirtualKeyboard/content/layouts" else layoutsModel.folder = "../layouts" } @@ -533,7 +541,7 @@ Item { var soundId = Qt.md5(sound) multiSoundEffect = __sounds[soundId] if (!multiSoundEffect) { - multiSoundEffect = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; MultiSoundEffect {}', soundEffect) + multiSoundEffect = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; MultiSoundEffect {}', soundEffect) if (multiSoundEffect) { multiSoundEffect.playingChanged.connect(soundEffect.playingChanged) multiSoundEffect.source = sound diff --git a/src/virtualkeyboard/content/components/KeyboardColumn.qml b/src/virtualkeyboard/content/components/KeyboardColumn.qml index e07e11f5..d5b1fbfe 100644 --- a/src/virtualkeyboard/content/components/KeyboardColumn.qml +++ b/src/virtualkeyboard/content/components/KeyboardColumn.qml @@ -1,30 +1,38 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 /*! \qmltype KeyboardColumn - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits ColumnLayout @@ -42,7 +50,7 @@ ColumnLayout { */ property real keyWeight: parent ? parent.keyWeight : undefined - /*! \since QtQuick.Enterprise.VirtualKeyboard 2.0 + /*! \since QtQuick.VirtualKeyboard 2.0 Sets the \c smallTextVisible for all children keys. diff --git a/src/virtualkeyboard/content/components/KeyboardLayout.qml b/src/virtualkeyboard/content/components/KeyboardLayout.qml index 5c9e1d8a..5b790dc6 100644 --- a/src/virtualkeyboard/content/components/KeyboardLayout.qml +++ b/src/virtualkeyboard/content/components/KeyboardLayout.qml @@ -1,31 +1,39 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 /*! \qmltype KeyboardLayout - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits ColumnLayout @@ -39,7 +47,7 @@ import QtQuick.Enterprise.VirtualKeyboard 2.0 \code import QtQuick 2.0 import QtQuick.Layouts 1.0 - import QtQuick.Enterprise.VirtualKeyboard 2.0 + import QtQuick.VirtualKeyboard 2.1 // file: layouts/en_GB/main.qml @@ -127,7 +135,7 @@ ColumnLayout { */ property real keyWeight - /*! \since QtQuick.Enterprise.VirtualKeyboard 2.0 + /*! \since QtQuick.VirtualKeyboard 2.0 Sets the \c smallTextVisible for all children keys. diff --git a/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml b/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml index abfb0eb8..800667d7 100644 --- a/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml +++ b/src/virtualkeyboard/content/components/KeyboardLayoutLoader.qml @@ -1,32 +1,40 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype KeyboardLayoutLoader - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits Loader - \since QtQuick.Enterprise.VirtualKeyboard 1.1 + \since QtQuick.VirtualKeyboard 1.1 \brief Allows dynamic loading of keyboard layout. @@ -41,7 +49,7 @@ import QtQuick 2.0 \code import QtQuick 2.0 import QtQuick.Layouts 1.0 - import QtQuick.Enterprise.VirtualKeyboard 2.0 + import QtQuick.VirtualKeyboard 2.1 // file: layouts/en_GB/symbols.qml diff --git a/src/virtualkeyboard/content/components/KeyboardRow.qml b/src/virtualkeyboard/content/components/KeyboardRow.qml index 51aa9ed4..5c9db6b2 100644 --- a/src/virtualkeyboard/content/components/KeyboardRow.qml +++ b/src/virtualkeyboard/content/components/KeyboardRow.qml @@ -1,30 +1,38 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 /*! \qmltype KeyboardRow - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits RowLayout @@ -41,7 +49,7 @@ RowLayout { */ property real keyWeight: parent ? parent.keyWeight : undefined - /*! \since QtQuick.Enterprise.VirtualKeyboard 2.0 + /*! \since QtQuick.VirtualKeyboard 2.0 Sets the \c smallTextVisible for all children keys. diff --git a/src/virtualkeyboard/content/components/ModeKey.qml b/src/virtualkeyboard/content/components/ModeKey.qml index f78a4d8e..5fd24b41 100644 --- a/src/virtualkeyboard/content/components/ModeKey.qml +++ b/src/virtualkeyboard/content/components/ModeKey.qml @@ -1,32 +1,40 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype ModeKey - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits Key - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 \brief Generic mode key for keyboard layouts. diff --git a/src/virtualkeyboard/content/components/MultiSoundEffect.qml b/src/virtualkeyboard/content/components/MultiSoundEffect.qml index fa1b2bad..685a21df 100644 --- a/src/virtualkeyboard/content/components/MultiSoundEffect.qml +++ b/src/virtualkeyboard/content/components/MultiSoundEffect.qml @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtMultimedia 5.0 diff --git a/src/virtualkeyboard/content/components/MultitapInputMethod.qml b/src/virtualkeyboard/content/components/MultitapInputMethod.qml index aa91667b..b0aa8129 100644 --- a/src/virtualkeyboard/content/components/MultitapInputMethod.qml +++ b/src/virtualkeyboard/content/components/MultitapInputMethod.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 InputMethod { property string multitapSequence diff --git a/src/virtualkeyboard/content/components/NumberKey.qml b/src/virtualkeyboard/content/components/NumberKey.qml index a0c971e5..dfe29912 100644 --- a/src/virtualkeyboard/content/components/NumberKey.qml +++ b/src/virtualkeyboard/content/components/NumberKey.qml @@ -1,29 +1,37 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype NumberKey - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits Key diff --git a/src/virtualkeyboard/content/components/SelectionControl.qml b/src/virtualkeyboard/content/components/SelectionControl.qml new file mode 100644 index 00000000..a24c1116 --- /dev/null +++ b/src/virtualkeyboard/content/components/SelectionControl.qml @@ -0,0 +1,99 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.VirtualKeyboard 2.1 + +Item { + id: root + property bool handleIsMoving: false + visible: InputContext.selectionControlVisible || handleIsMoving + + Loader { + id: anchorHandle + sourceComponent: keyboard.style.selectionHandle + x: visible ? Qt.inputMethod.anchorRectangle.x - width/2 : 0 + y: visible ? Qt.inputMethod.anchorRectangle.y + Qt.inputMethod.anchorRectangle.height : 0 + + Behavior on opacity { + NumberAnimation { duration: 200 } + } + opacity: InputContext.anchorRectIntersectsClipRect ? 1.0 : 0.0 + + MouseArea { + width: parent.width * 2 + height: width * 1.12 + anchors.centerIn: parent + onPositionChanged: { + // we don't move the handles, the handles will move as the selection changes. + // The middle of a handle is mapped to the middle of the line above it + root.handleIsMoving = true + var xx = x + anchorHandle.x + mouse.x + var yy = y + anchorHandle.y + mouse.y - (anchorHandle.height + Qt.inputMethod.anchorRectangle.height)/2 + var x2 = cursorHandle.x + cursorHandle.width/2 + var y2 = cursorHandle.y - Qt.inputMethod.cursorRectangle.height/2 + InputContext.setSelectionOnFocusObject(Qt.point(xx,yy), Qt.point(x2,y2)) + } + onReleased: { + root.handleIsMoving = false + } + } + } + + // selection cursor handle + Loader { + id: cursorHandle + sourceComponent: keyboard.style.selectionHandle + x: visible ? Qt.inputMethod.cursorRectangle.x - width/2 : 0 + y: visible ? Qt.inputMethod.cursorRectangle.y + Qt.inputMethod.cursorRectangle.height : 0 + + Behavior on opacity { + NumberAnimation { duration: 200 } + } + opacity: InputContext.cursorRectIntersectsClipRect ? 1.0 : 0.0 + + MouseArea { + width: parent.width * 2 + height: width * 1.12 + anchors.centerIn: parent + onPositionChanged: { + // we don't move the handles, the handles will move as the selection changes. + root.handleIsMoving = true + var xx = anchorHandle.x + anchorHandle.width/2 + var yy = anchorHandle.y - Qt.inputMethod.anchorRectangle.height/2 + var x2 = x + cursorHandle.x + mouse.x + var y2 = y + cursorHandle.y + mouse.y - (cursorHandle.height + Qt.inputMethod.cursorRectangle.height)/2 + InputContext.setSelectionOnFocusObject(Qt.point(xx, yy), Qt.point(x2, y2)) + } + onReleased: { + root.handleIsMoving = false + } + } + } +} diff --git a/src/virtualkeyboard/content/components/ShiftKey.qml b/src/virtualkeyboard/content/components/ShiftKey.qml index 6cba9c32..b8424a5b 100644 --- a/src/virtualkeyboard/content/components/ShiftKey.qml +++ b/src/virtualkeyboard/content/components/ShiftKey.qml @@ -1,30 +1,38 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 /*! \qmltype ShiftKey - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits BaseKey diff --git a/src/virtualkeyboard/content/components/SpaceKey.qml b/src/virtualkeyboard/content/components/SpaceKey.qml index 5cae5969..5bfd25a8 100644 --- a/src/virtualkeyboard/content/components/SpaceKey.qml +++ b/src/virtualkeyboard/content/components/SpaceKey.qml @@ -1,29 +1,37 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype SpaceKey - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits Key diff --git a/src/virtualkeyboard/content/components/SymbolModeKey.qml b/src/virtualkeyboard/content/components/SymbolModeKey.qml index b0a1393c..5129c390 100644 --- a/src/virtualkeyboard/content/components/SymbolModeKey.qml +++ b/src/virtualkeyboard/content/components/SymbolModeKey.qml @@ -1,29 +1,37 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype SymbolModeKey - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits Key diff --git a/src/virtualkeyboard/content/components/TraceInputArea.qml b/src/virtualkeyboard/content/components/TraceInputArea.qml index bf969710..4d2b6e00 100644 --- a/src/virtualkeyboard/content/components/TraceInputArea.qml +++ b/src/virtualkeyboard/content/components/TraceInputArea.qml @@ -1,34 +1,42 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Window 2.2 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 /*! \qmltype TraceInputArea - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits MultiPointTouchArea - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 \brief A specialized MultiPointTouchArea for collecting touch input data. diff --git a/src/virtualkeyboard/content/components/TraceInputKey.qml b/src/virtualkeyboard/content/components/TraceInputKey.qml index 0bd781cd..28740758 100644 --- a/src/virtualkeyboard/content/components/TraceInputKey.qml +++ b/src/virtualkeyboard/content/components/TraceInputKey.qml @@ -1,33 +1,41 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 /*! \qmltype TraceInputKey - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \inherits Item - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 \brief A specialized key for collecting touch input data. diff --git a/src/virtualkeyboard/content/components/WordCandidatePopupList.qml b/src/virtualkeyboard/content/components/WordCandidatePopupList.qml index 41f47e35..5057dfa8 100644 --- a/src/virtualkeyboard/content/components/WordCandidatePopupList.qml +++ b/src/virtualkeyboard/content/components/WordCandidatePopupList.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 ListView { id: wordCandidatePopupList diff --git a/src/virtualkeyboard/content/content.qrc b/src/virtualkeyboard/content/content.qrc index 35375564..c203791f 100644 --- a/src/virtualkeyboard/content/content.qrc +++ b/src/virtualkeyboard/content/content.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content"> + <qresource prefix="/QtQuick/VirtualKeyboard/content"> <file>InputPanel.qml</file> <file>HandwritingInputPanel.qml</file> <file>components/AlternativeKeys.qml</file> @@ -27,5 +27,6 @@ <file>components/TraceInputArea.qml</file> <file>components/HandwritingModeKey.qml</file> <file>components/WordCandidatePopupList.qml</file> + <file>components/SelectionControl.qml</file> </qresource> </RCC> diff --git a/src/virtualkeyboard/content/layouts.qrc b/src/virtualkeyboard/content/layouts.qrc index 91d59b30..b8ed28cd 100644 --- a/src/virtualkeyboard/content/layouts.qrc +++ b/src/virtualkeyboard/content/layouts.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content"> + <qresource prefix="/QtQuick/VirtualKeyboard/content"> <file>layouts/ar_AR/digits.qml</file> <file>layouts/ar_AR/main.qml</file> <file>layouts/ar_AR/numbers.qml</file> diff --git a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml b/src/virtualkeyboard/content/layouts/ar_AR/digits.qml index 1451b6c5..e6c663b0 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/digits.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/digits.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/ar_AR/main.qml b/src/virtualkeyboard/content/layouts/ar_AR/main.qml index fc858838..9e53caca 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/main.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml b/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml index c3865ffa..62f019d2 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/numbers.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml b/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml index ad061209..2da52923 100644 --- a/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml +++ b/src/virtualkeyboard/content/layouts/ar_AR/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/da_DK/handwriting.qml b/src/virtualkeyboard/content/layouts/da_DK/handwriting.qml index 1a505e7e..29d34dad 100644 --- a/src/virtualkeyboard/content/layouts/da_DK/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/da_DK/handwriting.qml @@ -21,11 +21,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/da_DK/main.qml b/src/virtualkeyboard/content/layouts/da_DK/main.qml index a18f9ec2..d4284387 100644 --- a/src/virtualkeyboard/content/layouts/da_DK/main.qml +++ b/src/virtualkeyboard/content/layouts/da_DK/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/da_DK/symbols.qml b/src/virtualkeyboard/content/layouts/da_DK/symbols.qml index a2e685aa..06d815d8 100644 --- a/src/virtualkeyboard/content/layouts/da_DK/symbols.qml +++ b/src/virtualkeyboard/content/layouts/da_DK/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/de_DE/handwriting.qml b/src/virtualkeyboard/content/layouts/de_DE/handwriting.qml index 1a505e7e..29d34dad 100644 --- a/src/virtualkeyboard/content/layouts/de_DE/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/de_DE/handwriting.qml @@ -21,11 +21,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/de_DE/main.qml b/src/virtualkeyboard/content/layouts/de_DE/main.qml index 93cda760..578fb808 100644 --- a/src/virtualkeyboard/content/layouts/de_DE/main.qml +++ b/src/virtualkeyboard/content/layouts/de_DE/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/de_DE/symbols.qml b/src/virtualkeyboard/content/layouts/de_DE/symbols.qml index a2e685aa..06d815d8 100644 --- a/src/virtualkeyboard/content/layouts/de_DE/symbols.qml +++ b/src/virtualkeyboard/content/layouts/de_DE/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/en_GB/dialpad.qml b/src/virtualkeyboard/content/layouts/en_GB/dialpad.qml index d19724bb..95a40db9 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/dialpad.qml +++ b/src/virtualkeyboard/content/layouts/en_GB/dialpad.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/en_GB/digits.qml b/src/virtualkeyboard/content/layouts/en_GB/digits.qml index 341adaab..5a59d3f3 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/digits.qml +++ b/src/virtualkeyboard/content/layouts/en_GB/digits.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMethod: PlainInputMethod {} @@ -92,8 +100,10 @@ KeyboardLayout { text: "0" } Key { - key: Qt.Key_Period - text: "." + // The decimal key, if it is not "," then we fallback to + // "." in case it is an unhandled different result + key: Qt.locale().decimalPoint === "," ? Qt.Key_Comma : Qt.Key_Period + text: Qt.locale().decimalPoint === "," ? "," : "." } EnterKey {} } diff --git a/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml b/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml index 769141b9..bc84e4da 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/en_GB/handwriting.qml @@ -1,31 +1,39 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/en_GB/main.qml b/src/virtualkeyboard/content/layouts/en_GB/main.qml index e9f270d8..0c6370ae 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/main.qml +++ b/src/virtualkeyboard/content/layouts/en_GB/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/en_GB/numbers.qml b/src/virtualkeyboard/content/layouts/en_GB/numbers.qml index 15b0d4ff..88491ac5 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/numbers.qml +++ b/src/virtualkeyboard/content/layouts/en_GB/numbers.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/en_GB/symbols.qml b/src/virtualkeyboard/content/layouts/en_GB/symbols.qml index a2e685aa..06d815d8 100644 --- a/src/virtualkeyboard/content/layouts/en_GB/symbols.qml +++ b/src/virtualkeyboard/content/layouts/en_GB/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml b/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml index 0bdab338..16b9ab57 100644 --- a/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/es_ES/handwriting.qml @@ -21,11 +21,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/es_ES/main.qml b/src/virtualkeyboard/content/layouts/es_ES/main.qml index 1826fbdc..528d1f18 100644 --- a/src/virtualkeyboard/content/layouts/es_ES/main.qml +++ b/src/virtualkeyboard/content/layouts/es_ES/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/es_ES/symbols.qml b/src/virtualkeyboard/content/layouts/es_ES/symbols.qml index d194d262..17bd3c36 100644 --- a/src/virtualkeyboard/content/layouts/es_ES/symbols.qml +++ b/src/virtualkeyboard/content/layouts/es_ES/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/fa_FA/digits.qml b/src/virtualkeyboard/content/layouts/fa_FA/digits.qml index 5e9b5edb..d001c2db 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/digits.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/digits.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/fa_FA/main.qml b/src/virtualkeyboard/content/layouts/fa_FA/main.qml index 1bdf383d..3681dd2b 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/main.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml b/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml index 62ff0912..79228726 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/numbers.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMethod: PlainInputMethod {} diff --git a/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml b/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml index 664fc939..8641fdb7 100644 --- a/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml +++ b/src/virtualkeyboard/content/layouts/fa_FA/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml b/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml index 1a505e7e..29d34dad 100644 --- a/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/fi_FI/handwriting.qml @@ -21,11 +21,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/fi_FI/main.qml b/src/virtualkeyboard/content/layouts/fi_FI/main.qml index 1f6fa8a3..b90a43cf 100644 --- a/src/virtualkeyboard/content/layouts/fi_FI/main.qml +++ b/src/virtualkeyboard/content/layouts/fi_FI/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml b/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml index a2e685aa..06d815d8 100644 --- a/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml +++ b/src/virtualkeyboard/content/layouts/fi_FI/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml b/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml index 1a505e7e..29d34dad 100644 --- a/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/fr_FR/handwriting.qml @@ -21,11 +21,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/fr_FR/main.qml b/src/virtualkeyboard/content/layouts/fr_FR/main.qml index 6534fffa..375b589f 100644 --- a/src/virtualkeyboard/content/layouts/fr_FR/main.qml +++ b/src/virtualkeyboard/content/layouts/fr_FR/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml b/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml index a2e685aa..06d815d8 100644 --- a/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml +++ b/src/virtualkeyboard/content/layouts/fr_FR/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/hi_IN/main.qml b/src/virtualkeyboard/content/layouts/hi_IN/main.qml index 9da55ea6..3d71adb0 100644 --- a/src/virtualkeyboard/content/layouts/hi_IN/main.qml +++ b/src/virtualkeyboard/content/layouts/hi_IN/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml b/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml index af67529a..6ae785f9 100644 --- a/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml +++ b/src/virtualkeyboard/content/layouts/hi_IN/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml b/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml index 1a505e7e..29d34dad 100644 --- a/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/it_IT/handwriting.qml @@ -21,11 +21,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/it_IT/main.qml b/src/virtualkeyboard/content/layouts/it_IT/main.qml index 78a0a2e4..c051e08f 100644 --- a/src/virtualkeyboard/content/layouts/it_IT/main.qml +++ b/src/virtualkeyboard/content/layouts/it_IT/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/it_IT/symbols.qml b/src/virtualkeyboard/content/layouts/it_IT/symbols.qml index a2e685aa..06d815d8 100644 --- a/src/virtualkeyboard/content/layouts/it_IT/symbols.qml +++ b/src/virtualkeyboard/content/layouts/it_IT/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/ja_JP/main.qml b/src/virtualkeyboard/content/layouts/ja_JP/main.qml index 9a5aa93e..84baba97 100644 --- a/src/virtualkeyboard/content/layouts/ja_JP/main.qml +++ b/src/virtualkeyboard/content/layouts/ja_JP/main.qml @@ -1,30 +1,38 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; JapaneseInputMethod {}', parent, "japaneseInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; JapaneseInputMethod {}', parent, "japaneseInputMethod") } sharedLayouts: ['symbols'] sourceComponent: InputContext.inputEngine.inputMode === InputEngine.FullwidthLatin ? page2 : page1 diff --git a/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml b/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml index 53347d90..bec30ada 100644 --- a/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml +++ b/src/virtualkeyboard/content/layouts/ja_JP/symbols.qml @@ -1,31 +1,39 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; JapaneseInputMethod {}', parent, "japaneseInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; JapaneseInputMethod {}', parent, "japaneseInputMethod") } sharedLayouts: ['main'] property int page diff --git a/src/virtualkeyboard/content/layouts/ko_KR/main.qml b/src/virtualkeyboard/content/layouts/ko_KR/main.qml index 37e287b4..8c9e6fcb 100644 --- a/src/virtualkeyboard/content/layouts/ko_KR/main.qml +++ b/src/virtualkeyboard/content/layouts/ko_KR/main.qml @@ -1,30 +1,38 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HangulInputMethod {}', parent, "hangulInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HangulInputMethod {}', parent, "hangulInputMethod") } sourceComponent: InputContext.shift ? page2 : page1 sharedLayouts: ['symbols'] diff --git a/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml b/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml index e05648dd..201810ec 100644 --- a/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml +++ b/src/virtualkeyboard/content/layouts/ko_KR/symbols.qml @@ -1,31 +1,39 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HangulInputMethod {}', parent, "hangulInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HangulInputMethod {}', parent, "hangulInputMethod") } sharedLayouts: ['main'] property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml b/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml index 1a505e7e..29d34dad 100644 --- a/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/nb_NO/handwriting.qml @@ -21,11 +21,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/nb_NO/main.qml b/src/virtualkeyboard/content/layouts/nb_NO/main.qml index cd009976..647f88e0 100644 --- a/src/virtualkeyboard/content/layouts/nb_NO/main.qml +++ b/src/virtualkeyboard/content/layouts/nb_NO/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml b/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml index a2e685aa..06d815d8 100644 --- a/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml +++ b/src/virtualkeyboard/content/layouts/nb_NO/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml b/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml index 1a505e7e..29d34dad 100644 --- a/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/pl_PL/handwriting.qml @@ -21,11 +21,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/pl_PL/main.qml b/src/virtualkeyboard/content/layouts/pl_PL/main.qml index a8ebfa4c..72a7b89d 100644 --- a/src/virtualkeyboard/content/layouts/pl_PL/main.qml +++ b/src/virtualkeyboard/content/layouts/pl_PL/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml b/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml index a2e685aa..06d815d8 100644 --- a/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml +++ b/src/virtualkeyboard/content/layouts/pl_PL/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml b/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml index 1a505e7e..29d34dad 100644 --- a/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/pt_PT/handwriting.qml @@ -21,11 +21,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/pt_PT/main.qml b/src/virtualkeyboard/content/layouts/pt_PT/main.qml index 55369bf9..21cbf640 100644 --- a/src/virtualkeyboard/content/layouts/pt_PT/main.qml +++ b/src/virtualkeyboard/content/layouts/pt_PT/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml b/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml index a2e685aa..06d815d8 100644 --- a/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml +++ b/src/virtualkeyboard/content/layouts/pt_PT/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml b/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml index 1a505e7e..29d34dad 100644 --- a/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/ru_RU/handwriting.qml @@ -21,11 +21,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/ru_RU/main.qml b/src/virtualkeyboard/content/layouts/ru_RU/main.qml index 9b487c57..435a4757 100644 --- a/src/virtualkeyboard/content/layouts/ru_RU/main.qml +++ b/src/virtualkeyboard/content/layouts/ru_RU/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml b/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml index a8120bac..43b4d088 100644 --- a/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml +++ b/src/virtualkeyboard/content/layouts/ru_RU/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml b/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml index 1a505e7e..29d34dad 100644 --- a/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml +++ b/src/virtualkeyboard/content/layouts/sv_SE/handwriting.qml @@ -21,11 +21,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; HandwritingInputMethod {}', parent) + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; HandwritingInputMethod {}', parent) } sharedLayouts: ['symbols'] inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/sv_SE/main.qml b/src/virtualkeyboard/content/layouts/sv_SE/main.qml index 1f6fa8a3..b90a43cf 100644 --- a/src/virtualkeyboard/content/layouts/sv_SE/main.qml +++ b/src/virtualkeyboard/content/layouts/sv_SE/main.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { inputMode: InputEngine.Latin diff --git a/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml b/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml index a2e685aa..06d815d8 100644 --- a/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml +++ b/src/virtualkeyboard/content/layouts/sv_SE/symbols.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { property bool secondPage diff --git a/src/virtualkeyboard/content/layouts/zh_CN/main.qml b/src/virtualkeyboard/content/layouts/zh_CN/main.qml index 766c65a2..c8e21c84 100644 --- a/src/virtualkeyboard/content/layouts/zh_CN/main.qml +++ b/src/virtualkeyboard/content/layouts/zh_CN/main.qml @@ -1,31 +1,39 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayout { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; PinyinInputMethod {}', parent, "pinyinInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; PinyinInputMethod {}', parent, "pinyinInputMethod") } sharedLayouts: ['symbols'] keyWeight: 160 diff --git a/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml b/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml index 29ab36f2..0133387b 100644 --- a/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml +++ b/src/virtualkeyboard/content/layouts/zh_CN/symbols.qml @@ -1,31 +1,39 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; PinyinInputMethod {}', parent, "pinyinInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; PinyinInputMethod {}', parent, "pinyinInputMethod") } sharedLayouts: ['main'] property int page diff --git a/src/virtualkeyboard/content/layouts/zh_TW/main.qml b/src/virtualkeyboard/content/layouts/zh_TW/main.qml index 76b989ab..a71a27c5 100644 --- a/src/virtualkeyboard/content/layouts/zh_TW/main.qml +++ b/src/virtualkeyboard/content/layouts/zh_TW/main.qml @@ -1,31 +1,39 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; TCInputMethod {}', parent, "tcInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; TCInputMethod {}', parent, "tcInputMethod") } sharedLayouts: ['symbols'] sourceComponent: InputContext.inputEngine.inputMode === InputEngine.Cangjie ? pageCangjie : pageZhuyin diff --git a/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml b/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml index 987fed9e..60d63e3a 100644 --- a/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml +++ b/src/virtualkeyboard/content/layouts/zh_TW/symbols.qml @@ -1,31 +1,39 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader { function createInputMethod() { - return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Enterprise.VirtualKeyboard 2.0; TCInputMethod {}', parent, "tcInputMethod") + return Qt.createQmlObject('import QtQuick 2.0; import QtQuick.VirtualKeyboard 2.1; TCInputMethod {}', parent, "tcInputMethod") } sharedLayouts: ['main'] property int page diff --git a/src/virtualkeyboard/content/layouts_hangul.qrc b/src/virtualkeyboard/content/layouts_hangul.qrc index a222c1b8..610348ab 100644 --- a/src/virtualkeyboard/content/layouts_hangul.qrc +++ b/src/virtualkeyboard/content/layouts_hangul.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content"> + <qresource prefix="/QtQuick/VirtualKeyboard/content"> <file>layouts/ko_KR/main.qml</file> <file>layouts/ko_KR/symbols.qml</file> <file>layouts/en_GB/dialpad.qml</file> diff --git a/src/virtualkeyboard/content/layouts_japanese.qrc b/src/virtualkeyboard/content/layouts_japanese.qrc index 3b70168c..2d837f4e 100644 --- a/src/virtualkeyboard/content/layouts_japanese.qrc +++ b/src/virtualkeyboard/content/layouts_japanese.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content"> + <qresource prefix="/QtQuick/VirtualKeyboard/content"> <file>layouts/ja_JP/main.qml</file> <file>layouts/ja_JP/symbols.qml</file> <file>layouts/en_GB/dialpad.qml</file> diff --git a/src/virtualkeyboard/content/layouts_pinyin.qrc b/src/virtualkeyboard/content/layouts_pinyin.qrc index 0b8bf8c0..fe451d0c 100644 --- a/src/virtualkeyboard/content/layouts_pinyin.qrc +++ b/src/virtualkeyboard/content/layouts_pinyin.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content"> + <qresource prefix="/QtQuick/VirtualKeyboard/content"> <file>layouts/zh_CN/main.qml</file> <file>layouts/zh_CN/symbols.qml</file> <file>layouts/en_GB/dialpad.qml</file> diff --git a/src/virtualkeyboard/content/layouts_traditional_chinese.qrc b/src/virtualkeyboard/content/layouts_traditional_chinese.qrc index 98100014..6fd7a208 100644 --- a/src/virtualkeyboard/content/layouts_traditional_chinese.qrc +++ b/src/virtualkeyboard/content/layouts_traditional_chinese.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content"> + <qresource prefix="/QtQuick/VirtualKeyboard/content"> <file>layouts/zh_TW/main.qml</file> <file>layouts/zh_TW/symbols.qml</file> <file>layouts/en_GB/dialpad.qml</file> diff --git a/src/virtualkeyboard/content/styles/default/default_style.qrc b/src/virtualkeyboard/content/styles/default/default_style.qrc index ef2f2bfa..277e8cde 100644 --- a/src/virtualkeyboard/content/styles/default/default_style.qrc +++ b/src/virtualkeyboard/content/styles/default/default_style.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content/styles/default"> + <qresource prefix="/QtQuick/VirtualKeyboard/content/styles/default"> <file>style.qml</file> <file>images/backspace-868482.svg</file> <file>images/check-868482.svg</file> @@ -12,5 +12,6 @@ <file>images/shift-868482.svg</file> <file>images/shift-c5d6b6.svg</file> <file>images/textmode-868482.svg</file> + <file>images/selectionhandle-bottom.svg</file> </qresource> </RCC> diff --git a/src/virtualkeyboard/content/styles/default/images/selectionhandle-bottom.svg b/src/virtualkeyboard/content/styles/default/images/selectionhandle-bottom.svg new file mode 100644 index 00000000..312e3ab5 --- /dev/null +++ b/src/virtualkeyboard/content/styles/default/images/selectionhandle-bottom.svg @@ -0,0 +1,201 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="405.39487" + height="603.25201" + id="svg2" + version="1.1" + inkscape:version="0.48.4 r9939" + sodipodi:docname="selectionhandle-bottom.svg"> + <defs + id="defs4"> + <linearGradient + inkscape:collect="always" + id="linearGradient3964"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop3966" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop3968" /> + </linearGradient> + <linearGradient + id="linearGradient3825" + osb:paint="solid"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop3827" /> + </linearGradient> + <linearGradient + id="linearGradient3797"> + <stop + style="stop-color:#a7a7a7;stop-opacity:1;" + offset="0" + id="stop3799" /> + <stop + style="stop-color:#959595;stop-opacity:1;" + offset="1" + id="stop3801" /> + </linearGradient> + <filter + id="filter3991" + inkscape:label="Drop Shadow" + color-interpolation-filters="sRGB"> + <feFlood + id="feFlood3993" + flood-opacity="0.9" + flood-color="rgb(0,0,0)" + result="flood" /> + <feComposite + id="feComposite3995" + in2="SourceGraphic" + in="flood" + operator="in" + result="composite1" /> + <feGaussianBlur + id="feGaussianBlur3997" + stdDeviation="9" + result="blur" /> + <feOffset + id="feOffset3999" + dx="-4" + dy="-4" + result="offset" /> + <feComposite + id="feComposite4001" + in2="offset" + in="SourceGraphic" + operator="over" + result="fbSourceGraphic" /> + <feColorMatrix + result="fbSourceGraphicAlpha" + in="fbSourceGraphic" + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix4003" /> + <feFlood + id="feFlood4005" + flood-opacity="0.9" + flood-color="rgb(0,0,0)" + result="flood" + in="fbSourceGraphic" /> + <feComposite + id="feComposite4007" + in2="fbSourceGraphic" + in="flood" + operator="in" + result="composite1" /> + <feGaussianBlur + id="feGaussianBlur4009" + stdDeviation="9" + result="blur" /> + <feOffset + id="feOffset4011" + dx="-4" + dy="-4" + result="offset" /> + <feComposite + id="feComposite4013" + in2="offset" + in="fbSourceGraphic" + operator="over" + result="composite2" /> + </filter> + <filter + inkscape:collect="always" + id="filter3941" + x="-0.31598809" + width="1.6319762" + y="-0.21141379" + height="1.4228276" + color-interpolation-filters="sRGB"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="52.664682" + id="feGaussianBlur3943" /> + </filter> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3964" + id="linearGradient3970" + x1="77.14286" + y1="559.86218" + x2="477.14285" + y2="559.86218" + gradientUnits="userSpaceOnUse" /> + <filter + inkscape:collect="always" + id="filter4040" + color-interpolation-filters="sRGB"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="0.49892857" + id="feGaussianBlur4042" /> + </filter> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.83834513" + inkscape:cx="219.23008" + inkscape:cy="314.00438" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1176" + inkscape:window-height="719" + inkscape:window-x="188" + inkscape:window-y="121" + inkscape:window-maximized="0" + fit-margin-top="1" + fit-margin-left="1" + fit-margin-right="1" + fit-margin-bottom="1" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Lag" + style="display:inline" + transform="translate(-125.874,-261.09332)" /> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-125.874,-261.09332)"> + <path + style="fill:#bfbfbf;fill-opacity:1;stroke:url(#linearGradient3970);filter:url(#filter4040)" + d="m 477.14286,660.93361 0,-400 -400.000003,0 0,400 200.714283,197.85714 z" + id="path2987" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" + transform="matrix(-1,0,0,-1,605.71429,1122.5815)" /> + </g> +</svg> diff --git a/src/virtualkeyboard/content/styles/default/style.qml b/src/virtualkeyboard/content/styles/default/style.qml index 28b897f7..fa9c6992 100644 --- a/src/virtualkeyboard/content/styles/default/style.qml +++ b/src/virtualkeyboard/content/styles/default/style.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 -import QtQuick.Enterprise.VirtualKeyboard.Styles 2.0 +import QtQuick.VirtualKeyboard 2.1 +import QtQuick.VirtualKeyboard.Styles 2.1 KeyboardStyle { id: currentStyle @@ -30,7 +38,7 @@ KeyboardStyle { readonly property real keyBackgroundMargin: Math.round(13 * scaleHint) readonly property real keyContentMargin: Math.round(45 * scaleHint) readonly property real keyIconScale: scaleHint * 0.6 - readonly property string resourcePrefix: "qrc:/QtQuick/Enterprise/VirtualKeyboard/content/styles/default/" + readonly property string resourcePrefix: "qrc:/QtQuick/VirtualKeyboard/content/styles/default/" readonly property string inputLocale: InputContext.locale property color inputLocaleIndicatorColor: "white" @@ -873,4 +881,9 @@ KeyboardStyle { popupListRemove: Transition { NumberAnimation { property: "opacity"; to: 0; duration: 200 } } + + selectionHandle: Image { + sourceSize.width: 20 + source: resourcePrefix + "images/selectionhandle-bottom.svg" + } } diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_black.png b/src/virtualkeyboard/content/styles/retro/images/key154px_black.png Binary files differindex d9bf8e72..d9bf8e72 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key154px_black.png +++ b/src/virtualkeyboard/content/styles/retro/images/key154px_black.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_black_long.png b/src/virtualkeyboard/content/styles/retro/images/key154px_black_long.png Binary files differindex 492c718a..492c718a 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key154px_black_long.png +++ b/src/virtualkeyboard/content/styles/retro/images/key154px_black_long.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_capslock.png b/src/virtualkeyboard/content/styles/retro/images/key154px_capslock.png Binary files differindex 7cb0bd4a..7cb0bd4a 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key154px_capslock.png +++ b/src/virtualkeyboard/content/styles/retro/images/key154px_capslock.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_capslock_long.png b/src/virtualkeyboard/content/styles/retro/images/key154px_capslock_long.png Binary files differindex 429d4bb5..429d4bb5 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key154px_capslock_long.png +++ b/src/virtualkeyboard/content/styles/retro/images/key154px_capslock_long.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_colorA.png b/src/virtualkeyboard/content/styles/retro/images/key154px_colorA.png Binary files differindex 778384cd..778384cd 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key154px_colorA.png +++ b/src/virtualkeyboard/content/styles/retro/images/key154px_colorA.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_colorA_long.png b/src/virtualkeyboard/content/styles/retro/images/key154px_colorA_long.png Binary files differindex e1b6e5b8..e1b6e5b8 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key154px_colorA_long.png +++ b/src/virtualkeyboard/content/styles/retro/images/key154px_colorA_long.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_colorB.png b/src/virtualkeyboard/content/styles/retro/images/key154px_colorB.png Binary files differindex cef9fd29..cef9fd29 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key154px_colorB.png +++ b/src/virtualkeyboard/content/styles/retro/images/key154px_colorB.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_shiftcase.png b/src/virtualkeyboard/content/styles/retro/images/key154px_shiftcase.png Binary files differindex 58bf8282..58bf8282 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key154px_shiftcase.png +++ b/src/virtualkeyboard/content/styles/retro/images/key154px_shiftcase.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key154px_shiftcase_long.png b/src/virtualkeyboard/content/styles/retro/images/key154px_shiftcase_long.png Binary files differindex bfcba5fd..bfcba5fd 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key154px_shiftcase_long.png +++ b/src/virtualkeyboard/content/styles/retro/images/key154px_shiftcase_long.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key156px_black_long.png b/src/virtualkeyboard/content/styles/retro/images/key156px_black_long.png Binary files differindex a22109bd..a22109bd 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key156px_black_long.png +++ b/src/virtualkeyboard/content/styles/retro/images/key156px_black_long.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key156px_black_medium_long.png b/src/virtualkeyboard/content/styles/retro/images/key156px_black_medium_long.png Binary files differindex 8c92d3b1..8c92d3b1 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key156px_black_medium_long.png +++ b/src/virtualkeyboard/content/styles/retro/images/key156px_black_medium_long.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key156px_colorA.png b/src/virtualkeyboard/content/styles/retro/images/key156px_colorA.png Binary files differindex 6da57d60..6da57d60 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key156px_colorA.png +++ b/src/virtualkeyboard/content/styles/retro/images/key156px_colorA.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key156px_colorB.png b/src/virtualkeyboard/content/styles/retro/images/key156px_colorB.png Binary files differindex af0912e3..af0912e3 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key156px_colorB.png +++ b/src/virtualkeyboard/content/styles/retro/images/key156px_colorB.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key160px_black.png b/src/virtualkeyboard/content/styles/retro/images/key160px_black.png Binary files differindex 565c4bf7..565c4bf7 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key160px_black.png +++ b/src/virtualkeyboard/content/styles/retro/images/key160px_black.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key160px_colorA.png b/src/virtualkeyboard/content/styles/retro/images/key160px_colorA.png Binary files differindex e2125cf8..e2125cf8 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key160px_colorA.png +++ b/src/virtualkeyboard/content/styles/retro/images/key160px_colorA.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key160px_colorB.png b/src/virtualkeyboard/content/styles/retro/images/key160px_colorB.png Binary files differindex 9b543b05..9b543b05 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key160px_colorB.png +++ b/src/virtualkeyboard/content/styles/retro/images/key160px_colorB.png diff --git a/src/virtualkeyboard/content/styles/retro/images/key_preview.png b/src/virtualkeyboard/content/styles/retro/images/key_preview.png Binary files differindex 3e9e9557..3e9e9557 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/key_preview.png +++ b/src/virtualkeyboard/content/styles/retro/images/key_preview.png diff --git a/src/virtualkeyboard/content/styles/retro/images/selectionhandle-bottom.svg b/src/virtualkeyboard/content/styles/retro/images/selectionhandle-bottom.svg new file mode 100644 index 00000000..1a45a736 --- /dev/null +++ b/src/virtualkeyboard/content/styles/retro/images/selectionhandle-bottom.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="54px" height="94px" viewBox="0 0 54 94" enable-background="new 0 0 54 94" xml:space="preserve"> +<rect x="24" y="0" opacity="0.85" fill="#37260B" width="6" height="55"/> +<path opacity="0.85" fill="#37260B" d="M54,67c0,14.912-12.088,27-27,27S0,81.912,0,67c0-19.758,27-30,27-30S54,47.25,54,67z"/> +<rect x="24" y="0" fill="#B57C47" width="6" height="55"/> +<path fill="#B57C47" d="M54,63c0,14.912-12.088,27-27,27S0,77.912,0,63c0-19.758,27-30,27-30S54,43.25,54,63z"/> +</svg> diff --git a/src/virtualkeyboard/content/styles/retro/images/triangle_black.png b/src/virtualkeyboard/content/styles/retro/images/triangle_black.png Binary files differindex a45e733b..a45e733b 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/triangle_black.png +++ b/src/virtualkeyboard/content/styles/retro/images/triangle_black.png diff --git a/src/virtualkeyboard/content/styles/retro/images/triangle_highlight.png b/src/virtualkeyboard/content/styles/retro/images/triangle_highlight.png Binary files differindex 34853263..34853263 100755..100644 --- a/src/virtualkeyboard/content/styles/retro/images/triangle_highlight.png +++ b/src/virtualkeyboard/content/styles/retro/images/triangle_highlight.png diff --git a/src/virtualkeyboard/content/styles/retro/retro_style.qrc b/src/virtualkeyboard/content/styles/retro/retro_style.qrc index 2a8f0aa8..881755ef 100644 --- a/src/virtualkeyboard/content/styles/retro/retro_style.qrc +++ b/src/virtualkeyboard/content/styles/retro/retro_style.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/content/styles/retro"> + <qresource prefix="/QtQuick/VirtualKeyboard/content/styles/retro"> <file>style.qml</file> <file>images/key154px_black.png</file> <file>images/key154px_black_long.png</file> @@ -32,5 +32,6 @@ <file>images/shift-cd8865.svg</file> <file>images/shift-dc4f28.svg</file> <file>images/textmode-110b05.svg</file> + <file>images/selectionhandle-bottom.svg</file> </qresource> </RCC> diff --git a/src/virtualkeyboard/content/styles/retro/style.qml b/src/virtualkeyboard/content/styles/retro/style.qml index 497df0e3..04e7ea81 100644 --- a/src/virtualkeyboard/content/styles/retro/style.qml +++ b/src/virtualkeyboard/content/styles/retro/style.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 -import QtQuick.Enterprise.VirtualKeyboard.Styles 2.0 +import QtQuick.VirtualKeyboard 2.1 +import QtQuick.VirtualKeyboard.Styles 2.1 KeyboardStyle { id: currentStyle @@ -30,7 +38,7 @@ KeyboardStyle { readonly property real keyBackgroundMargin: Math.round(9 * scaleHint) readonly property real keyContentMargin: Math.round(30 * scaleHint) readonly property real keyIconScale: scaleHint * 0.6 - readonly property string resourcePath: "QtQuick/Enterprise/VirtualKeyboard/content/styles/retro/" + readonly property string resourcePath: "QtQuick/VirtualKeyboard/content/styles/retro/" readonly property string resourcePrefix: "qrc:/" + resourcePath readonly property string inputLocale: InputContext.locale @@ -981,4 +989,9 @@ KeyboardStyle { popupListRemove: Transition { NumberAnimation { property: "opacity"; to: 0; duration: 200 } } + + selectionHandle: Image { + sourceSize.width: 20 + source: resourcePrefix + "images/selectionhandle-bottom.svg" + } } diff --git a/src/virtualkeyboard/defaultinputmethod.cpp b/src/virtualkeyboard/defaultinputmethod.cpp index 28af0463..cf511e9a 100644 --- a/src/virtualkeyboard/defaultinputmethod.cpp +++ b/src/virtualkeyboard/defaultinputmethod.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "defaultinputmethod.h" #include "inputcontext.h" diff --git a/src/virtualkeyboard/defaultinputmethod.h b/src/virtualkeyboard/defaultinputmethod.h index 24926ac3..5a26bd4e 100644 --- a/src/virtualkeyboard/defaultinputmethod.h +++ b/src/virtualkeyboard/defaultinputmethod.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef DEFAULTINPUTMETHOD_H #define DEFAULTINPUTMETHOD_H diff --git a/src/virtualkeyboard/desktopinputpanel.cpp b/src/virtualkeyboard/desktopinputpanel.cpp index cb901957..aad97e66 100644 --- a/src/virtualkeyboard/desktopinputpanel.cpp +++ b/src/virtualkeyboard/desktopinputpanel.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "desktopinputpanel.h" #include "inputview.h" @@ -143,7 +151,7 @@ void DesktopInputPanel::createView() break; } d->view->setColor(QColor(Qt::transparent)); - d->view->setSource(QUrl("qrc:///QtQuick/Enterprise/VirtualKeyboard/content/InputPanel.qml")); + d->view->setSource(QUrl("qrc:///QtQuick/VirtualKeyboard/content/InputPanel.qml")); connect(qGuiApp, SIGNAL(aboutToQuit()), SLOT(destroyView())); } } diff --git a/src/virtualkeyboard/desktopinputpanel.h b/src/virtualkeyboard/desktopinputpanel.h index a8842517..0828bb64 100644 --- a/src/virtualkeyboard/desktopinputpanel.h +++ b/src/virtualkeyboard/desktopinputpanel.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef DESKTOPINPUTPANEL_H #define DESKTOPINPUTPANEL_H diff --git a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf index 10f9389b..54b66a00 100644 --- a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf +++ b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf @@ -1,45 +1,40 @@ -include($QT_INSTALL_DOCS/global/macros.qdocconf) -include($QT_INSTALL_DOCS/global/compat.qdocconf) -include($QT_INSTALL_DOCS/global/fileextensions.qdocconf) -include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) -include($QT_INSTALL_DOCS/global/qt-cpp-defines.qdocconf) +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtVirtualKeyboard description = Qt Virtual Keyboard -url = http://doc.qt.io/QtVirtualKeyboard/ - -version = 2.0 +version = $QT_VERSION headerdirs += .. sourcedirs += .. excludedirs += ../content/layouts \ ../3rdparty +# Specify the install path under QT_INSTALL_EXAMPLES exampledirs += ../../../examples/virtualkeyboard \ snippets examplesinstallpath = virtualkeyboard imagedirs += images -depends += qtcore qtgui qtquick +depends += qtdoc qtcore qtgui qtquick qhp.projects = QtVirtualKeyboard qhp.QtVirtualKeyboard.file = qtvirtualkeyboard.qhp -qhp.QtVirtualKeyboard.namespace = com.digia.qtvirtualkeyboard.200 +qhp.QtVirtualKeyboard.namespace = org.qt-project.qtvirtualkeyboard.$QT_VERSION_TAG qhp.QtVirtualKeyboard.virtualFolder = qtvirtualkeyboard qhp.QtVirtualKeyboard.indexTitle = Qt Virtual Keyboard qhp.QtVirtualKeyboard.indexRoot = -qhp.QtVirtualKeyboard.filterAttributes = qtvirtualkeyboard 2.0 qtrefdoc -qhp.QtVirtualKeyboard.customFilters.Qt.name = QtVirtualKeyboard 2.0 -qhp.QtVirtualKeyboard.customFilters.Qt.filterAttributes = qtvirtualkeyboard 2.0 +qhp.QtVirtualKeyboard.filterAttributes = qtvirtualkeyboard $QT_VERSION qtrefdoc +qhp.QtVirtualKeyboard.customFilters.Qt.name = QtVirtualKeyboard $QT_VERSION +qhp.QtVirtualKeyboard.customFilters.Qt.filterAttributes = qtvirtualkeyboard $QT_VERSION -qhp.QtVirtualKeyboard.subprojects = classes qmltypes examples +qhp.QtVirtualKeyboard.subprojects = qmltypes examples # classes -qhp.QtVirtualKeyboard.subprojects.classes.title = C++ Classes -qhp.QtVirtualKeyboard.subprojects.classes.indexTitle = Qt Virtual Keyboard C++ Classes -qhp.QtVirtualKeyboard.subprojects.classes.selectors = class -qhp.QtVirtualKeyboard.subprojects.classes.sortPages = true +# qhp.QtVirtualKeyboard.subprojects.classes.title = C++ Classes +# qhp.QtVirtualKeyboard.subprojects.classes.indexTitle = Qt Virtual Keyboard C++ Classes +# qhp.QtVirtualKeyboard.subprojects.classes.selectors = class +# qhp.QtVirtualKeyboard.subprojects.classes.sortPages = true qhp.QtVirtualKeyboard.subprojects.qmltypes.title = QML Types qhp.QtVirtualKeyboard.subprojects.qmltypes.indexTitle = Qt Virtual Keyboard QML Types @@ -53,4 +48,4 @@ qhp.QtVirtualKeyboard.subprojects.examples.sortPages = true navigation.landingpage = "Qt Virtual Keyboard" navigation.qmltypespage = "Qt Virtual Keyboard QML Types" -navigation.cppclassespage = "Qt Virtual Keyboard C++ Classes" +# navigation.cppclassespage = "Qt Virtual Keyboard C++ Classes" diff --git a/src/virtualkeyboard/doc/snippets/CustomInputMethod.qml b/src/virtualkeyboard/doc/snippets/CustomInputMethod.qml index 1e34ba8f..4f5b1f08 100644 --- a/src/virtualkeyboard/doc/snippets/CustomInputMethod.qml +++ b/src/virtualkeyboard/doc/snippets/CustomInputMethod.qml @@ -1,26 +1,34 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 -import Qt.Quick.Enterprise.VirtualKeyboard 1.0 +import QtQuick.VirtualKeyboard 1.0 // file: CustomInputMethod.qml diff --git a/src/virtualkeyboard/doc/src/build.qdoc b/src/virtualkeyboard/doc/src/build.qdoc index e00f9593..21b0eb2b 100644 --- a/src/virtualkeyboard/doc/src/build.qdoc +++ b/src/virtualkeyboard/doc/src/build.qdoc @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ /*! -\page build.html +\page qtvirtualkeyboard-build.html \contentspage {Building Qt Virtual Keyboard} {Contents} \title Building Qt Virtual Keyboard @@ -33,7 +41,7 @@ This document describes how to build the Qt Virtual Keyboard plugin. The project is split into the following subprojects: \table \row - \li \e examples/quick/enterprise/virtualkeyboard/virtualkeyboard/virtualkeyboard.pro + \li \e examples/virtualkeyboard/basic/basic.pro \li Qt Virtual Keyboard Demo application \row \li \e src/virtualkeyboard/virtualkeyboard.pro diff --git a/src/virtualkeyboard/doc/src/deployment-guide.qdoc b/src/virtualkeyboard/doc/src/deployment-guide.qdoc index 6d4993ec..843d2f38 100644 --- a/src/virtualkeyboard/doc/src/deployment-guide.qdoc +++ b/src/virtualkeyboard/doc/src/deployment-guide.qdoc @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ /*! -\page deployment-guide.html +\page qtvirtualkeyboard-deployment-guide.html \contentspage {Deployment Guide} {Contents} \title Deployment Guide @@ -50,12 +58,12 @@ in Qt Creator that executes the \c {make install} command. \li \c /system/plugins/platforminputcontexts \row \li qtvirtualkeyboardplugin QML files - \li \c $$[QT_INSTALL_QML]/QtQuick/Enterprise/VirtualKeyboard - \li \c /system/qml/QtQuick/Enterprise/VirtualKeyboard + \li \c $$[QT_INSTALL_QML]/QtQuick/VirtualKeyboard + \li \c /system/qml/QtQuick/VirtualKeyboard \row \li qtvirtualkeyboardstylesplugin - \li \c $$[QT_INSTALL_QML]/QtQuick/Enterprise/VirtualKeyboard/Styles - \li \c /system/qml/QtQuick/Enterprise/VirtualKeyboard/Styles + \li \c $$[QT_INSTALL_QML]/QtQuick/VirtualKeyboard/Styles + \li \c /system/qml/QtQuick/VirtualKeyboard/Styles \endtable \section1 Integration Method @@ -109,7 +117,7 @@ divide the screen area with the application container. \code import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 Item { id: root diff --git a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-examples.qdoc b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-examples.qdoc index a7223a07..61b11d26 100644 --- a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-examples.qdoc +++ b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-examples.qdoc @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ /*! \group qtvirtualkeyboard-examples diff --git a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc index dc9e8b71..92ff3541 100644 --- a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc +++ b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ /*! \title Qt Virtual Keyboard - \page index.html + \page qtvirtualkeyboard-index.html The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend for Qt 5 on Linux Desktop/X11, Windows Desktop, and @@ -90,21 +98,11 @@ \li \l {User Guide} \endlist - \section1 C++ Classes - - \generatelist {classesbymodule qtvirtualkeyboard} - - \section1 QML Types - - \annotatedlist qtvirtualkeyboard-qml - - Styling components: - - \annotatedlist qtvirtualkeyboard-styles-qml - - Settings components: + \section1 API Reference - \annotatedlist qtvirtualkeyboard-settings-qml + \list + \li \l{Qt Virtual Keyboard QML Types}{QML Types} + \endlist \section1 Examples @@ -114,25 +112,29 @@ */ /*! -\page qt-virtual-keyboard-classes.html -\title Qt Virtual Keyboard C++ Classes -\inmodule qtvirtualkeyboard +\qmlmodule QtQuick.VirtualKeyboard 2.0 +\title Qt Virtual Keyboard QML Types +\ingroup qmlmodules +\brief Provides QML types for an input framework and a reference keyboard front +end. -\generatelist {classesbymodule qtvirtualkeyboard} -*/ + The QML types can be imported into your application using the following + import statements in your .qml file: -/*! -\page qt-virtual-keyboard-qmltypes.html -\title Qt Virtual Keyboard QML Types -\inmodule qtvirtualkeyboard + \badcode + import QtQuick.VirtualKeyboard 2.0 + import QtQuick.VirtualKeyboard.Styles 2.0 + import QtQuick.VirtualKeyboard.Settings 2.0 + \endcode + +Styling: -\annotatedlist qtvirtualkeyboard-qml +\generatelist qmltypesbymodule QtQuick.VirtualKeyboard.Styles -Styling components: +Settings: -\annotatedlist qtvirtualkeyboard-styles-qml +\generatelist qmltypesbymodule QtQuick.VirtualKeyboard.Settings -Settings components: +Input framework and keys: -\annotatedlist qtvirtualkeyboard-settings-qml */ diff --git a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-module-cpp.qdoc b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-module-cpp.qdoc new file mode 100644 index 00000000..a0514fe9 --- /dev/null +++ b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-module-cpp.qdoc @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \module QtVirtualKeyboard + \title Qt Virtual Keyboard C++ Classes + \brief Provides classes to implement input methods for virtual keyboards. + + \internal + + \qtvariable virtualkeyboard + + To include the definitions of the module's classes, use the following directive: + + \code + #include <QVirtualKeyboard> + \endcode + + To link against the module, add this line to your qmake .pro file: + + \badcode + QT += virtualkeyboard + \endcode +*/ diff --git a/src/virtualkeyboard/doc/src/technical-guide.qdoc b/src/virtualkeyboard/doc/src/technical-guide.qdoc index 4a570638..4832bdc1 100644 --- a/src/virtualkeyboard/doc/src/technical-guide.qdoc +++ b/src/virtualkeyboard/doc/src/technical-guide.qdoc @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ /*! @@ -404,7 +412,7 @@ For example, to add a regular key which sends a key event to the input method: \code import QtQuick 2.0 import QtQuick.Layouts 1.0 - import QtQuick.Enterprise.VirtualKeyboard 2.0 + import QtQuick.VirtualKeyboard 2.1 // file: layouts/en_GB/main.qml @@ -437,7 +445,7 @@ example, we add another key which specifies a custom key weight: \code import QtQuick 2.0 import QtQuick.Layouts 1.0 - import QtQuick.Enterprise.VirtualKeyboard 2.0 + import QtQuick.VirtualKeyboard 2.1 // file: layouts/en_GB/main.qml @@ -495,7 +503,7 @@ For example: \code import QtQuick 2.0 import QtQuick.Layouts 1.0 - import QtQuick.Enterprise.VirtualKeyboard 2.0 + import QtQuick.VirtualKeyboard 2.1 // file: layouts/en_GB/symbols.qml @@ -562,7 +570,7 @@ the built-in style, e.g. "retro", or any of the custom styles installed into the Styles directory: \code -$$[QT_INSTALL_QML]/QtQuick/Enterprise/VirtualKeyboard/Styles +$$[QT_INSTALL_QML]/QtQuick/VirtualKeyboard/Styles \endcode In case the environment variable is not set, or contains an invalid diff --git a/src/virtualkeyboard/doc/src/user-guide.qdoc b/src/virtualkeyboard/doc/src/user-guide.qdoc index ee76caf5..c2d9d9f0 100644 --- a/src/virtualkeyboard/doc/src/user-guide.qdoc +++ b/src/virtualkeyboard/doc/src/user-guide.qdoc @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ /*! diff --git a/src/virtualkeyboard/enterkeyaction.cpp b/src/virtualkeyboard/enterkeyaction.cpp index bfc0b5cb..13b6246b 100644 --- a/src/virtualkeyboard/enterkeyaction.cpp +++ b/src/virtualkeyboard/enterkeyaction.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "enterkeyaction.h" #include "enterkeyactionattachedtype.h" @@ -26,7 +34,7 @@ namespace QtVirtualKeyboard { /*! \qmltype EnterKeyAction - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \brief Provides attached properties for customizing the enter key. diff --git a/src/virtualkeyboard/enterkeyaction.h b/src/virtualkeyboard/enterkeyaction.h index 68f0ab6d..5fa9d6d0 100644 --- a/src/virtualkeyboard/enterkeyaction.h +++ b/src/virtualkeyboard/enterkeyaction.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef ENTERKEYACTION_H #define ENTERKEYACTION_H diff --git a/src/virtualkeyboard/enterkeyactionattachedtype.cpp b/src/virtualkeyboard/enterkeyactionattachedtype.cpp index 2528f068..ce946f95 100644 --- a/src/virtualkeyboard/enterkeyactionattachedtype.cpp +++ b/src/virtualkeyboard/enterkeyactionattachedtype.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "enterkeyactionattachedtype.h" diff --git a/src/virtualkeyboard/enterkeyactionattachedtype.h b/src/virtualkeyboard/enterkeyactionattachedtype.h index 5c2f5629..95fd8900 100644 --- a/src/virtualkeyboard/enterkeyactionattachedtype.h +++ b/src/virtualkeyboard/enterkeyactionattachedtype.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef ENTERKEYACTIONATTACHEDTYPE_H #define ENTERKEYACTIONATTACHEDTYPE_H diff --git a/src/virtualkeyboard/hangul.cpp b/src/virtualkeyboard/hangul.cpp index 9b738f50..4410b06f 100644 --- a/src/virtualkeyboard/hangul.cpp +++ b/src/virtualkeyboard/hangul.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "hangul.h" @@ -146,11 +154,12 @@ QString Hangul::compose(const QString &source) // Search the double medial map if such a combination exists ushort key = packDoubleMedial(VIndexA, VIndexB); - if (doubleMedialMap.contains(key)) { + const auto it = doubleMedialMap.constFind(key); + if (it != doubleMedialMap.cend()) { // Update syllable by adding the difference between // the vowels indices - HangulMedialIndex VIndexD = doubleMedialMap[key]; + HangulMedialIndex VIndexD = it.value(); int VDiff = (int)VIndexD - (int)VIndexA; last = QChar((int)lastUnicode + VDiff * TCount); result.replace(result.length() - 1, 1, last); @@ -220,11 +229,12 @@ QString Hangul::compose(const QString &source) // Search the double final map if such a combination exists ushort key = packDoubleFinal(TIndexA, TIndexB); - if (doubleFinalMap.contains(key)) { + const auto it = doubleFinalMap.constFind(key); + if (it != doubleFinalMap.cend()) { // Update syllable by adding the difference between // the consonant indices - HangulFinalIndex TIndexD = doubleFinalMap[key]; + HangulFinalIndex TIndexD = it.value(); int TDiff = (int)TIndexD - (int)TIndexA; last = QChar((int)lastUnicode + TDiff); result.replace(result.length() - 1, 1, last); @@ -278,22 +288,12 @@ bool Hangul::isFinal(HangulFinalIndex consonant) ushort Hangul::findDoubleMedial(HangulMedialIndex vowel) { - for (QMap<ushort, HangulMedialIndex>::ConstIterator i = doubleMedialMap.constBegin(); - i != doubleMedialMap.constEnd(); i++) { - if (i.value() == vowel) - return i.key(); - } - return 0; + return doubleMedialMap.key(vowel, 0); } ushort Hangul::findDoubleFinal(HangulFinalIndex consonant) { - for (QMap<ushort, HangulFinalIndex>::ConstIterator i = doubleFinalMap.constBegin(); - i != doubleFinalMap.constEnd(); i++) { - if (i.value() == consonant) - return i.key(); - } - return 0; + return doubleFinalMap.key(consonant, 0); } // Packs two Hangul Jamo indices into 16-bit integer. diff --git a/src/virtualkeyboard/hangul.h b/src/virtualkeyboard/hangul.h index eae946bc..e30a659a 100644 --- a/src/virtualkeyboard/hangul.h +++ b/src/virtualkeyboard/hangul.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef HANGUL_H #define HANGUL_H diff --git a/src/virtualkeyboard/hangulinputmethod.cpp b/src/virtualkeyboard/hangulinputmethod.cpp index 823d8101..3baf8305 100644 --- a/src/virtualkeyboard/hangulinputmethod.cpp +++ b/src/virtualkeyboard/hangulinputmethod.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "hangulinputmethod.h" #include "inputcontext.h" diff --git a/src/virtualkeyboard/hangulinputmethod.h b/src/virtualkeyboard/hangulinputmethod.h index 5e0863df..2a59528f 100644 --- a/src/virtualkeyboard/hangulinputmethod.h +++ b/src/virtualkeyboard/hangulinputmethod.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef HANGULINPUTMETHOD_H #define HANGULINPUTMETHOD_H diff --git a/src/virtualkeyboard/hunspellinputmethod.cpp b/src/virtualkeyboard/hunspellinputmethod.cpp index db090e09..5e8be4d3 100644 --- a/src/virtualkeyboard/hunspellinputmethod.cpp +++ b/src/virtualkeyboard/hunspellinputmethod.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "hunspellinputmethod_p.h" #include "inputcontext.h" diff --git a/src/virtualkeyboard/hunspellinputmethod.h b/src/virtualkeyboard/hunspellinputmethod.h index 1dea56a0..1aa12dce 100644 --- a/src/virtualkeyboard/hunspellinputmethod.h +++ b/src/virtualkeyboard/hunspellinputmethod.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef HUNSPELLINPUTMETHOD_H #define HUNSPELLINPUTMETHOD_H diff --git a/src/virtualkeyboard/hunspellinputmethod_p.cpp b/src/virtualkeyboard/hunspellinputmethod_p.cpp index a3f36df6..34f343d3 100644 --- a/src/virtualkeyboard/hunspellinputmethod_p.cpp +++ b/src/virtualkeyboard/hunspellinputmethod_p.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "hunspellinputmethod_p.h" #include "inputcontext.h" @@ -77,7 +85,7 @@ bool HunspellInputMethodPrivate::createHunspell(const QString &locale) << QStringLiteral("/usr/share/myspell/dicts") #endif ; - foreach (const QString &defaultPath, defaultPaths) { + for (const QString &defaultPath : defaultPaths) { if (!searchPaths.contains(defaultPath)) searchPaths.append(defaultPath); } diff --git a/src/virtualkeyboard/hunspellinputmethod_p.h b/src/virtualkeyboard/hunspellinputmethod_p.h index 0446c4b5..1a56defa 100644 --- a/src/virtualkeyboard/hunspellinputmethod_p.h +++ b/src/virtualkeyboard/hunspellinputmethod_p.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef HUNSPELLINPUTMETHOD_P_H #define HUNSPELLINPUTMETHOD_P_H diff --git a/src/virtualkeyboard/hunspellworker.cpp b/src/virtualkeyboard/hunspellworker.cpp index c1426adf..7c325e05 100644 --- a/src/virtualkeyboard/hunspellworker.cpp +++ b/src/virtualkeyboard/hunspellworker.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "hunspellworker.h" #include "virtualkeyboarddebug.h" @@ -69,11 +77,11 @@ void HunspellLoadDictionaryTask::run() QString affPath; QString dicPath; - foreach (const QString &searchPath, searchPaths) { + for (const QString &searchPath : searchPaths) { affPath = QStringLiteral("%1/%2.aff").arg(searchPath).arg(locale); - if (QFileInfo(affPath).exists()) { + if (QFileInfo::exists(affPath)) { dicPath = QStringLiteral("%1/%2.dic").arg(searchPath).arg(locale); - if (QFileInfo(dicPath).exists()) + if (QFileInfo::exists(dicPath)) break; dicPath.clear(); } diff --git a/src/virtualkeyboard/hunspellworker.h b/src/virtualkeyboard/hunspellworker.h index af415db3..73e2c187 100644 --- a/src/virtualkeyboard/hunspellworker.h +++ b/src/virtualkeyboard/hunspellworker.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef HUNSPELLWORKER_H #define HUNSPELLWORKER_H diff --git a/src/virtualkeyboard/import/import.pro b/src/virtualkeyboard/import/import.pro new file mode 100644 index 00000000..301f4f2b --- /dev/null +++ b/src/virtualkeyboard/import/import.pro @@ -0,0 +1,12 @@ +TARGETPATH = QtQuick/VirtualKeyboard +QML_FILES += plugins.qmltypes + +load(qml_module) + +# qmltypes target +!cross_compile:if(build_pass|!debug_and_release) { + qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) + + qmltypes.commands = QT_IM_MODULE=qtvirtualkeyboard $$QMLPLUGINDUMP -defaultplatform -nonrelocatable QtQuick.VirtualKeyboard 2.1 > $$PWD/plugins.qmltypes + QMAKE_EXTRA_TARGETS += qmltypes +} diff --git a/src/virtualkeyboard/import/plugins.qmltypes b/src/virtualkeyboard/import/plugins.qmltypes new file mode 100644 index 00000000..f2977658 --- /dev/null +++ b/src/virtualkeyboard/import/plugins.qmltypes @@ -0,0 +1,1999 @@ +import QtQuick.tooling 1.2 + +// This file describes the plugin-supplied types contained in the library. +// It is used for QML tooling purposes only. +// +// This file was auto-generated by: +// 'qmlplugindump -defaultplatform -nonrelocatable QtQuick.VirtualKeyboard 2.1' + +Module { + dependencies: [ + "Qt.labs.folderlistmodel 2.1", + "QtQuick.Layouts 1.1", + "QtQuick.VirtualKeyboard.Styles 1.1" + ] + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/AlternativeKeys 2.0" + exports: ["QtQuick.VirtualKeyboard/AlternativeKeys 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "active"; type: "bool" } + Property { name: "highlightIndex"; type: "int" } + Property { name: "keyCode"; type: "int" } + Property { name: "origin"; type: "QPointF" } + Property { name: "uppercased"; type: "bool" } + Property { name: "listView"; type: "QQuickListView"; isReadonly: true; isPointer: true } + Signal { name: "clicked" } + Method { + name: "open" + type: "QVariant" + Parameter { name: "key"; type: "QVariant" } + Parameter { name: "originX"; type: "QVariant" } + Parameter { name: "originY"; type: "QVariant" } + } + Method { + name: "move" + type: "QVariant" + Parameter { name: "mouseX"; type: "QVariant" } + } + Method { name: "close"; type: "QVariant" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/AlternativeKeys 1.0" + exports: ["QtQuick.VirtualKeyboard/AlternativeKeys 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "active"; type: "bool" } + Property { name: "highlightIndex"; type: "int" } + Property { name: "keyCode"; type: "int" } + Property { name: "origin"; type: "QPointF" } + Property { name: "uppercased"; type: "bool" } + Property { name: "listView"; type: "QQuickListView"; isReadonly: true; isPointer: true } + Signal { name: "clicked" } + Method { + name: "open" + type: "QVariant" + Parameter { name: "key"; type: "QVariant" } + Parameter { name: "originX"; type: "QVariant" } + Parameter { name: "originY"; type: "QVariant" } + } + Method { + name: "move" + type: "QVariant" + Parameter { name: "mouseX"; type: "QVariant" } + } + Method { name: "close"; type: "QVariant" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/BackspaceKey 1.0" + exports: ["QtQuick.VirtualKeyboard/BackspaceKey 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/BackspaceKey 2.0" + exports: ["QtQuick.VirtualKeyboard/BackspaceKey 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/BaseKey 1.0" + exports: ["QtQuick.VirtualKeyboard/BaseKey 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/BaseKey 2.0" + exports: ["QtQuick.VirtualKeyboard/BaseKey 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/ChangeLanguageKey 2.0" + exports: ["QtQuick.VirtualKeyboard/ChangeLanguageKey 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "customLayoutsOnly"; type: "bool" } + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/ChangeLanguageKey 1.0" + exports: ["QtQuick.VirtualKeyboard/ChangeLanguageKey 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "customLayoutsOnly"; type: "bool" } + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/CharacterPreviewBubble 1.0" + exports: ["QtQuick.VirtualKeyboard/CharacterPreviewBubble 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "active"; type: "bool" } + Property { name: "activeKey"; type: "QVariant" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/CharacterPreviewBubble 2.0" + exports: ["QtQuick.VirtualKeyboard/CharacterPreviewBubble 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "active"; type: "bool" } + Property { name: "activeKey"; type: "QVariant" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/EnterKey 2.0" + exports: ["QtQuick.VirtualKeyboard/EnterKey 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "actionId"; type: "int"; isReadonly: true } + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/EnterKey 1.0" + exports: ["QtQuick.VirtualKeyboard/EnterKey 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "actionId"; type: "int"; isReadonly: true } + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/FillerKey 2.0" + exports: ["QtQuick.VirtualKeyboard/FillerKey 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/FillerKey 1.0" + exports: ["QtQuick.VirtualKeyboard/FillerKey 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/HandwritingInputPanel 2.0" + exports: ["QtQuick.VirtualKeyboard/HandwritingInputPanel 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "inputPanel"; type: "QVariant" } + Property { name: "available"; type: "bool" } + Property { name: "active"; type: "bool" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/HandwritingModeKey 2.0" + exports: ["QtQuick.VirtualKeyboard/HandwritingModeKey 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/HideKeyboardKey 1.0" + exports: ["QtQuick.VirtualKeyboard/HideKeyboardKey 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/HideKeyboardKey 2.0" + exports: ["QtQuick.VirtualKeyboard/HideKeyboardKey 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/InputPanel 1.2" + exports: ["QtQuick.VirtualKeyboard/InputPanel 1.2"] + exportMetaObjectRevisions: [2] + isComposite: true + defaultProperty: "data" + Property { name: "active"; type: "bool" } + Property { name: "keyboard"; type: "Keyboard_QMLTYPE_10"; isReadonly: true; isPointer: true } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/InputPanel 1.3" + exports: ["QtQuick.VirtualKeyboard/InputPanel 1.3"] + exportMetaObjectRevisions: [3] + isComposite: true + defaultProperty: "data" + Property { name: "active"; type: "bool" } + Property { name: "keyboard"; type: "Keyboard_QMLTYPE_10"; isReadonly: true; isPointer: true } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/InputPanel 2.1" + exports: ["QtQuick.VirtualKeyboard/InputPanel 2.1"] + exportMetaObjectRevisions: [1] + isComposite: true + defaultProperty: "data" + Property { name: "active"; type: "bool" } + Property { name: "keyboard"; type: "Keyboard_QMLTYPE_10"; isReadonly: true; isPointer: true } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/InputPanel 2.0" + exports: ["QtQuick.VirtualKeyboard/InputPanel 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "active"; type: "bool" } + Property { name: "keyboard"; type: "Keyboard_QMLTYPE_10"; isReadonly: true; isPointer: true } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/InputPanel 1.0" + exports: ["QtQuick.VirtualKeyboard/InputPanel 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "active"; type: "bool" } + Property { name: "keyboard"; type: "Keyboard_QMLTYPE_10"; isReadonly: true; isPointer: true } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/Key 2.0" + exports: ["QtQuick.VirtualKeyboard/Key 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/Key 1.0" + exports: ["QtQuick.VirtualKeyboard/Key 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard.Styles/KeyIcon 1.0" + exports: ["QtQuick.VirtualKeyboard.Styles/KeyIcon 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "color"; type: "QColor" } + Property { name: "source"; type: "QUrl" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard.Styles/KeyIcon 2.0" + exports: ["QtQuick.VirtualKeyboard.Styles/KeyIcon 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "color"; type: "QColor" } + Property { name: "source"; type: "QUrl" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard.Styles/KeyPanel 1.0" + exports: ["QtQuick.VirtualKeyboard.Styles/KeyPanel 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "control"; type: "QQuickItem"; isPointer: true } + Property { name: "soundEffect"; type: "QUrl" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard.Styles/KeyPanel 2.0" + exports: ["QtQuick.VirtualKeyboard.Styles/KeyPanel 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "control"; type: "QQuickItem"; isPointer: true } + Property { name: "soundEffect"; type: "QUrl" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/Keyboard 2.0" + exports: ["QtQuick.VirtualKeyboard/Keyboard 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "activeKey"; type: "QVariant" } + Property { name: "activeTouchPoint"; type: "QQuickTouchPoint"; isPointer: true } + Property { name: "localeIndex"; type: "int" } + Property { name: "availableLocaleIndices"; type: "QVariant" } + Property { name: "availableCustomLocaleIndices"; type: "QVariant" } + Property { name: "locale"; type: "string" } + Property { name: "inputLocale"; type: "string" } + Property { name: "defaultLocaleIndex"; type: "int" } + Property { name: "latinOnly"; type: "bool" } + Property { name: "preferNumbers"; type: "bool" } + Property { name: "layout"; type: "string" } + Property { name: "layoutType"; type: "string" } + Property { name: "active"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "handwritingMode"; type: "bool" } + Property { name: "fullScreenHandwritingMode"; type: "bool" } + Property { name: "symbolMode"; type: "bool" } + Property { name: "defaultInputMethod"; type: "QVariant" } + Property { name: "plainInputMethod"; type: "QVariant" } + Property { name: "customInputMethod"; type: "QVariant" } + Property { name: "customInputMethodSharedLayouts"; type: "QVariant" } + Property { name: "defaultInputMode"; type: "int" } + Property { name: "inputMethodNeedsReset"; type: "bool" } + Property { name: "inputModeNeedsReset"; type: "bool" } + Property { name: "navigationModeActive"; type: "bool" } + Property { name: "style"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "soundEffect"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Method { name: "initDefaultInputMethod"; type: "QVariant" } + Method { name: "updateInputMethod"; type: "QVariant" } + Method { name: "updateLayout"; type: "QVariant" } + Method { name: "updateDefaultLocale"; type: "QVariant" } + Method { name: "updateAvailableLocaleIndices"; type: "QVariant" } + Method { + name: "nextLocaleIndex" + type: "QVariant" + Parameter { name: "customLayoutsOnly"; type: "QVariant" } + } + Method { + name: "changeInputLanguage" + type: "QVariant" + Parameter { name: "customLayoutsOnly"; type: "QVariant" } + } + Method { + name: "canChangeInputLanguage" + type: "QVariant" + Parameter { name: "customLayoutsOnly"; type: "QVariant" } + } + Method { + name: "findLocale" + type: "QVariant" + Parameter { name: "localeName"; type: "QVariant" } + Parameter { name: "defaultValue"; type: "QVariant" } + } + Method { + name: "isValidLocale" + type: "QVariant" + Parameter { name: "localeNameOrIndex"; type: "QVariant" } + } + Method { + name: "getLayoutFile" + type: "QVariant" + Parameter { name: "localeName"; type: "QVariant" } + Parameter { name: "layoutType"; type: "QVariant" } + } + Method { + name: "layoutExists" + type: "QVariant" + Parameter { name: "localeName"; type: "QVariant" } + Parameter { name: "layoutType"; type: "QVariant" } + } + Method { + name: "findLayout" + type: "QVariant" + Parameter { name: "localeName"; type: "QVariant" } + Parameter { name: "layoutType"; type: "QVariant" } + } + Method { name: "isHandwritingAvailable"; type: "QVariant" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/Keyboard 1.0" + exports: ["QtQuick.VirtualKeyboard/Keyboard 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "activeKey"; type: "QVariant" } + Property { name: "activeTouchPoint"; type: "QQuickTouchPoint"; isPointer: true } + Property { name: "localeIndex"; type: "int" } + Property { name: "availableLocaleIndices"; type: "QVariant" } + Property { name: "availableCustomLocaleIndices"; type: "QVariant" } + Property { name: "locale"; type: "string" } + Property { name: "inputLocale"; type: "string" } + Property { name: "defaultLocaleIndex"; type: "int" } + Property { name: "latinOnly"; type: "bool" } + Property { name: "preferNumbers"; type: "bool" } + Property { name: "layout"; type: "string" } + Property { name: "layoutType"; type: "string" } + Property { name: "active"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "handwritingMode"; type: "bool" } + Property { name: "fullScreenHandwritingMode"; type: "bool" } + Property { name: "symbolMode"; type: "bool" } + Property { name: "defaultInputMethod"; type: "QVariant" } + Property { name: "plainInputMethod"; type: "QVariant" } + Property { name: "customInputMethod"; type: "QVariant" } + Property { name: "customInputMethodSharedLayouts"; type: "QVariant" } + Property { name: "defaultInputMode"; type: "int" } + Property { name: "inputMethodNeedsReset"; type: "bool" } + Property { name: "inputModeNeedsReset"; type: "bool" } + Property { name: "navigationModeActive"; type: "bool" } + Property { name: "style"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "soundEffect"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Method { name: "initDefaultInputMethod"; type: "QVariant" } + Method { name: "updateInputMethod"; type: "QVariant" } + Method { name: "updateLayout"; type: "QVariant" } + Method { name: "updateDefaultLocale"; type: "QVariant" } + Method { name: "updateAvailableLocaleIndices"; type: "QVariant" } + Method { + name: "nextLocaleIndex" + type: "QVariant" + Parameter { name: "customLayoutsOnly"; type: "QVariant" } + } + Method { + name: "changeInputLanguage" + type: "QVariant" + Parameter { name: "customLayoutsOnly"; type: "QVariant" } + } + Method { + name: "canChangeInputLanguage" + type: "QVariant" + Parameter { name: "customLayoutsOnly"; type: "QVariant" } + } + Method { + name: "findLocale" + type: "QVariant" + Parameter { name: "localeName"; type: "QVariant" } + Parameter { name: "defaultValue"; type: "QVariant" } + } + Method { + name: "isValidLocale" + type: "QVariant" + Parameter { name: "localeNameOrIndex"; type: "QVariant" } + } + Method { + name: "getLayoutFile" + type: "QVariant" + Parameter { name: "localeName"; type: "QVariant" } + Parameter { name: "layoutType"; type: "QVariant" } + } + Method { + name: "layoutExists" + type: "QVariant" + Parameter { name: "localeName"; type: "QVariant" } + Parameter { name: "layoutType"; type: "QVariant" } + } + Method { + name: "findLayout" + type: "QVariant" + Parameter { name: "localeName"; type: "QVariant" } + Parameter { name: "layoutType"; type: "QVariant" } + } + Method { name: "isHandwritingAvailable"; type: "QVariant" } + } + Component { + prototype: "QQuickColumnLayout" + name: "QtQuick.VirtualKeyboard/KeyboardColumn 2.0" + exports: ["QtQuick.VirtualKeyboard/KeyboardColumn 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "keyWeight"; type: "double" } + Property { name: "smallTextVisible"; type: "bool" } + } + Component { + prototype: "QQuickColumnLayout" + name: "QtQuick.VirtualKeyboard/KeyboardColumn 1.0" + exports: ["QtQuick.VirtualKeyboard/KeyboardColumn 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "keyWeight"; type: "double" } + Property { name: "smallTextVisible"; type: "bool" } + } + Component { + prototype: "QQuickColumnLayout" + name: "QtQuick.VirtualKeyboard/KeyboardLayout 1.0" + exports: ["QtQuick.VirtualKeyboard/KeyboardLayout 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "inputMethod"; type: "QVariant" } + Property { name: "sharedLayouts"; type: "QVariant" } + Property { name: "inputMode"; type: "int" } + Property { name: "keyWeight"; type: "double" } + Property { name: "smallTextVisible"; type: "bool" } + Method { name: "createInputMethod"; type: "QVariant" } + } + Component { + prototype: "QQuickColumnLayout" + name: "QtQuick.VirtualKeyboard/KeyboardLayout 2.0" + exports: ["QtQuick.VirtualKeyboard/KeyboardLayout 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "inputMethod"; type: "QVariant" } + Property { name: "sharedLayouts"; type: "QVariant" } + Property { name: "inputMode"; type: "int" } + Property { name: "keyWeight"; type: "double" } + Property { name: "smallTextVisible"; type: "bool" } + Method { name: "createInputMethod"; type: "QVariant" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/KeyboardLayoutLoader 1.1" + exports: ["QtQuick.VirtualKeyboard/KeyboardLayoutLoader 1.1"] + exportMetaObjectRevisions: [1] + isComposite: true + defaultProperty: "data" + Property { name: "inputMethod"; type: "QVariant" } + Property { name: "sharedLayouts"; type: "QVariant" } + Property { name: "inputMode"; type: "int" } + Property { name: "__updateCount"; type: "int" } + Method { name: "createInputMethod"; type: "QVariant" } + Property { name: "active"; type: "bool" } + Property { name: "source"; type: "QUrl" } + Property { name: "sourceComponent"; type: "QQmlComponent"; isPointer: true } + Property { name: "item"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "status"; type: "Status"; isReadonly: true } + Property { name: "progress"; type: "double"; isReadonly: true } + Property { name: "asynchronous"; type: "bool" } + Signal { name: "loaded" } + Method { + name: "setSource" + Parameter { type: "QQmlV4Function"; isPointer: true } + } + Property { name: "implicitWidth"; type: "double"; isReadonly: true } + Property { name: "implicitHeight"; type: "double"; isReadonly: true } + Signal { name: "implicitWidthChanged2"; revision: 1 } + Signal { name: "implicitHeightChanged2"; revision: 1 } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/KeyboardLayoutLoader 2.0" + exports: ["QtQuick.VirtualKeyboard/KeyboardLayoutLoader 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "inputMethod"; type: "QVariant" } + Property { name: "sharedLayouts"; type: "QVariant" } + Property { name: "inputMode"; type: "int" } + Property { name: "__updateCount"; type: "int" } + Method { name: "createInputMethod"; type: "QVariant" } + Property { name: "active"; type: "bool" } + Property { name: "source"; type: "QUrl" } + Property { name: "sourceComponent"; type: "QQmlComponent"; isPointer: true } + Property { name: "item"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "status"; type: "Status"; isReadonly: true } + Property { name: "progress"; type: "double"; isReadonly: true } + Property { name: "asynchronous"; type: "bool" } + Signal { name: "loaded" } + Method { + name: "setSource" + Parameter { type: "QQmlV4Function"; isPointer: true } + } + Property { name: "implicitWidth"; type: "double"; isReadonly: true } + Property { name: "implicitHeight"; type: "double"; isReadonly: true } + Signal { name: "implicitWidthChanged2"; revision: 1 } + Signal { name: "implicitHeightChanged2"; revision: 1 } + } + Component { + prototype: "QQuickRowLayout" + name: "QtQuick.VirtualKeyboard/KeyboardRow 2.0" + exports: ["QtQuick.VirtualKeyboard/KeyboardRow 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "keyWeight"; type: "double" } + Property { name: "smallTextVisible"; type: "bool" } + } + Component { + prototype: "QQuickRowLayout" + name: "QtQuick.VirtualKeyboard/KeyboardRow 1.0" + exports: ["QtQuick.VirtualKeyboard/KeyboardRow 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "keyWeight"; type: "double" } + Property { name: "smallTextVisible"; type: "bool" } + } + Component { + prototype: "QObject" + name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.1" + exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.1"] + exportMetaObjectRevisions: [1] + isComposite: true + Property { name: "keyboardHeight"; type: "double" } + Property { name: "keyboardDesignWidth"; type: "double" } + Property { name: "keyboardDesignHeight"; type: "double" } + Property { name: "scaleHint"; type: "double"; isReadonly: true } + Property { name: "keyboardRelativeLeftMargin"; type: "double" } + Property { name: "keyboardRelativeRightMargin"; type: "double" } + Property { name: "keyboardRelativeTopMargin"; type: "double" } + Property { name: "keyboardRelativeBottomMargin"; type: "double" } + Property { name: "keyboardBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "keyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "backspaceKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "languageKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "enterKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "hideKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "shiftKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "spaceKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "symbolKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "modeKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "handwritingKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "characterPreviewMargin"; type: "double" } + Property { name: "characterPreviewDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListItemWidth"; type: "double" } + Property { name: "alternateKeysListItemHeight"; type: "double" } + Property { name: "alternateKeysListTopMargin"; type: "double" } + Property { name: "alternateKeysListBottomMargin"; type: "double" } + Property { name: "alternateKeysListLeftMargin"; type: "double" } + Property { name: "alternateKeysListRightMargin"; type: "double" } + Property { name: "alternateKeysListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListHeight"; type: "double" } + Property { name: "selectionListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListAdd"; type: "QQuickTransition"; isPointer: true } + Property { name: "selectionListRemove"; type: "QQuickTransition"; isPointer: true } + Property { name: "navigationHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "traceInputKeyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "traceCanvasDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListAdd"; type: "QQuickTransition"; isPointer: true } + Property { name: "popupListRemove"; type: "QQuickTransition"; isPointer: true } + Property { name: "selectionHandle"; type: "QQmlComponent"; isPointer: true } + } + Component { + prototype: "QObject" + name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 2.1" + exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 2.1"] + exportMetaObjectRevisions: [1] + isComposite: true + Property { name: "keyboardHeight"; type: "double" } + Property { name: "keyboardDesignWidth"; type: "double" } + Property { name: "keyboardDesignHeight"; type: "double" } + Property { name: "scaleHint"; type: "double"; isReadonly: true } + Property { name: "keyboardRelativeLeftMargin"; type: "double" } + Property { name: "keyboardRelativeRightMargin"; type: "double" } + Property { name: "keyboardRelativeTopMargin"; type: "double" } + Property { name: "keyboardRelativeBottomMargin"; type: "double" } + Property { name: "keyboardBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "keyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "backspaceKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "languageKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "enterKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "hideKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "shiftKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "spaceKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "symbolKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "modeKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "handwritingKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "characterPreviewMargin"; type: "double" } + Property { name: "characterPreviewDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListItemWidth"; type: "double" } + Property { name: "alternateKeysListItemHeight"; type: "double" } + Property { name: "alternateKeysListTopMargin"; type: "double" } + Property { name: "alternateKeysListBottomMargin"; type: "double" } + Property { name: "alternateKeysListLeftMargin"; type: "double" } + Property { name: "alternateKeysListRightMargin"; type: "double" } + Property { name: "alternateKeysListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListHeight"; type: "double" } + Property { name: "selectionListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListAdd"; type: "QQuickTransition"; isPointer: true } + Property { name: "selectionListRemove"; type: "QQuickTransition"; isPointer: true } + Property { name: "navigationHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "traceInputKeyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "traceCanvasDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListAdd"; type: "QQuickTransition"; isPointer: true } + Property { name: "popupListRemove"; type: "QQuickTransition"; isPointer: true } + Property { name: "selectionHandle"; type: "QQmlComponent"; isPointer: true } + } + Component { + prototype: "QObject" + name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 2.0" + exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + Property { name: "keyboardHeight"; type: "double" } + Property { name: "keyboardDesignWidth"; type: "double" } + Property { name: "keyboardDesignHeight"; type: "double" } + Property { name: "scaleHint"; type: "double"; isReadonly: true } + Property { name: "keyboardRelativeLeftMargin"; type: "double" } + Property { name: "keyboardRelativeRightMargin"; type: "double" } + Property { name: "keyboardRelativeTopMargin"; type: "double" } + Property { name: "keyboardRelativeBottomMargin"; type: "double" } + Property { name: "keyboardBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "keyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "backspaceKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "languageKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "enterKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "hideKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "shiftKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "spaceKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "symbolKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "modeKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "handwritingKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "characterPreviewMargin"; type: "double" } + Property { name: "characterPreviewDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListItemWidth"; type: "double" } + Property { name: "alternateKeysListItemHeight"; type: "double" } + Property { name: "alternateKeysListTopMargin"; type: "double" } + Property { name: "alternateKeysListBottomMargin"; type: "double" } + Property { name: "alternateKeysListLeftMargin"; type: "double" } + Property { name: "alternateKeysListRightMargin"; type: "double" } + Property { name: "alternateKeysListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListHeight"; type: "double" } + Property { name: "selectionListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListAdd"; type: "QQuickTransition"; isPointer: true } + Property { name: "selectionListRemove"; type: "QQuickTransition"; isPointer: true } + Property { name: "navigationHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "traceInputKeyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "traceCanvasDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListAdd"; type: "QQuickTransition"; isPointer: true } + Property { name: "popupListRemove"; type: "QQuickTransition"; isPointer: true } + Property { name: "selectionHandle"; type: "QQmlComponent"; isPointer: true } + } + Component { + prototype: "QObject" + name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.2" + exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.2"] + exportMetaObjectRevisions: [2] + isComposite: true + Property { name: "keyboardHeight"; type: "double" } + Property { name: "keyboardDesignWidth"; type: "double" } + Property { name: "keyboardDesignHeight"; type: "double" } + Property { name: "scaleHint"; type: "double"; isReadonly: true } + Property { name: "keyboardRelativeLeftMargin"; type: "double" } + Property { name: "keyboardRelativeRightMargin"; type: "double" } + Property { name: "keyboardRelativeTopMargin"; type: "double" } + Property { name: "keyboardRelativeBottomMargin"; type: "double" } + Property { name: "keyboardBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "keyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "backspaceKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "languageKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "enterKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "hideKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "shiftKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "spaceKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "symbolKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "modeKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "handwritingKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "characterPreviewMargin"; type: "double" } + Property { name: "characterPreviewDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListItemWidth"; type: "double" } + Property { name: "alternateKeysListItemHeight"; type: "double" } + Property { name: "alternateKeysListTopMargin"; type: "double" } + Property { name: "alternateKeysListBottomMargin"; type: "double" } + Property { name: "alternateKeysListLeftMargin"; type: "double" } + Property { name: "alternateKeysListRightMargin"; type: "double" } + Property { name: "alternateKeysListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListHeight"; type: "double" } + Property { name: "selectionListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListAdd"; type: "QQuickTransition"; isPointer: true } + Property { name: "selectionListRemove"; type: "QQuickTransition"; isPointer: true } + Property { name: "navigationHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "traceInputKeyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "traceCanvasDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListAdd"; type: "QQuickTransition"; isPointer: true } + Property { name: "popupListRemove"; type: "QQuickTransition"; isPointer: true } + Property { name: "selectionHandle"; type: "QQmlComponent"; isPointer: true } + } + Component { + prototype: "QObject" + name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.0" + exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + Property { name: "keyboardHeight"; type: "double" } + Property { name: "keyboardDesignWidth"; type: "double" } + Property { name: "keyboardDesignHeight"; type: "double" } + Property { name: "scaleHint"; type: "double"; isReadonly: true } + Property { name: "keyboardRelativeLeftMargin"; type: "double" } + Property { name: "keyboardRelativeRightMargin"; type: "double" } + Property { name: "keyboardRelativeTopMargin"; type: "double" } + Property { name: "keyboardRelativeBottomMargin"; type: "double" } + Property { name: "keyboardBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "keyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "backspaceKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "languageKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "enterKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "hideKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "shiftKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "spaceKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "symbolKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "modeKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "handwritingKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "characterPreviewMargin"; type: "double" } + Property { name: "characterPreviewDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListItemWidth"; type: "double" } + Property { name: "alternateKeysListItemHeight"; type: "double" } + Property { name: "alternateKeysListTopMargin"; type: "double" } + Property { name: "alternateKeysListBottomMargin"; type: "double" } + Property { name: "alternateKeysListLeftMargin"; type: "double" } + Property { name: "alternateKeysListRightMargin"; type: "double" } + Property { name: "alternateKeysListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListHeight"; type: "double" } + Property { name: "selectionListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListAdd"; type: "QQuickTransition"; isPointer: true } + Property { name: "selectionListRemove"; type: "QQuickTransition"; isPointer: true } + Property { name: "navigationHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "traceInputKeyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "traceCanvasDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListAdd"; type: "QQuickTransition"; isPointer: true } + Property { name: "popupListRemove"; type: "QQuickTransition"; isPointer: true } + Property { name: "selectionHandle"; type: "QQmlComponent"; isPointer: true } + } + Component { + prototype: "QObject" + name: "QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.3" + exports: ["QtQuick.VirtualKeyboard.Styles/KeyboardStyle 1.3"] + exportMetaObjectRevisions: [3] + isComposite: true + Property { name: "keyboardHeight"; type: "double" } + Property { name: "keyboardDesignWidth"; type: "double" } + Property { name: "keyboardDesignHeight"; type: "double" } + Property { name: "scaleHint"; type: "double"; isReadonly: true } + Property { name: "keyboardRelativeLeftMargin"; type: "double" } + Property { name: "keyboardRelativeRightMargin"; type: "double" } + Property { name: "keyboardRelativeTopMargin"; type: "double" } + Property { name: "keyboardRelativeBottomMargin"; type: "double" } + Property { name: "keyboardBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "keyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "backspaceKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "languageKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "enterKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "hideKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "shiftKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "spaceKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "symbolKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "modeKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "handwritingKeyPanel"; type: "QQmlComponent"; isPointer: true } + Property { name: "characterPreviewMargin"; type: "double" } + Property { name: "characterPreviewDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListItemWidth"; type: "double" } + Property { name: "alternateKeysListItemHeight"; type: "double" } + Property { name: "alternateKeysListTopMargin"; type: "double" } + Property { name: "alternateKeysListBottomMargin"; type: "double" } + Property { name: "alternateKeysListLeftMargin"; type: "double" } + Property { name: "alternateKeysListRightMargin"; type: "double" } + Property { name: "alternateKeysListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "alternateKeysListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListHeight"; type: "double" } + Property { name: "selectionListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "selectionListAdd"; type: "QQuickTransition"; isPointer: true } + Property { name: "selectionListRemove"; type: "QQuickTransition"; isPointer: true } + Property { name: "navigationHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "traceInputKeyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "traceCanvasDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListHighlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListBackground"; type: "QQmlComponent"; isPointer: true } + Property { name: "popupListAdd"; type: "QQuickTransition"; isPointer: true } + Property { name: "popupListRemove"; type: "QQuickTransition"; isPointer: true } + Property { name: "selectionHandle"; type: "QQmlComponent"; isPointer: true } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/ModeKey 2.0" + exports: ["QtQuick.VirtualKeyboard/ModeKey 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "mode"; type: "bool" } + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/MultiSoundEffect 1.1" + exports: ["QtQuick.VirtualKeyboard/MultiSoundEffect 1.1"] + exportMetaObjectRevisions: [1] + isComposite: true + defaultProperty: "data" + Property { name: "source"; type: "QUrl" } + Property { name: "maxInstances"; type: "int" } + Property { name: "__cachedInstances"; type: "QVariant" } + Property { name: "__currentIndex"; type: "int" } + Signal { + name: "playingChanged" + Parameter { name: "source"; type: "QUrl" } + Parameter { name: "playing"; type: "bool" } + } + Method { name: "play"; type: "QVariant" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/MultiSoundEffect 2.0" + exports: ["QtQuick.VirtualKeyboard/MultiSoundEffect 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "source"; type: "QUrl" } + Property { name: "maxInstances"; type: "int" } + Property { name: "__cachedInstances"; type: "QVariant" } + Property { name: "__currentIndex"; type: "int" } + Signal { + name: "playingChanged" + Parameter { name: "source"; type: "QUrl" } + Parameter { name: "playing"; type: "bool" } + } + Method { name: "play"; type: "QVariant" } + } + Component { + prototype: "QtVirtualKeyboard::InputMethod" + name: "QtQuick.VirtualKeyboard/MultitapInputMethod 1.0" + exports: ["QtQuick.VirtualKeyboard/MultitapInputMethod 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + Property { name: "multitapSequence"; type: "string" } + Property { name: "multitapIndex"; type: "int" } + Property { name: "multiTapTimer"; type: "QVariant" } + Method { + name: "inputModes" + type: "QVariant" + Parameter { name: "locale"; type: "QVariant" } + } + Method { + name: "setInputMode" + type: "QVariant" + Parameter { name: "locale"; type: "QVariant" } + Parameter { name: "inputMode"; type: "QVariant" } + } + Method { + name: "setTextCase" + type: "QVariant" + Parameter { name: "textCase"; type: "QVariant" } + } + Method { name: "reset"; type: "QVariant" } + Method { name: "update"; type: "QVariant" } + Method { + name: "keyEvent" + type: "QVariant" + Parameter { name: "key"; type: "QVariant" } + Parameter { name: "text"; type: "QVariant" } + Parameter { name: "modifiers"; type: "QVariant" } + } + Method { name: "selectionLists"; type: "QVariant" } + Method { + name: "selectionListItemCount" + type: "QVariant" + Parameter { name: "type"; type: "QVariant" } + } + Method { + name: "selectionListData" + type: "QVariant" + Parameter { name: "type"; type: "QVariant" } + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "role"; type: "QVariant" } + } + Method { + name: "selectionListItemSelected" + type: "QVariant" + Parameter { name: "type"; type: "QVariant" } + Parameter { name: "index"; type: "QVariant" } + } + } + Component { + prototype: "QtVirtualKeyboard::InputMethod" + name: "QtQuick.VirtualKeyboard/MultitapInputMethod 2.0" + exports: ["QtQuick.VirtualKeyboard/MultitapInputMethod 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + Property { name: "multitapSequence"; type: "string" } + Property { name: "multitapIndex"; type: "int" } + Property { name: "multiTapTimer"; type: "QVariant" } + Method { + name: "inputModes" + type: "QVariant" + Parameter { name: "locale"; type: "QVariant" } + } + Method { + name: "setInputMode" + type: "QVariant" + Parameter { name: "locale"; type: "QVariant" } + Parameter { name: "inputMode"; type: "QVariant" } + } + Method { + name: "setTextCase" + type: "QVariant" + Parameter { name: "textCase"; type: "QVariant" } + } + Method { name: "reset"; type: "QVariant" } + Method { name: "update"; type: "QVariant" } + Method { + name: "keyEvent" + type: "QVariant" + Parameter { name: "key"; type: "QVariant" } + Parameter { name: "text"; type: "QVariant" } + Parameter { name: "modifiers"; type: "QVariant" } + } + Method { name: "selectionLists"; type: "QVariant" } + Method { + name: "selectionListItemCount" + type: "QVariant" + Parameter { name: "type"; type: "QVariant" } + } + Method { + name: "selectionListData" + type: "QVariant" + Parameter { name: "type"; type: "QVariant" } + Parameter { name: "index"; type: "QVariant" } + Parameter { name: "role"; type: "QVariant" } + } + Method { + name: "selectionListItemSelected" + type: "QVariant" + Parameter { name: "type"; type: "QVariant" } + Parameter { name: "index"; type: "QVariant" } + } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/NumberKey 1.0" + exports: ["QtQuick.VirtualKeyboard/NumberKey 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/NumberKey 2.0" + exports: ["QtQuick.VirtualKeyboard/NumberKey 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/SelectionControl 2.1" + exports: ["QtQuick.VirtualKeyboard/SelectionControl 2.1"] + exportMetaObjectRevisions: [1] + isComposite: true + defaultProperty: "data" + Property { name: "handleIsMoving"; type: "bool" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard.Styles/SelectionListItem 2.0" + exports: ["QtQuick.VirtualKeyboard.Styles/SelectionListItem 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "soundEffect"; type: "QUrl" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard.Styles/SelectionListItem 1.0" + exports: ["QtQuick.VirtualKeyboard.Styles/SelectionListItem 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "soundEffect"; type: "QUrl" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/ShiftKey 2.0" + exports: ["QtQuick.VirtualKeyboard/ShiftKey 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "capsLock"; type: "bool" } + Property { name: "shift"; type: "bool" } + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/ShiftKey 1.0" + exports: ["QtQuick.VirtualKeyboard/ShiftKey 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "capsLock"; type: "bool" } + Property { name: "shift"; type: "bool" } + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/SpaceKey 1.0" + exports: ["QtQuick.VirtualKeyboard/SpaceKey 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/SpaceKey 2.0" + exports: ["QtQuick.VirtualKeyboard/SpaceKey 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/SymbolModeKey 1.0" + exports: ["QtQuick.VirtualKeyboard/SymbolModeKey 1.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/SymbolModeKey 2.0" + exports: ["QtQuick.VirtualKeyboard/SymbolModeKey 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "text"; type: "string" } + Property { name: "displayText"; type: "string" } + Property { name: "smallText"; type: "string" } + Property { name: "smallTextVisible"; type: "bool" } + Property { name: "alternativeKeys"; type: "QVariant" } + Property { name: "effectiveAlternativeKeys"; type: "QVariant"; isReadonly: true } + Property { name: "effectiveAlternativeKeysHighlightIndex"; type: "int"; isReadonly: true } + Property { name: "key"; type: "int" } + Property { name: "noKeyEvent"; type: "bool" } + Property { name: "active"; type: "bool" } + Property { name: "noModifier"; type: "bool" } + Property { name: "repeat"; type: "bool" } + Property { name: "highlighted"; type: "bool" } + Property { name: "functionKey"; type: "bool" } + Property { name: "showPreview"; type: "bool" } + Property { name: "enabled"; type: "bool" } + Property { name: "pressed"; type: "bool" } + Property { name: "uppercased"; type: "bool" } + Property { name: "soundEffect"; type: "QUrl"; isReadonly: true } + Property { name: "keyPanelDelegate"; type: "QQmlComponent"; isPointer: true } + Signal { name: "clicked" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard.Styles/TraceCanvas 2.0" + exports: ["QtQuick.VirtualKeyboard.Styles/TraceCanvas 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "trace"; type: "QVariant" } + Property { name: "autoDestroy"; type: "bool" } + Property { name: "autoDestroyDelay"; type: "int" } + Property { name: "renderFunction"; type: "QVariant" } + Property { name: "__renderPos"; type: "int" } + Property { name: "__renderingEnabled"; type: "bool" } + Method { name: "renderSmoothedLine"; type: "QVariant" } + Property { name: "available"; type: "bool"; isReadonly: true } + Property { name: "contextType"; type: "string" } + Property { name: "context"; type: "QQmlV4Handle"; isReadonly: true } + Property { name: "canvasSize"; type: "QSizeF" } + Property { name: "tileSize"; type: "QSize" } + Property { name: "canvasWindow"; type: "QRectF" } + Property { name: "renderTarget"; type: "RenderTarget" } + Property { name: "renderStrategy"; type: "RenderStrategy" } + Signal { + name: "paint" + Parameter { name: "region"; type: "QRect" } + } + Signal { name: "painted" } + Signal { name: "imageLoaded" } + Method { + name: "loadImage" + Parameter { name: "url"; type: "QUrl" } + } + Method { + name: "unloadImage" + Parameter { name: "url"; type: "QUrl" } + } + Method { + name: "isImageLoaded" + type: "bool" + Parameter { name: "url"; type: "QUrl" } + } + Method { + name: "isImageLoading" + type: "bool" + Parameter { name: "url"; type: "QUrl" } + } + Method { + name: "isImageError" + type: "bool" + Parameter { name: "url"; type: "QUrl" } + } + Method { + name: "getContext" + Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } + } + Method { + name: "requestAnimationFrame" + Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } + } + Method { + name: "cancelRequestAnimationFrame" + Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } + } + Method { name: "requestPaint" } + Method { + name: "markDirty" + Parameter { name: "dirtyRect"; type: "QRectF" } + } + Method { name: "markDirty" } + Method { + name: "save" + type: "bool" + Parameter { name: "filename"; type: "string" } + } + Method { + name: "toDataURL" + type: "string" + Parameter { name: "type"; type: "string" } + } + Method { name: "toDataURL"; type: "string" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/TraceInputArea 2.0" + exports: ["QtQuick.VirtualKeyboard/TraceInputArea 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "patternRecognitionMode"; type: "int" } + Property { name: "horizontalRulers"; type: "QVariant" } + Property { name: "verticalRulers"; type: "QVariant" } + Property { name: "boundingBox"; type: "QRectF"; isReadonly: true } + Property { name: "canvasType"; type: "string" } + Property { name: "__traceCanvasList"; type: "QVariant" } + Property { name: "__traceCaptureDeviceInfo"; type: "QVariant" } + Property { name: "__traceScreenInfo"; type: "QVariant" } + Method { + name: "findTraceCanvasById" + type: "QVariant" + Parameter { name: "traceId"; type: "QVariant" } + } + Property { name: "touchPoints"; type: "QQuickTouchPoint"; isList: true; isReadonly: true } + Property { name: "minimumTouchPoints"; type: "int" } + Property { name: "maximumTouchPoints"; type: "int" } + Property { name: "mouseEnabled"; type: "bool" } + Signal { + name: "pressed" + Parameter { name: "touchPoints"; type: "QList<QObject*>" } + } + Signal { + name: "updated" + Parameter { name: "touchPoints"; type: "QList<QObject*>" } + } + Signal { + name: "released" + Parameter { name: "touchPoints"; type: "QList<QObject*>" } + } + Signal { + name: "canceled" + Parameter { name: "touchPoints"; type: "QList<QObject*>" } + } + Signal { + name: "gestureStarted" + Parameter { name: "gesture"; type: "QQuickGrabGestureEvent"; isPointer: true } + } + Signal { + name: "touchUpdated" + Parameter { name: "touchPoints"; type: "QList<QObject*>" } + } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/TraceInputKey 2.0" + exports: ["QtQuick.VirtualKeyboard/TraceInputKey 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "weight"; type: "double" } + Property { name: "patternRecognitionMode"; type: "int" } + Property { name: "horizontalRulers"; type: "QVariant" } + Property { name: "verticalRulers"; type: "QVariant" } + Property { name: "boundingBox"; type: "QRectF"; isReadonly: true } + Property { name: "canvasType"; type: "string" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard.Styles/TraceInputKeyPanel 2.0" + exports: ["QtQuick.VirtualKeyboard.Styles/TraceInputKeyPanel 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "control"; type: "QQuickItem"; isPointer: true } + Property { name: "traceMargins"; type: "double" } + } + Component { + prototype: "QQuickItem" + name: "QtQuick.VirtualKeyboard/WordCandidatePopupList 2.0" + exports: ["QtQuick.VirtualKeyboard/WordCandidatePopupList 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + Property { name: "maxVisibleItems"; type: "int" } + Property { name: "preferredVisibleItems"; type: "int"; isReadonly: true } + Property { name: "contentWidth"; type: "double"; isReadonly: true } + Property { name: "flipVertical"; type: "bool"; isReadonly: true } + Property { name: "highlightMoveVelocity"; type: "double" } + Property { name: "highlightResizeVelocity"; type: "double" } + Property { name: "highlightResizeDuration"; type: "int" } + Property { name: "spacing"; type: "double" } + Property { name: "orientation"; type: "Orientation" } + Property { name: "section"; type: "QQuickViewSection"; isReadonly: true; isPointer: true } + Property { name: "currentSection"; type: "string"; isReadonly: true } + Property { name: "snapMode"; type: "SnapMode" } + Property { name: "headerPositioning"; revision: 2; type: "HeaderPositioning" } + Property { name: "footerPositioning"; revision: 2; type: "FooterPositioning" } + Method { name: "incrementCurrentIndex" } + Method { name: "decrementCurrentIndex" } + Property { name: "model"; type: "QVariant" } + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "count"; type: "int"; isReadonly: true } + Property { name: "currentIndex"; type: "int" } + Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "keyNavigationWraps"; type: "bool" } + Property { name: "keyNavigationEnabled"; revision: 7; type: "bool" } + Property { name: "cacheBuffer"; type: "int" } + Property { name: "displayMarginBeginning"; revision: 2; type: "int" } + Property { name: "displayMarginEnd"; revision: 2; type: "int" } + Property { name: "layoutDirection"; type: "Qt::LayoutDirection" } + Property { name: "effectiveLayoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true } + Property { name: "verticalLayoutDirection"; type: "VerticalLayoutDirection" } + Property { name: "header"; type: "QQmlComponent"; isPointer: true } + Property { name: "headerItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "footer"; type: "QQmlComponent"; isPointer: true } + Property { name: "footerItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "populate"; type: "QQuickTransition"; isPointer: true } + Property { name: "add"; type: "QQuickTransition"; isPointer: true } + Property { name: "addDisplaced"; type: "QQuickTransition"; isPointer: true } + Property { name: "move"; type: "QQuickTransition"; isPointer: true } + Property { name: "moveDisplaced"; type: "QQuickTransition"; isPointer: true } + Property { name: "remove"; type: "QQuickTransition"; isPointer: true } + Property { name: "removeDisplaced"; type: "QQuickTransition"; isPointer: true } + Property { name: "displaced"; type: "QQuickTransition"; isPointer: true } + Property { name: "highlight"; type: "QQmlComponent"; isPointer: true } + Property { name: "highlightItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "highlightFollowsCurrentItem"; type: "bool" } + Property { name: "highlightRangeMode"; type: "HighlightRangeMode" } + Property { name: "preferredHighlightBegin"; type: "double" } + Property { name: "preferredHighlightEnd"; type: "double" } + Property { name: "highlightMoveDuration"; type: "int" } + Signal { name: "populateTransitionChanged" } + Signal { name: "addTransitionChanged" } + Signal { name: "addDisplacedTransitionChanged" } + Signal { name: "moveTransitionChanged" } + Signal { name: "moveDisplacedTransitionChanged" } + Signal { name: "removeTransitionChanged" } + Signal { name: "removeDisplacedTransitionChanged" } + Signal { name: "displacedTransitionChanged" } + Method { + name: "positionViewAtIndex" + Parameter { name: "index"; type: "int" } + Parameter { name: "mode"; type: "int" } + } + Method { + name: "indexAt" + type: "int" + Parameter { name: "x"; type: "double" } + Parameter { name: "y"; type: "double" } + } + Method { + name: "itemAt" + type: "QQuickItem*" + Parameter { name: "x"; type: "double" } + Parameter { name: "y"; type: "double" } + } + Method { name: "positionViewAtBeginning" } + Method { name: "positionViewAtEnd" } + Method { name: "forceLayout"; revision: 1 } + Property { name: "contentHeight"; type: "double" } + Property { name: "contentX"; type: "double" } + Property { name: "contentY"; type: "double" } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "topMargin"; type: "double" } + Property { name: "bottomMargin"; type: "double" } + Property { name: "originY"; type: "double"; isReadonly: true } + Property { name: "leftMargin"; type: "double" } + Property { name: "rightMargin"; type: "double" } + Property { name: "originX"; type: "double"; isReadonly: true } + Property { name: "horizontalVelocity"; type: "double"; isReadonly: true } + Property { name: "verticalVelocity"; type: "double"; isReadonly: true } + Property { name: "boundsBehavior"; type: "BoundsBehavior" } + Property { name: "rebound"; type: "QQuickTransition"; isPointer: true } + Property { name: "maximumFlickVelocity"; type: "double" } + Property { name: "flickDeceleration"; type: "double" } + Property { name: "moving"; type: "bool"; isReadonly: true } + Property { name: "movingHorizontally"; type: "bool"; isReadonly: true } + Property { name: "movingVertically"; type: "bool"; isReadonly: true } + Property { name: "flicking"; type: "bool"; isReadonly: true } + Property { name: "flickingHorizontally"; type: "bool"; isReadonly: true } + Property { name: "flickingVertically"; type: "bool"; isReadonly: true } + Property { name: "dragging"; type: "bool"; isReadonly: true } + Property { name: "draggingHorizontally"; type: "bool"; isReadonly: true } + Property { name: "draggingVertically"; type: "bool"; isReadonly: true } + Property { name: "flickableDirection"; type: "FlickableDirection" } + Property { name: "interactive"; type: "bool" } + Property { name: "pressDelay"; type: "int" } + Property { name: "atXEnd"; type: "bool"; isReadonly: true } + Property { name: "atYEnd"; type: "bool"; isReadonly: true } + Property { name: "atXBeginning"; type: "bool"; isReadonly: true } + Property { name: "atYBeginning"; type: "bool"; isReadonly: true } + Property { + name: "visibleArea" + type: "QQuickFlickableVisibleArea" + isReadonly: true + isPointer: true + } + Property { name: "pixelAligned"; type: "bool" } + Property { name: "flickableData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "flickableChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + Signal { name: "isAtBoundaryChanged" } + Signal { name: "movementStarted" } + Signal { name: "movementEnded" } + Signal { name: "flickStarted" } + Signal { name: "flickEnded" } + Signal { name: "dragStarted" } + Signal { name: "dragEnded" } + Method { + name: "resizeContent" + Parameter { name: "w"; type: "double" } + Parameter { name: "h"; type: "double" } + Parameter { name: "center"; type: "QPointF" } + } + Method { name: "returnToBounds" } + Method { + name: "flick" + Parameter { name: "xVelocity"; type: "double" } + Parameter { name: "yVelocity"; type: "double" } + } + Method { name: "cancelFlick" } + } +} diff --git a/src/virtualkeyboard/import/qmldir b/src/virtualkeyboard/import/qmldir new file mode 100644 index 00000000..b13824c5 --- /dev/null +++ b/src/virtualkeyboard/import/qmldir @@ -0,0 +1,5 @@ +module QtQuick.VirtualKeyboard +typeinfo plugins.qmltypes +depends QtQuick.Layouts 1.1 +depends QtQuick.VirtualKeyboard.Styles 1.1 +depends Qt.labs.folderlistmodel 2.1 diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp index afb6774e..df8613ff 100644 --- a/src/virtualkeyboard/inputcontext.cpp +++ b/src/virtualkeyboard/inputcontext.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "inputcontext.h" #include "inputengine.h" @@ -46,24 +54,11 @@ bool operator==(const QInputMethodEvent::Attribute &attribute1, const QInputMeth QT_END_NAMESPACE /*! - \qmlmodule QtQuick.Enterprise.VirtualKeyboard 2.0 - - This module provides a collection of QML components for Qt Virtual Keyboard. -*/ - -/*! - \module InputFramework - - \title Input Framework - - \brief Contains classes for integrating input methods. -*/ - -/*! \namespace QtVirtualKeyboard - \inmodule InputFramework + \inmodule QtVirtualKeyboard \brief Namespace for the Qt Virtual Keyboard C++ API. + \internal */ namespace QtVirtualKeyboard { @@ -98,7 +93,10 @@ public: preeditTextAttributes(), surroundingText(), selectedText(), - cursorRectangle() + cursorRectangle(), + selectionControlVisible(false), + anchorRectIntersectsClipRect(false), + cursorRectIntersectsClipRect(false) #ifdef QT_VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION , activeNavigationKeys() #endif @@ -124,6 +122,9 @@ public: QString surroundingText; QString selectedText; QRectF cursorRectangle; + bool selectionControlVisible; + bool anchorRectIntersectsClipRect; + bool cursorRectIntersectsClipRect; #ifdef QT_VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION QSet<int> activeNavigationKeys; #endif @@ -135,7 +136,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(InputContextPrivate::StateFlags) /*! \qmltype InputContext \instantiates QtVirtualKeyboard::InputContext - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \brief Provides access to an input context. @@ -144,8 +145,9 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(InputContextPrivate::StateFlags) /*! \class QtVirtualKeyboard::InputContext - \inmodule InputFramework + \inmodule QtVirtualKeyboard \brief Provides access to an input context. + \internal */ /*! @@ -535,7 +537,7 @@ bool InputContext::fileExists(const QUrl &fileUrl) } else { fileName = fileUrl.toLocalFile(); } - return QFile(fileName).exists(); + return QFile::exists(fileName); #endif } @@ -547,6 +549,32 @@ bool InputContext::hasEnterKeyAction(QObject *item) const return item != 0 && qmlAttachedPropertiesObject<EnterKeyAction>(item, false); } +/*! + \internal +*/ +void InputContext::setSelectionOnFocusObject(const QPointF &anchorPos, const QPointF &cursorPos) +{ + QPlatformInputContext::setSelectionOnFocusObject(anchorPos, cursorPos); +} + +bool InputContext::anchorRectIntersectsClipRect() const +{ + Q_D(const InputContext); + return d->anchorRectIntersectsClipRect; +} + +bool InputContext::cursorRectIntersectsClipRect() const +{ + Q_D(const InputContext); + return d->cursorRectIntersectsClipRect; +} + +bool InputContext::selectionControlVisible() const +{ + Q_D(const InputContext); + return d->selectionControlVisible; +} + void InputContext::onInputItemChanged() { Q_D(InputContext); @@ -614,7 +642,8 @@ void InputContext::update(Qt::InputMethodQueries queries) // fetch Qt::InputMethodHints inputMethodHints = Qt::InputMethodHints(d->inputContext->inputMethodQuery(Qt::ImHints).toInt()); - int cursorPosition = d->inputContext->inputMethodQuery(Qt::ImCursorPosition).toInt(); + const int cursorPosition = d->inputContext->inputMethodQuery(Qt::ImCursorPosition).toInt(); + const int anchorPosition = d->inputContext->inputMethodQuery(Qt::ImAnchorPosition).toInt(); QRectF cursorRectangle = qApp->inputMethod()->cursorRectangle(); QString surroundingText = d->inputContext->inputMethodQuery(Qt::ImSurroundingText).toString(); QString selectedText = d->inputContext->inputMethodQuery(Qt::ImCurrentSelection).toString(); @@ -625,6 +654,18 @@ void InputContext::update(Qt::InputMethodQueries queries) bool newSelectedText = selectedText != d->selectedText; bool newCursorPosition = cursorPosition != d->cursorPosition; bool newCursorRectangle = cursorRectangle != d->cursorRectangle; + bool selectionControlVisible = d->inputContext->isInputPanelVisible() && (cursorPosition != anchorPosition); + bool newSelectionControlVisible = selectionControlVisible != d->selectionControlVisible; + + QRectF inputItemClipRect = d->inputContext->inputMethodQuery(Qt::ImInputItemClipRectangle).toRectF(); + QRectF anchorRect = d->inputContext->inputMethodQuery(Qt::ImAnchorRectangle).toRectF(); + QRectF cursorRect = d->inputContext->inputMethodQuery(Qt::ImCursorRectangle).toRectF(); + + bool anchorRectIntersectsClipRect = inputItemClipRect.intersects(anchorRect); + bool newAnchorRectIntersectsClipRect = anchorRectIntersectsClipRect != d->anchorRectIntersectsClipRect; + + bool cursorRectIntersectsClipRect = inputItemClipRect.intersects(cursorRect); + bool newCursorRectIntersectsClipRect = cursorRectIntersectsClipRect != d->cursorRectIntersectsClipRect; // update d->inputMethodHints = inputMethodHints; @@ -632,6 +673,9 @@ void InputContext::update(Qt::InputMethodQueries queries) d->selectedText = selectedText; d->cursorPosition = cursorPosition; d->cursorRectangle = cursorRectangle; + d->selectionControlVisible = selectionControlVisible; + d->anchorRectIntersectsClipRect = anchorRectIntersectsClipRect; + d->cursorRectIntersectsClipRect = cursorRectIntersectsClipRect; // update input engine if ((newSurroundingText || newCursorPosition) && @@ -658,6 +702,15 @@ void InputContext::update(Qt::InputMethodQueries queries) if (newCursorRectangle) { emit cursorRectangleChanged(); } + if (newSelectionControlVisible) { + emit selectionControlVisibleChanged(); + } + if (newAnchorRectIntersectsClipRect) { + emit anchorRectIntersectsClipRectChanged(); + } + if (newCursorRectIntersectsClipRect) { + emit cursorRectIntersectsClipRectChanged(); + } // word reselection if (newInputMethodHints || newSurroundingText || newSelectedText) diff --git a/src/virtualkeyboard/inputcontext.h b/src/virtualkeyboard/inputcontext.h index b07b1cad..fa7e07c6 100644 --- a/src/virtualkeyboard/inputcontext.h +++ b/src/virtualkeyboard/inputcontext.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef INPUTCONTEXT_H #define INPUTCONTEXT_H @@ -57,6 +65,9 @@ class InputContext : public QObject Q_PROPERTY(QObject *inputItem READ inputItem NOTIFY inputItemChanged) Q_PROPERTY(QtVirtualKeyboard::ShiftHandler *shiftHandler READ shiftHandler CONSTANT) Q_PROPERTY(QtVirtualKeyboard::InputEngine *inputEngine READ inputEngine CONSTANT) + Q_PROPERTY(bool selectionControlVisible READ selectionControlVisible NOTIFY selectionControlVisibleChanged) + Q_PROPERTY(bool anchorRectIntersectsClipRect READ anchorRectIntersectsClipRect NOTIFY anchorRectIntersectsClipRectChanged) + Q_PROPERTY(bool cursorRectIntersectsClipRect READ cursorRectIntersectsClipRect NOTIFY cursorRectIntersectsClipRectChanged) public: explicit InputContext(PlatformInputContext *parent = 0); @@ -88,6 +99,9 @@ public: QObject *inputItem() const; ShiftHandler *shiftHandler() const; InputEngine *inputEngine() const; + bool selectionControlVisible() const; + bool anchorRectIntersectsClipRect() const; + bool cursorRectIntersectsClipRect() const; Q_INVOKABLE void hideInputPanel(); Q_INVOKABLE void sendKeyClick(int key, const QString &text, int modifiers = 0); @@ -99,6 +113,9 @@ public: Q_INVOKABLE bool fileExists(const QUrl &fileUrl); Q_INVOKABLE bool hasEnterKeyAction(QObject *item) const; + // For selection handles + Q_INVOKABLE void setSelectionOnFocusObject(const QPointF &anchorPos, const QPointF &cursorPos); + signals: void focusChanged(); void focusEditorChanged(); @@ -116,8 +133,11 @@ signals: void animatingChanged(); void localeChanged(); void inputItemChanged(); + void selectionControlVisibleChanged(); void navigationKeyPressed(int key, bool isAutoRepeat); void navigationKeyReleased(int key, bool isAutoRepeat); + void anchorRectIntersectsClipRectChanged(); + void cursorRectIntersectsClipRectChanged(); private slots: void onInputItemChanged(); diff --git a/src/virtualkeyboard/inputengine.cpp b/src/virtualkeyboard/inputengine.cpp index 31a61561..f9c447c6 100644 --- a/src/virtualkeyboard/inputengine.cpp +++ b/src/virtualkeyboard/inputengine.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "inputengine.h" #include "inputcontext.h" @@ -108,7 +116,7 @@ private: /*! \qmltype InputEngine - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \instantiates QtVirtualKeyboard::InputEngine \brief Maps the user input to the input methods. @@ -123,10 +131,12 @@ private: /*! \class QtVirtualKeyboard::InputEngine - \inmodule InputFramework + \inmodule QtVirtualKeyboard \brief The InputEngine class provides an input engine that supports C++ and QML integration. + \internal + The input engine is responsible for routing input events to input methods. The actual input logic is implemented by the input methods. @@ -364,16 +374,17 @@ void InputEngine::setInputMethod(AbstractInputMethod *inputMethod) d->inputMethod->setTextCase(d->textCase); // Allocate selection lists for the input method - QList<SelectionListModel::Type> activeSelectionLists = d->inputMethod->selectionLists(); + const QList<SelectionListModel::Type> activeSelectionLists = d->inputMethod->selectionLists(); QList<SelectionListModel::Type> inactiveSelectionLists = d->selectionListModels.keys(); - foreach (const SelectionListModel::Type &selectionListType, activeSelectionLists) { - if (!d->selectionListModels.contains(selectionListType)) { - d->selectionListModels[selectionListType] = new SelectionListModel(this); + for (const SelectionListModel::Type &selectionListType : activeSelectionLists) { + auto it = d->selectionListModels.find(selectionListType); + if (it == d->selectionListModels.end()) { + it = d->selectionListModels.insert(selectionListType, new SelectionListModel(this)); if (selectionListType == SelectionListModel::WordCandidateList) { emit wordCandidateListModelChanged(); } } - d->selectionListModels[selectionListType]->setDataSource(inputMethod, selectionListType); + it.value()->setDataSource(inputMethod, selectionListType); if (selectionListType == SelectionListModel::WordCandidateList) { emit wordCandidateListVisibleHintChanged(); } @@ -381,9 +392,10 @@ void InputEngine::setInputMethod(AbstractInputMethod *inputMethod) } // Deallocate inactive selection lists - foreach (const SelectionListModel::Type &selectionListType, inactiveSelectionLists) { - if (d->selectionListModels.contains(selectionListType)) { - d->selectionListModels[selectionListType]->setDataSource(0, selectionListType); + for (const SelectionListModel::Type &selectionListType : qAsConst(inactiveSelectionLists)) { + const auto it = d->selectionListModels.constFind(selectionListType); + if (it != d->selectionListModels.cend()) { + it.value()->setDataSource(0, selectionListType); if (selectionListType == SelectionListModel::WordCandidateList) { emit wordCandidateListVisibleHintChanged(); } @@ -406,13 +418,13 @@ QList<int> InputEngine::inputModes() const if (d->inputMethod) { inputModeList = d->inputMethod->inputModes(d->inputContext->locale()); } + QList<int> resultList; if (inputModeList.isEmpty()) { - return QList<int>(); + return resultList; } - QList<int> resultList; - foreach (const InputMode &inputMode, inputModeList) { + resultList.reserve(inputModeList.size()); + for (const InputMode &inputMode : qAsConst(inputModeList)) resultList.append(inputMode); - } return resultList; } @@ -450,9 +462,10 @@ SelectionListModel *InputEngine::wordCandidateListModel() const bool InputEngine::wordCandidateListVisibleHint() const { Q_D(const InputEngine); - if (!d->selectionListModels.contains(SelectionListModel::WordCandidateList)) + const auto it = d->selectionListModels.constFind(SelectionListModel::WordCandidateList); + if (it == d->selectionListModels.cend()) return false; - return d->selectionListModels[SelectionListModel::WordCandidateList]->dataSource() != 0; + return it.value()->dataSource() != 0; } /*! @@ -464,17 +477,18 @@ QList<int> InputEngine::patternRecognitionModes() const QList<PatternRecognitionMode> patterRecognitionModeList; if (d->inputMethod) patterRecognitionModeList = d->inputMethod->patternRecognitionModes(); - if (patterRecognitionModeList.isEmpty()) - return QList<int>(); QList<int> resultList; - foreach (const PatternRecognitionMode &patternRecognitionMode, patterRecognitionModeList) + if (patterRecognitionModeList.isEmpty()) + return resultList; + resultList.reserve(patterRecognitionModeList.size()); + for (const PatternRecognitionMode &patternRecognitionMode : qAsConst(patterRecognitionModeList)) resultList.append(patternRecognitionMode); return resultList; } /*! \qmlmethod Trace InputEngine::traceBegin(int traceId, int patternRecognitionMode, var traceCaptureDeviceInfo, var traceScreenInfo) - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 Starts a trace interaction with the input engine. @@ -494,7 +508,7 @@ QList<int> InputEngine::patternRecognitionModes() const The trace interaction is ended by calling the \l {InputEngine::traceEnd()} {InputEngine.traceEnd()} method. */ /*! - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 Starts a trace interaction with the input engine. @@ -563,7 +577,7 @@ bool InputEngine::traceEnd(QtVirtualKeyboard::Trace *trace) } /*! - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 This function attempts to reselect a word located at the \a cursorPosition. The \a reselectFlags define the rules for how the word should be selected in @@ -839,14 +853,14 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) /*! \qmlproperty list<int> InputEngine::patternRecognitionModes - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 The list of available pattern recognition modes. */ /*! \property QtVirtualKeyboard::InputEngine::patternRecognitionModes - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 \brief the list of available pattern recognition modes. The list of available pattern recognition modes. @@ -946,7 +960,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) /*! \qmlsignal void InputEngine::patternRecognitionModesChanged() - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 Indicates that the available pattern recognition modes have changed. @@ -960,7 +974,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) /*! \fn void QtVirtualKeyboard::InputEngine::patternRecognitionModesChanged() - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 Indicates that the available pattern recognition modes have changed. */ diff --git a/src/virtualkeyboard/inputengine.h b/src/virtualkeyboard/inputengine.h index 3ad4d7ab..266541fb 100644 --- a/src/virtualkeyboard/inputengine.h +++ b/src/virtualkeyboard/inputengine.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef INPUTENGINE_H #define INPUTENGINE_H diff --git a/src/virtualkeyboard/inputmethod.cpp b/src/virtualkeyboard/inputmethod.cpp index a1a7398a..7c91ab2f 100644 --- a/src/virtualkeyboard/inputmethod.cpp +++ b/src/virtualkeyboard/inputmethod.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "inputmethod.h" #include "trace.h" @@ -28,7 +36,7 @@ namespace QtVirtualKeyboard { /*! \qmltype InputMethod \instantiates QtVirtualKeyboard::InputMethod - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \brief Base type for creating input method in QML. @@ -156,7 +164,7 @@ namespace QtVirtualKeyboard { /*! \qmlmethod list<int> InputMethod::patternRecognitionModes() - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 Returns list of supported pattern recognition modes. @@ -166,7 +174,7 @@ namespace QtVirtualKeyboard { /*! \qmlmethod Trace InputMethod::traceBegin(int traceId, int patternRecognitionMode, var traceCaptureDeviceInfo, var traceScreenInfo) - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 This method is called when a trace interaction starts with the specified \a patternRecognitionMode. The trace is uniquely identified by the \a traceId. @@ -181,7 +189,7 @@ namespace QtVirtualKeyboard { /*! \qmlmethod bool InputMethod::traceEnd(Trace trace) - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 This method is called when the trace interaction ends. The input method should destroy the \a trace object at some point after this function is called. See the \l Trace API how to access the gathered @@ -190,7 +198,7 @@ namespace QtVirtualKeyboard { /*! \qmlmethod bool InputMethod::reselect(int cursorPosition, int reselectFlags) - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 This method attempts to reselect a word located at the \a cursorPosition. The \a reselectFlags define the rules for how the word should be selected in @@ -226,9 +234,10 @@ QList<InputEngine::InputMode> InputMethod::inputModes(const QString &locale) Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, locale)); QList<InputEngine::InputMode> inputModeList; - foreach (const QVariant &inputMode, result.toList()) { + const auto resultList = result.toList(); + inputModeList.reserve(resultList.size()); + for (const QVariant &inputMode : resultList) inputModeList.append(static_cast<InputEngine::InputMode>(inputMode.toInt())); - } return inputModeList; } @@ -268,9 +277,11 @@ QList<SelectionListModel::Type> InputMethod::selectionLists() QMetaObject::invokeMethod(this, "selectionLists", Q_RETURN_ARG(QVariant, result)); QList<SelectionListModel::Type> selectionListsList; - foreach (const QVariant &selectionListType, result.toList()) { + const auto resultList = result.toList(); + selectionListsList.reserve(resultList.size()); + for (const QVariant &selectionListType : resultList) selectionListsList.append(static_cast<SelectionListModel::Type>(selectionListType.toInt())); - } + return selectionListsList; } @@ -310,9 +321,11 @@ QList<InputEngine::PatternRecognitionMode> InputMethod::patternRecognitionModes( QMetaObject::invokeMethod(const_cast<InputMethod *>(this), "patternRecognitionModes", Q_RETURN_ARG(QVariant, result)); QList<InputEngine::PatternRecognitionMode> patterRecognitionModeList; - foreach (const QVariant &patterRecognitionMode, result.toList()) { + const auto resultList = result.toList(); + patterRecognitionModeList.reserve(resultList.size()); + for (const QVariant &patterRecognitionMode : resultList) patterRecognitionModeList.append(static_cast<InputEngine::PatternRecognitionMode>(patterRecognitionMode.toInt())); - } + return patterRecognitionModeList; } diff --git a/src/virtualkeyboard/inputmethod.h b/src/virtualkeyboard/inputmethod.h index 4f225029..05159b88 100644 --- a/src/virtualkeyboard/inputmethod.h +++ b/src/virtualkeyboard/inputmethod.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef INPUTMETHOD_H #define INPUTMETHOD_H diff --git a/src/virtualkeyboard/inputview.cpp b/src/virtualkeyboard/inputview.cpp index f180fec6..07f0f4ec 100644 --- a/src/virtualkeyboard/inputview.cpp +++ b/src/virtualkeyboard/inputview.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "inputview.h" diff --git a/src/virtualkeyboard/inputview.h b/src/virtualkeyboard/inputview.h index e3a29471..b1e93fd8 100644 --- a/src/virtualkeyboard/inputview.h +++ b/src/virtualkeyboard/inputview.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef INPUTVIEW_H #define INPUTVIEW_H diff --git a/src/virtualkeyboard/lipiinputmethod.cpp b/src/virtualkeyboard/lipiinputmethod.cpp index 4f832573..30ee9ed4 100644 --- a/src/virtualkeyboard/lipiinputmethod.cpp +++ b/src/virtualkeyboard/lipiinputmethod.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "lipiinputmethod.h" #include "lipisharedrecognizer.h" @@ -181,7 +189,7 @@ public: int countActiveTraces() const { int count = 0; - foreach (Trace *trace, traceList) { + for (Trace *trace : qAsConst(traceList)) { if (!trace->isFinal()) count++; } @@ -374,7 +382,7 @@ public: bool matchesToExisting = true; const qreal minimumSwipeLength = (swipeLength * (100.0 - MAXIMUM_WIDTH_VARIANCE) / 100.0); const qreal maximumSwipeLength = (swipeLength * (100.0 + MAXIMUM_WIDTH_VARIANCE) / 100.0); - foreach (const QVector2D &otherSwipeVector, swipeVectors) { + for (const QVector2D &otherSwipeVector : qAsConst(swipeVectors)) { const qreal otherSwipeLength = otherSwipeVector.length(); const qreal theta = qAcos(QVector2D::dotProduct(swipeVector, otherSwipeVector) / (swipeLength * otherSwipeLength)); @@ -460,7 +468,7 @@ public: const QVariantList points = trace->points(); const QVariantList timeData = hasTime ? trace->channelData("t") : QVariantList(); QVariantList::ConstIterator t = timeData.constBegin(); - foreach (const QVariant &p, points) { + for (const QVariant &p : points) { const QPointF pt(p.toPointF()); vector<float> point; point.push_back(pt.x()); @@ -574,7 +582,7 @@ public: recordedData.append(QStringLiteral(".POINTS_PER_SECOND %1").arg(deviceInfo->getSamplingRate())); qlonglong t0 = 0; - foreach (const Trace *trace, traceList) { + for (const Trace *trace : qAsConst(traceList)) { const QVariantList &points = trace->points(); const bool hasTime = trace->channels().contains("t"); const QVariantList timeData = hasTime ? trace->channelData("t") : QVariantList(); @@ -584,7 +592,7 @@ public: recordedData.append(QStringLiteral(".PEN_DOWN")); - foreach (const QVariant &point, points) { + for (const QVariant &point : points) { const QPointF pt(point.toPointF()); QString pointStr(QStringLiteral("%1 %2 ").arg(qRound(pt.x())).arg(qRound(pt.y()))); if (hasTime) { @@ -613,7 +621,7 @@ public: int fileIndex = 0; do { fileName = fileDir.absoluteFilePath(QStringLiteral("%1_%2_%3.txt").arg(unicode).arg(confidence, 3, 10, QLatin1Char('0')).arg(fileIndex++)); - } while (QFileInfo(fileName).exists()); + } while (QFileInfo::exists(fileName)); } } QString dataStr(recordedData.join('\n')); diff --git a/src/virtualkeyboard/lipiinputmethod.h b/src/virtualkeyboard/lipiinputmethod.h index 8826f731..cbb211ba 100644 --- a/src/virtualkeyboard/lipiinputmethod.h +++ b/src/virtualkeyboard/lipiinputmethod.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef LIPIINPUTMETHOD_H #define LIPIINPUTMETHOD_H diff --git a/src/virtualkeyboard/lipisharedrecognizer.cpp b/src/virtualkeyboard/lipisharedrecognizer.cpp index e75042f8..156eb8ab 100644 --- a/src/virtualkeyboard/lipisharedrecognizer.cpp +++ b/src/virtualkeyboard/lipisharedrecognizer.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "lipisharedrecognizer.h" #include "virtualkeyboarddebug.h" @@ -262,7 +270,7 @@ int LipiSharedRecognizer::loadLipiEngineConfig() s_lipiEngineConfigEntries.clear(); const QString &lipiEngineConfigFile(QDir::toNativeSeparators(QString("%1/projects/lipiengine.cfg").arg(s_lipiRoot))); - if (!QFileInfo(lipiEngineConfigFile).exists()) { + if (!QFileInfo::exists(lipiEngineConfigFile)) { qWarning() << "File not found" << lipiEngineConfigFile; return FAILURE; } diff --git a/src/virtualkeyboard/lipisharedrecognizer.h b/src/virtualkeyboard/lipisharedrecognizer.h index c82b8f42..5bfb6ec6 100644 --- a/src/virtualkeyboard/lipisharedrecognizer.h +++ b/src/virtualkeyboard/lipisharedrecognizer.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef LIPISHAREDRECOGNIZER_H #define LIPISHAREDRECOGNIZER_H diff --git a/src/virtualkeyboard/lipiworker.cpp b/src/virtualkeyboard/lipiworker.cpp index 07ae5dbb..89a202c0 100644 --- a/src/virtualkeyboard/lipiworker.cpp +++ b/src/virtualkeyboard/lipiworker.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "lipiworker.h" #include "virtualkeyboarddebug.h" diff --git a/src/virtualkeyboard/lipiworker.h b/src/virtualkeyboard/lipiworker.h index 447c23de..3f84ec9f 100644 --- a/src/virtualkeyboard/lipiworker.h +++ b/src/virtualkeyboard/lipiworker.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef LIPIWORKER_H #define LIPIWORKER_H diff --git a/src/virtualkeyboard/openwnninputmethod.cpp b/src/virtualkeyboard/openwnninputmethod.cpp index 0a3c7bde..8e5a1aaa 100644 --- a/src/virtualkeyboard/openwnninputmethod.cpp +++ b/src/virtualkeyboard/openwnninputmethod.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "openwnninputmethod.h" #include "inputcontext.h" diff --git a/src/virtualkeyboard/openwnninputmethod.h b/src/virtualkeyboard/openwnninputmethod.h index 149b0c74..30d7d0f7 100644 --- a/src/virtualkeyboard/openwnninputmethod.h +++ b/src/virtualkeyboard/openwnninputmethod.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef OPENWNNINPUTMETHOD_H #define OPENWNNINPUTMETHOD_H diff --git a/src/virtualkeyboard/pinyindecoderservice.cpp b/src/virtualkeyboard/pinyindecoderservice.cpp index fea5008e..d531560a 100644 --- a/src/virtualkeyboard/pinyindecoderservice.cpp +++ b/src/virtualkeyboard/pinyindecoderservice.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "pinyindecoderservice.h" #include "pinyinime.h" diff --git a/src/virtualkeyboard/pinyindecoderservice.h b/src/virtualkeyboard/pinyindecoderservice.h index e7940736..1db1d503 100644 --- a/src/virtualkeyboard/pinyindecoderservice.h +++ b/src/virtualkeyboard/pinyindecoderservice.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef PINYINDECODERSERVICE_H #define PINYINDECODERSERVICE_H diff --git a/src/virtualkeyboard/pinyininputmethod.cpp b/src/virtualkeyboard/pinyininputmethod.cpp index f7df0a7a..3181b438 100644 --- a/src/virtualkeyboard/pinyininputmethod.cpp +++ b/src/virtualkeyboard/pinyininputmethod.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "pinyininputmethod.h" #include "pinyindecoderservice.h" diff --git a/src/virtualkeyboard/pinyininputmethod.h b/src/virtualkeyboard/pinyininputmethod.h index 3d432e00..08837f2f 100644 --- a/src/virtualkeyboard/pinyininputmethod.h +++ b/src/virtualkeyboard/pinyininputmethod.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef PINYININPUTMETHOD_H #define PINYININPUTMETHOD_H diff --git a/src/virtualkeyboard/plaininputmethod.cpp b/src/virtualkeyboard/plaininputmethod.cpp index 9c6e68cf..29c560da 100644 --- a/src/virtualkeyboard/plaininputmethod.cpp +++ b/src/virtualkeyboard/plaininputmethod.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "plaininputmethod.h" #include "inputengine.h" diff --git a/src/virtualkeyboard/plaininputmethod.h b/src/virtualkeyboard/plaininputmethod.h index 479e0d78..cc1f9a50 100644 --- a/src/virtualkeyboard/plaininputmethod.h +++ b/src/virtualkeyboard/plaininputmethod.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef PLAININPUTMETHOD_H #define PLAININPUTMETHOD_H diff --git a/src/virtualkeyboard/platforminputcontext.cpp b/src/virtualkeyboard/platforminputcontext.cpp index ac808e84..79ec64e5 100644 --- a/src/virtualkeyboard/platforminputcontext.cpp +++ b/src/virtualkeyboard/platforminputcontext.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "platforminputcontext.h" #include "inputcontext.h" diff --git a/src/virtualkeyboard/platforminputcontext.h b/src/virtualkeyboard/platforminputcontext.h index a35e2a07..12db3c3f 100644 --- a/src/virtualkeyboard/platforminputcontext.h +++ b/src/virtualkeyboard/platforminputcontext.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef PLATFORMINPUTCONTEXT_H #define PLATFORMINPUTCONTEXT_H diff --git a/src/virtualkeyboard/plugin.cpp b/src/virtualkeyboard/plugin.cpp index 8acbb64e..da39c0af 100644 --- a/src/virtualkeyboard/plugin.cpp +++ b/src/virtualkeyboard/plugin.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "plugin.h" #include "inputcontext.h" @@ -65,10 +73,12 @@ using namespace QtVirtualKeyboard; +Q_LOGGING_CATEGORY(qlcVirtualKeyboard, "qt.virtualkeyboard") + static const char pluginName[] = "qtvirtualkeyboard"; static const char inputMethodEnvVarName[] = "QT_IM_MODULE"; -static const char pluginUri[] = "QtQuick.Enterprise.VirtualKeyboard"; -static const char pluginSettingsUri[] = "QtQuick.Enterprise.VirtualKeyboard.Settings"; +static const char pluginUri[] = "QtQuick.VirtualKeyboard"; +static const char pluginSettingsUri[] = "QtQuick.VirtualKeyboard.Settings"; static QPointer<PlatformInputContext> platformInputContext; @@ -174,12 +184,14 @@ QPlatformInputContext *QVirtualKeyboardPlugin::create(const QString &system, con qmlRegisterSingletonType<VirtualKeyboardSettings>(pluginSettingsUri, 1, 1, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule); qmlRegisterSingletonType<VirtualKeyboardSettings>(pluginSettingsUri, 1, 2, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule); qmlRegisterSingletonType<VirtualKeyboardSettings>(pluginSettingsUri, 2, 0, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule); + qmlRegisterSingletonType<VirtualKeyboardSettings>(pluginSettingsUri, 2, 1, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule); - const QString path(QStringLiteral("qrc:///QtQuick/Enterprise/VirtualKeyboard/content/")); + const QString path(QStringLiteral("qrc:///QtQuick/VirtualKeyboard/content/")); qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), pluginUri, 1, 0, "InputPanel"); qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), pluginUri, 1, 2, "InputPanel"); qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), pluginUri, 1, 3, "InputPanel"); qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), pluginUri, 2, 0, "InputPanel"); + qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), pluginUri, 2, 1, "InputPanel"); qmlRegisterType(QUrl(path + QLatin1String("HandwritingInputPanel.qml")), pluginUri, 2, 0, "HandwritingInputPanel"); const QString componentsPath = path + QStringLiteral("components/"); qmlRegisterType(QUrl(componentsPath + QLatin1String("AlternativeKeys.qml")), pluginUri, 1, 0, "AlternativeKeys"); @@ -227,6 +239,7 @@ QPlatformInputContext *QVirtualKeyboardPlugin::create(const QString &system, con qmlRegisterType(QUrl(componentsPath + QLatin1String("TraceInputArea.qml")), pluginUri, 2, 0, "TraceInputArea"); qmlRegisterType(QUrl(componentsPath + QLatin1String("TraceInputKey.qml")), pluginUri, 2, 0, "TraceInputKey"); qmlRegisterType(QUrl(componentsPath + QLatin1String("WordCandidatePopupList.qml")), pluginUri, 2, 0, "WordCandidatePopupList"); + qmlRegisterType(QUrl(componentsPath + QLatin1String("SelectionControl.qml")), pluginUri, 2, 1, "SelectionControl"); if (system.compare(system, QLatin1String(pluginName), Qt::CaseInsensitive) == 0) { platformInputContext = new PlatformInputContext(); diff --git a/src/virtualkeyboard/plugin.h b/src/virtualkeyboard/plugin.h index b2b78483..08074d19 100644 --- a/src/virtualkeyboard/plugin.h +++ b/src/virtualkeyboard/plugin.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef PLUGIN_H #define PLUGIN_H diff --git a/src/virtualkeyboard/selectionlistmodel.cpp b/src/virtualkeyboard/selectionlistmodel.cpp index 2135cdd2..88f79ff7 100644 --- a/src/virtualkeyboard/selectionlistmodel.cpp +++ b/src/virtualkeyboard/selectionlistmodel.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "selectionlistmodel.h" #include "abstractinputmethod.h" @@ -45,7 +53,7 @@ public: /*! \qmltype SelectionListModel \instantiates QtVirtualKeyboard::SelectionListModel - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \brief Provides a data model for the selection lists. @@ -75,10 +83,12 @@ public: /*! \class QtVirtualKeyboard::SelectionListModel - \inmodule InputFramework + \inmodule QtVirtualKeyboard \brief List model for selection lists. + \internal + This class acts as a bridge between the UI and the input method that provides the data for selection lists. diff --git a/src/virtualkeyboard/selectionlistmodel.h b/src/virtualkeyboard/selectionlistmodel.h index eccd06b8..e78e64d4 100644 --- a/src/virtualkeyboard/selectionlistmodel.h +++ b/src/virtualkeyboard/selectionlistmodel.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef SELECTIONLISTMODEL_H #define SELECTIONLISTMODEL_H diff --git a/src/virtualkeyboard/settings.cpp b/src/virtualkeyboard/settings.cpp index 14500ef2..f0d07d27 100644 --- a/src/virtualkeyboard/settings.cpp +++ b/src/virtualkeyboard/settings.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "settings.h" #include <QtCore/private/qobject_p.h> diff --git a/src/virtualkeyboard/settings.h b/src/virtualkeyboard/settings.h index 96200f28..e696a3bc 100644 --- a/src/virtualkeyboard/settings.h +++ b/src/virtualkeyboard/settings.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef SETTINGS_H #define SETTINGS_H diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp index 22302129..d6252fa9 100644 --- a/src/virtualkeyboard/shifthandler.cpp +++ b/src/virtualkeyboard/shifthandler.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "shifthandler.h" #include "inputcontext.h" @@ -58,7 +66,7 @@ public: /*! \qmltype ShiftHandler - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \instantiates QtVirtualKeyboard::ShiftHandler \brief Manages the shift state. @@ -66,8 +74,10 @@ public: /*! \class QtVirtualKeyboard::ShiftHandler - \inmodule InputFramework + \inmodule QtVirtualKeyboard \brief Manages the shift state. + + \internal */ ShiftHandler::ShiftHandler(InputContext *parent) : diff --git a/src/virtualkeyboard/shifthandler.h b/src/virtualkeyboard/shifthandler.h index f6f2e795..4e63a946 100644 --- a/src/virtualkeyboard/shifthandler.h +++ b/src/virtualkeyboard/shifthandler.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef SHIFTHANDLER_H #define SHIFTHANDLER_H diff --git a/src/virtualkeyboard/styles/KeyIcon.qml b/src/virtualkeyboard/styles/KeyIcon.qml index f7da7984..645fe11e 100644 --- a/src/virtualkeyboard/styles/KeyIcon.qml +++ b/src/virtualkeyboard/styles/KeyIcon.qml @@ -1,29 +1,37 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype KeyIcon - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles + \inqmlmodule QtQuick.VirtualKeyboard.Styles \brief Key icon with adjustable color. \ingroup qtvirtualkeyboard-styles-qml diff --git a/src/virtualkeyboard/styles/KeyPanel.qml b/src/virtualkeyboard/styles/KeyPanel.qml index b1980c9f..68bb0850 100644 --- a/src/virtualkeyboard/styles/KeyPanel.qml +++ b/src/virtualkeyboard/styles/KeyPanel.qml @@ -1,29 +1,37 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype KeyPanel - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles + \inqmlmodule QtQuick.VirtualKeyboard.Styles \brief A base type of the styled keys. \ingroup qtvirtualkeyboard-styles-qml @@ -51,7 +59,7 @@ Item { property Item control /*! - \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.1 + \since QtQuick.VirtualKeyboard.Styles 1.1 Sets the sound effect to be played on key press. */ diff --git a/src/virtualkeyboard/styles/KeyboardStyle.qml b/src/virtualkeyboard/styles/KeyboardStyle.qml index 50add72b..5e92aeb7 100644 --- a/src/virtualkeyboard/styles/KeyboardStyle.qml +++ b/src/virtualkeyboard/styles/KeyboardStyle.qml @@ -1,29 +1,37 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype KeyboardStyle - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles + \inqmlmodule QtQuick.VirtualKeyboard.Styles \brief Provides a styling interface for the Virtual Keyboard. \ingroup qtvirtualkeyboard-styles-qml @@ -266,14 +274,14 @@ QtObject { /*! Template for the selection list background. */ property Component selectionListBackground: null - /*! \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.3 + /*! \since QtQuick.VirtualKeyboard.Styles 1.3 This property holds the transition to apply to items that are added to the selection list view. */ property Transition selectionListAdd - /*! \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.3 + /*! \since QtQuick.VirtualKeyboard.Styles 1.3 This property holds the transition to apply to items that are removed from the selection list view. @@ -281,7 +289,7 @@ QtObject { property Transition selectionListRemove /*! - \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.1 + \since QtQuick.VirtualKeyboard.Styles 1.1 Template for the navigation highlight item. @@ -294,7 +302,7 @@ QtObject { property Component navigationHighlight: null /*! - \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0 + \since QtQuick.VirtualKeyboard.Styles 2.1 Template for the trace input key. @@ -303,7 +311,7 @@ QtObject { property Component traceInputKeyPanelDelegate: null /*! - \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0 + \since QtQuick.VirtualKeyboard.Styles 2.1 Template for rendering a Trace object. @@ -311,7 +319,7 @@ QtObject { */ property Component traceCanvasDelegate: null - /*! \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0 + /*! \since QtQuick.VirtualKeyboard.Styles 2.1 Template for the popup list item. @@ -326,7 +334,7 @@ QtObject { */ property Component popupListDelegate: null - /*! \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0 + /*! \since QtQuick.VirtualKeyboard.Styles 2.1 Template for the popup list highlight. @@ -334,23 +342,35 @@ QtObject { */ property Component popupListHighlight: null - /*! \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0 + /*! \since QtQuick.VirtualKeyboard.Styles 2.1 Template for the popup list background. */ property Component popupListBackground: null - /*! \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0 + /*! \since QtQuick.VirtualKeyboard.Styles 2.1 This property holds the transition to apply to items that are added to the popup list view. */ property Transition popupListAdd - /*! \since QtQuick.Enterprise.VirtualKeyboard.Styles 2.0 + /*! \since QtQuick.VirtualKeyboard.Styles 2.1 This property holds the transition to apply to items that are removed from the popup list view. */ property Transition popupListRemove + + /*! + \since QtQuick.VirtualKeyboard.Styles 2.1 + + This item is used to indicate where the bounds of the text selection is + and to be able to interactively move the start or end of the selection. + The same item is used for both start and end selection. + + Selection handles are currently only supported for the + \l {Integration Method}{application-based integration method}. + */ + property Component selectionHandle: null } diff --git a/src/virtualkeyboard/styles/SelectionListItem.qml b/src/virtualkeyboard/styles/SelectionListItem.qml index 0f6dc723..f3c9fdc9 100644 --- a/src/virtualkeyboard/styles/SelectionListItem.qml +++ b/src/virtualkeyboard/styles/SelectionListItem.qml @@ -1,29 +1,37 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype SelectionListItem - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles + \inqmlmodule QtQuick.VirtualKeyboard.Styles \brief A base type for selection list item delegates. \ingroup qtvirtualkeyboard-styles-qml @@ -36,7 +44,7 @@ Item { height: parent.height /*! - \since QtQuick.Enterprise.VirtualKeyboard.Styles 1.1 + \since QtQuick.VirtualKeyboard.Styles 1.1 Sets the sound effect to be played on touch event. */ diff --git a/src/virtualkeyboard/styles/TraceCanvas.qml b/src/virtualkeyboard/styles/TraceCanvas.qml index f9a0ed08..ffee8538 100644 --- a/src/virtualkeyboard/styles/TraceCanvas.qml +++ b/src/virtualkeyboard/styles/TraceCanvas.qml @@ -1,34 +1,42 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 import "TraceUtils.js" as TraceUtils /*! \qmltype TraceCanvas - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles + \inqmlmodule QtQuick.VirtualKeyboard.Styles \brief A specialized Canvas type for rendering Trace objects. \ingroup qtvirtualkeyboard-styles-qml \inherits Canvas - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 This type provides capabilities for rendering Trace objects on the screen. diff --git a/src/virtualkeyboard/styles/TraceInputKeyPanel.qml b/src/virtualkeyboard/styles/TraceInputKeyPanel.qml index 2ddfcaf6..d128a12b 100644 --- a/src/virtualkeyboard/styles/TraceInputKeyPanel.qml +++ b/src/virtualkeyboard/styles/TraceInputKeyPanel.qml @@ -1,32 +1,40 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtQuick 2.0 /*! \qmltype TraceInputKeyPanel - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles + \inqmlmodule QtQuick.VirtualKeyboard.Styles \brief A base type of the trace input key. \ingroup qtvirtualkeyboard-styles-qml - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 This type provides panel for decorating TraceInputKey items in the keyboard layout. diff --git a/src/virtualkeyboard/styles/TraceUtils.js b/src/virtualkeyboard/styles/TraceUtils.js index 57bb0059..f2dd9bbb 100644 --- a/src/virtualkeyboard/styles/TraceUtils.js +++ b/src/virtualkeyboard/styles/TraceUtils.js @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ .pragma library diff --git a/src/virtualkeyboard/styles/qmldir b/src/virtualkeyboard/styles/qmldir index b3c810d5..26544a54 100644 --- a/src/virtualkeyboard/styles/qmldir +++ b/src/virtualkeyboard/styles/qmldir @@ -1,4 +1,4 @@ -module QtQuick.Enterprise.VirtualKeyboard.Styles +module QtQuick.VirtualKeyboard.Styles plugin qtvirtualkeyboardstylesplugin classname QtVirtualKeyboardStylesPlugin typeinfo plugins.qmltypes diff --git a/src/virtualkeyboard/styles/styles.pro b/src/virtualkeyboard/styles/styles.pro index e21ce779..f5ce051f 100644 --- a/src/virtualkeyboard/styles/styles.pro +++ b/src/virtualkeyboard/styles/styles.pro @@ -1,8 +1,6 @@ -TEMPLATE = lib TARGET = qtvirtualkeyboardstylesplugin -TARGETPATH = QtQuick/Enterprise/VirtualKeyboard/Styles +TARGETPATH = QtQuick/VirtualKeyboard/Styles QT += qml quick svg -CONFIG += plugin CONFIG += no_cxx_module @@ -14,15 +12,10 @@ HEADERS += \ svgimageprovider.h \ styles_plugin.h -OTHER_FILES += \ - *.qml - RESOURCES += \ styles.qrc win32 { - CONFIG += skip_target_version_ext - VERSION = $$QT_VERSION QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard (Qt $$QT_VERSION)" QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard for Qt." } diff --git a/src/virtualkeyboard/styles/styles.qrc b/src/virtualkeyboard/styles/styles.qrc index df80b80b..39ca357b 100644 --- a/src/virtualkeyboard/styles/styles.qrc +++ b/src/virtualkeyboard/styles/styles.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/QtQuick/Enterprise/VirtualKeyboard/Styles/content"> + <qresource prefix="/QtQuick/VirtualKeyboard/Styles/content"> <file>KeyboardStyle.qml</file> <file>KeyIcon.qml</file> <file>KeyPanel.qml</file> diff --git a/src/virtualkeyboard/styles/styles_plugin.cpp b/src/virtualkeyboard/styles/styles_plugin.cpp index 495eebd2..975ab401 100644 --- a/src/virtualkeyboard/styles/styles_plugin.cpp +++ b/src/virtualkeyboard/styles/styles_plugin.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "styles_plugin.h" #include "svgimageprovider.h" @@ -26,20 +34,30 @@ #include <QtCore/QLibraryInfo> /*! - \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles 2.0 + \qmlmodule QtQuick.VirtualKeyboard.Styles 2.0 + \title Qt Quick Virtual Keyboard Styles QML Types + \ingroup qmlmodules + + \brief Provides styling for Qt Virtual Keyboard. + + The QML types can be imported into your application using the following + import statements in your .qml file: - This module provides styling components for the Qt Virtual Keyboard. + \badcode + import QtQuick.VirtualKeyboard.Styles 2.0 + \endcode */ void QtVirtualKeyboardStylesPlugin::registerTypes(const char *uri) { Q_INIT_RESOURCE(styles); - const QString path(QStringLiteral("qrc:///QtQuick/Enterprise/VirtualKeyboard/Styles/content/")); + const QString path(QStringLiteral("qrc:///QtQuick/VirtualKeyboard/Styles/content/")); qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 1, 0, "KeyboardStyle"); qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 1, 1, "KeyboardStyle"); qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 1, 2, "KeyboardStyle"); qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 1, 3, "KeyboardStyle"); qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 2, 0, "KeyboardStyle"); + qmlRegisterType(QUrl(path + QLatin1String("KeyboardStyle.qml")), uri, 2, 1, "KeyboardStyle"); qmlRegisterType(QUrl(path + QLatin1String("KeyIcon.qml")), uri, 1, 0, "KeyIcon"); qmlRegisterType(QUrl(path + QLatin1String("KeyIcon.qml")), uri, 2, 0, "KeyIcon"); qmlRegisterType(QUrl(path + QLatin1String("KeyPanel.qml")), uri, 1, 0, "KeyPanel"); diff --git a/src/virtualkeyboard/styles/styles_plugin.h b/src/virtualkeyboard/styles/styles_plugin.h index becf7e92..c6d89975 100644 --- a/src/virtualkeyboard/styles/styles_plugin.h +++ b/src/virtualkeyboard/styles/styles_plugin.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef STYLES_PLUGIN_H #define STYLES_PLUGIN_H diff --git a/src/virtualkeyboard/styles/svgimageprovider.cpp b/src/virtualkeyboard/styles/svgimageprovider.cpp index 9df9c1db..1dd2930f 100644 --- a/src/virtualkeyboard/styles/svgimageprovider.cpp +++ b/src/virtualkeyboard/styles/svgimageprovider.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "svgimageprovider.h" #include <QImage> @@ -43,20 +51,22 @@ QPixmap SvgImageProvider::requestPixmap(const QString &id, QSize *size, const QS const QString query = request.query(); const QStringList paramList = query.split(QChar('&'), QString::SkipEmptyParts); QVariantMap params; - foreach (const QString ¶m, paramList) { + for (const QString ¶m : paramList) { QStringList keyValue = param.split(QChar('='), QString::SkipEmptyParts); if (keyValue.length() == 2) params[keyValue[0]] = keyValue[1]; } - if (params.contains("width")) { + const auto widthIt = params.constFind("width"); + if (widthIt != params.cend()) { bool ok = false; - int value = params["width"].toInt(&ok); + int value = widthIt.value().toInt(&ok); if (ok) imageSize.setWidth(value); } - if (params.contains("height")) { + const auto heightIt = params.constFind("height"); + if (heightIt != params.cend()) { bool ok = false; - int value = params["height"].toInt(&ok); + int value = heightIt.value().toInt(&ok); if (ok) imageSize.setHeight(value); } diff --git a/src/virtualkeyboard/styles/svgimageprovider.h b/src/virtualkeyboard/styles/svgimageprovider.h index d56f5c75..476689bf 100644 --- a/src/virtualkeyboard/styles/svgimageprovider.h +++ b/src/virtualkeyboard/styles/svgimageprovider.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef SVGIMAGEPROVIDER_H #define SVGIMAGEPROVIDER_H diff --git a/src/virtualkeyboard/t9writeinputmethod.cpp b/src/virtualkeyboard/t9writeinputmethod.cpp index a2f45c18..71a166b3 100644 --- a/src/virtualkeyboard/t9writeinputmethod.cpp +++ b/src/virtualkeyboard/t9writeinputmethod.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "t9writeinputmethod.h" #include "inputengine.h" @@ -645,7 +653,7 @@ public: int countActiveTraces() const { int count = 0; - foreach (Trace *trace, traceList) { + for (Trace *trace : qAsConst(traceList)) { if (!trace->isFinal()) count++; } @@ -666,7 +674,7 @@ public: DECUMA_UINT32 arcID = (DECUMA_UINT32)trace->traceId(); DECUMA_STATUS status; - foreach (const QVariant &p, points) { + for (const QVariant &p : points) { const QPoint pt(p.toPointF().toPoint()); status = decumaAddPoint(decumaSession, (DECUMA_COORD)pt.x(),(DECUMA_COORD)pt.y(), arcID); Q_ASSERT(status == decumaNoError); diff --git a/src/virtualkeyboard/t9writeinputmethod.h b/src/virtualkeyboard/t9writeinputmethod.h index dc033529..9b87ebdf 100644 --- a/src/virtualkeyboard/t9writeinputmethod.h +++ b/src/virtualkeyboard/t9writeinputmethod.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef T9WRITEINPUTMETHOD_H #define T9WRITEINPUTMETHOD_H diff --git a/src/virtualkeyboard/t9writeworker.cpp b/src/virtualkeyboard/t9writeworker.cpp index 53422a6c..733033ce 100644 --- a/src/virtualkeyboard/t9writeworker.cpp +++ b/src/virtualkeyboard/t9writeworker.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "t9writeworker.h" #include "virtualkeyboarddebug.h" diff --git a/src/virtualkeyboard/t9writeworker.h b/src/virtualkeyboard/t9writeworker.h index 476fec3c..9a6994ae 100644 --- a/src/virtualkeyboard/t9writeworker.h +++ b/src/virtualkeyboard/t9writeworker.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef T9WRITEWORKER_H #define T9WRITEWORKER_H diff --git a/src/virtualkeyboard/tcinputmethod.cpp b/src/virtualkeyboard/tcinputmethod.cpp index dbdf7241..8a7a415a 100644 --- a/src/virtualkeyboard/tcinputmethod.cpp +++ b/src/virtualkeyboard/tcinputmethod.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "tcinputmethod.h" #include "inputengine.h" diff --git a/src/virtualkeyboard/tcinputmethod.h b/src/virtualkeyboard/tcinputmethod.h index b2f4d2e0..94f0a045 100644 --- a/src/virtualkeyboard/tcinputmethod.h +++ b/src/virtualkeyboard/tcinputmethod.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef TCINPUTMETHOD_H #define TCINPUTMETHOD_H diff --git a/src/virtualkeyboard/trace.cpp b/src/virtualkeyboard/trace.cpp index 82a881f9..d87d0a5b 100644 --- a/src/virtualkeyboard/trace.cpp +++ b/src/virtualkeyboard/trace.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "trace.h" #include <QtCore/private/qobject_p.h> @@ -44,8 +52,9 @@ public: /*! \class QtVirtualKeyboard::Trace \inmodule qtvirtualkeyboard - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 \brief Trace is a data model for touch input data. + \internal Trace provides the data model for coordinate data and other optional data associated with a single stroke. @@ -106,9 +115,9 @@ public: /*! \qmltype Trace \instantiates QtVirtualKeyboard::Trace - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard + \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml - \since QtQuick.Enterprise.VirtualKeyboard 2.0 + \since QtQuick.VirtualKeyboard 2.0 \brief Trace is a data model for touch input data. Trace provides the data model for coordinate data and other diff --git a/src/virtualkeyboard/trace.h b/src/virtualkeyboard/trace.h index 4bc85d43..ca98e71d 100644 --- a/src/virtualkeyboard/trace.h +++ b/src/virtualkeyboard/trace.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef TRACE_H #define TRACE_H diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro index 152d6bec..44cd01b4 100644 --- a/src/virtualkeyboard/virtualkeyboard.pro +++ b/src/virtualkeyboard/virtualkeyboard.pro @@ -1,4 +1,3 @@ -TEMPLATE = lib TARGET = qtvirtualkeyboardplugin DATAPATH = $$[QT_INSTALL_DATA]/qtvirtualkeyboard @@ -7,10 +6,8 @@ include(doc/doc.pri) QT += qml quick gui gui-private core-private -CONFIG += plugin win32 { - CONFIG += no-pkg-config skip_target_version_ext - VERSION = $$QT_VERSION + CONFIG += no-pkg-config QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard (Qt $$QT_VERSION)" QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard for Qt." } @@ -200,7 +197,7 @@ OTHER_FILES += \ content/components/*.qml \ qtvirtualkeyboard.json -!disable-desktop:isEmpty(CROSS_COMPILE):!android-no-sdk:!qnx { +!disable-desktop:isEmpty(CROSS_COMPILE):!qnx { SOURCES += desktopinputpanel.cpp inputview.cpp HEADERS += desktopinputpanel.h inputview.h DEFINES += QT_VIRTUALKEYBOARD_DESKTOP @@ -214,33 +211,13 @@ HEADERS += appinputpanel.h qtquickcompiler: DEFINES += COMPILING_QML -build_pass { - CONFIG(debug, debug|release) { - SUBPATH = debug - win32: TARGET_SUFFIX = d - } else { - SUBPATH = release - } -} else { - !debug_and_release:win32:CONFIG(debug, debug|release): TARGET_SUFFIX = d -} - -static { - LIBS += \ - -L$$[QT_INSTALL_QML]/QtQuick.2 -lqtquick2plugin$$TARGET_SUFFIX \ - -L$$[QT_INSTALL_QML]/QtQuick/Window.2 -lwindowplugin$$TARGET_SUFFIX \ - -L$$[QT_INSTALL_QML]/QtQuick/Layouts -lqquicklayoutsplugin$$TARGET_SUFFIX \ - -L$$[QT_INSTALL_QML]/QtQuick/Enterprise/VirtualKeyboard/Styles -lqtvirtualkeyboardstylesplugin$$TARGET_SUFFIX \ - -L$$[QT_INSTALL_QML]/Qt/labs/folderlistmodel -lqmlfolderlistmodelplugin$$TARGET_SUFFIX -} - !disable-hunspell { exists(3rdparty/hunspell/src/hunspell/hunspell.h) { SOURCES += hunspellinputmethod.cpp hunspellinputmethod_p.cpp hunspellworker.cpp HEADERS += hunspellinputmethod.h hunspellinputmethod_p.h hunspellworker.h - DEFINES += HAVE_HUNSPELL + DEFINES += HAVE_HUNSPELL HUNSPELL_STATIC INCLUDEPATH += 3rdparty/hunspell/src - LIBS += -L$$OUT_PWD/3rdparty/hunspell/$$SUBPATH -lhunspell$$TARGET_SUFFIX + LIBS += -L$$OUT_PWD/../../lib -lqthunspell$$qtPlatformTargetSuffix() exists(3rdparty/hunspell/data) { hunspell_data.files = 3rdparty/hunspell/data/*.dic 3rdparty/hunspell/data/*.aff hunspell_data.path = $$DATAPATH/hunspell @@ -269,7 +246,7 @@ pinyin { pinyindecoderservice.h DEFINES += HAVE_PINYIN INCLUDEPATH += 3rdparty/pinyin/include - LIBS += -L$$OUT_PWD/3rdparty/pinyin/$$SUBPATH -lpinyin + LIBS += -L$$OUT_PWD/../../lib -lqtpinyin$$qtPlatformTargetSuffix() pinyin_data.files = $$PWD/3rdparty/pinyin/data/dict_pinyin.dat pinyin_data.path = $$DATAPATH/pinyin INSTALLS += pinyin_data @@ -285,7 +262,7 @@ tcime { cangjie: DEFINES += HAVE_TCIME_CANGJIE zhuyin: DEFINES += HAVE_TCIME_ZHUYIN INCLUDEPATH += 3rdparty/tcime - LIBS += -L$$OUT_PWD/3rdparty/tcime/$$SUBPATH -ltcime + LIBS += -L$$OUT_PWD/../../lib -lqttcime$$qtPlatformTargetSuffix() tcime_data.files = \ $$PWD/3rdparty/tcime/data/qt/dict_phrases.dat cangjie: tcime_data.files += \ @@ -313,7 +290,7 @@ openwnn { DEFINES += HAVE_OPENWNN INCLUDEPATH += 3rdparty/openwnn/wnnEngine/include # OpenWNN engine - LIBS += -L$$OUT_PWD/3rdparty/openwnn/$$SUBPATH -lopenwnn + LIBS += -L$$OUT_PWD/../../lib -lqtopenwnn$$qtPlatformTargetSuffix() } lipi-toolkit:t9write: \ @@ -356,7 +333,7 @@ t9write { t9writeworker.h DEFINES += HAVE_T9WRITE INCLUDEPATH += $$T9WRITE_INCLUDE_DIRS - LIBS += -L$$OUT_PWD/3rdparty/t9write/$$SUBPATH -lt9write_db + LIBS += -L$$OUT_PWD/../../lib -lqtt9write_db$$qtPlatformTargetSuffix() LIBS += $$T9WRITE_ALPHABETIC_LIBS } @@ -364,7 +341,7 @@ arrow-key-navigation: DEFINES += QT_VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION include(generateresource.pri) -RESOURCES += $$generate_resource(layouts.qrc, $$LAYOUT_FILES, /QtQuick/Enterprise/VirtualKeyboard) +RESOURCES += $$generate_resource(layouts.qrc, $$LAYOUT_FILES, /QtQuick/VirtualKeyboard) PLUGIN_TYPE = platforminputcontexts PLUGIN_EXTENDS = - diff --git a/src/virtualkeyboard/virtualkeyboarddebug.h b/src/virtualkeyboard/virtualkeyboarddebug.h index d12c029f..17e53bdf 100644 --- a/src/virtualkeyboard/virtualkeyboarddebug.h +++ b/src/virtualkeyboard/virtualkeyboarddebug.h @@ -1,34 +1,40 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef VIRTUALKEYBOARDDEBUG_H #define VIRTUALKEYBOARDDEBUG_H #include <QDebug> +#include <QLoggingCategory> + +Q_DECLARE_LOGGING_CATEGORY(qlcVirtualKeyboard) -//#define QT_VIRTUALKEYBOARD_DEBUG -#ifdef QT_VIRTUALKEYBOARD_DEBUG -# define VIRTUALKEYBOARD_DEBUG qDebug -#else -# define VIRTUALKEYBOARD_DEBUG if (false) qDebug -#endif +#define VIRTUALKEYBOARD_DEBUG() qCDebug(qlcVirtualKeyboard) #endif // VIRTUALKEYBOARDDEBUG_H diff --git a/src/virtualkeyboard/virtualkeyboardsettings.cpp b/src/virtualkeyboard/virtualkeyboardsettings.cpp index 2703d5f6..bbb16092 100644 --- a/src/virtualkeyboard/virtualkeyboardsettings.cpp +++ b/src/virtualkeyboard/virtualkeyboardsettings.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include "virtualkeyboardsettings.h" #include "settings.h" @@ -57,26 +65,26 @@ public: QString styleImportPath(const QString &name) const { QStringList styleImportPathList; - styleImportPathList << "qrc:/QtQuick/Enterprise/VirtualKeyboard/content/styles/"; + styleImportPathList << "qrc:/QtQuick/VirtualKeyboard/content/styles/"; const QStringList importPathList = engine->importPathList(); // Add QML import path (Note: the QML base dir is usually the last entry in the list) for (int i = importPathList.size() - 1; i >= 0; --i) { const QString stylesPath = importPathList.at(i) - + QStringLiteral("/QtQuick/Enterprise/VirtualKeyboard/Styles/"); + + QStringLiteral("/QtQuick/VirtualKeyboard/Styles/"); if (QFileInfo(stylesPath).isDir()) { styleImportPathList += stylesPath; break; } } - foreach (const QString &styleImportPath, styleImportPathList) { + for (const QString &styleImportPath : qAsConst(styleImportPathList)) { QString filePath = buildStyleFilePath(styleImportPath, name); bool pathExist = false; #ifdef COMPILING_QML // qtquickcompiler removes *.qml file paths from qrc file, but keeps directories - QTRD-3268 pathExist = QFileInfo(filePath).dir().exists(); #else - pathExist = QFileInfo(filePath).exists(); + pathExist = QFileInfo::exists(filePath); #endif if (pathExist) return buildStyleImportPath(styleImportPath, name); @@ -88,19 +96,28 @@ public: }; /*! - \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Settings 2.0 + \qmlmodule QtQuick.VirtualKeyboard.Settings 2.0 + \title Qt Quick Virtual Keyboard Settings QML Types + \ingroup qmlmodules + + \brief Provides settings for Qt Virtual Keyboard. - This module provides settings components for Qt Virtual Keyboard. + The QML types can be imported into your application using the following + import statements in your .qml file: + + \badcode + import QtQuick.VirtualKeyboard.Settings 2.0 + \endcode */ /*! \qmltype VirtualKeyboardSettings - \inqmlmodule QtQuick.Enterprise.VirtualKeyboard.Settings + \inqmlmodule QtQuick.VirtualKeyboard.Settings \ingroup qtvirtualkeyboard-settings-qml - \since QtQuick.Enterprise.VirtualKeyboard 1.2 + \since QtQuick.VirtualKeyboard 1.2 \brief Provides settings for virtual keyboard. - This module provides VirtualKeyboarSettings singleton instance, + This type provides a VirtualKeyboardSettings singleton instance, which can be used to configure the virtual keyboard settings. Please note that the settings have only effect in the current @@ -248,7 +265,7 @@ void VirtualKeyboardSettings::resetStyle() /*! \qmlproperty string VirtualKeyboardSettings::locale - \since QtQuick.Enterprise.VirtualKeyboard.Settings 2.0 + \since QtQuick.VirtualKeyboard.Settings 2.0 This property provides the default locale for the keyboard. @@ -264,7 +281,7 @@ void VirtualKeyboardSettings::resetStyle() /*! \qmlproperty list<string> VirtualKeyboardSettings::availableLocales - \since QtQuick.Enterprise.VirtualKeyboard.Settings 2.0 + \since QtQuick.VirtualKeyboard.Settings 2.0 This property contains a list of languages supported by the virtual keyboard. @@ -274,7 +291,7 @@ void VirtualKeyboardSettings::resetStyle() /*! \qmlproperty list<string> VirtualKeyboardSettings::activeLocales - \since QtQuick.Enterprise.VirtualKeyboard.Settings 2.0 + \since QtQuick.VirtualKeyboard.Settings 2.0 This property contains a list of activated languages of the virtual keyboard. diff --git a/src/virtualkeyboard/virtualkeyboardsettings.h b/src/virtualkeyboard/virtualkeyboardsettings.h index 593e3ac7..9f49f137 100644 --- a/src/virtualkeyboard/virtualkeyboardsettings.h +++ b/src/virtualkeyboard/virtualkeyboardsettings.h @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #ifndef VIRTUALKEYBOARDSETTINGS_H #define VIRTUALKEYBOARDSETTINGS_H diff --git a/sync.profile b/sync.profile index 68349249..dfc1d5d6 100644 --- a/sync.profile +++ b/sync.profile @@ -2,18 +2,3 @@ ); %moduleheaders = ( # restrict the module headers to those found in relative path ); -# Module dependencies. -# Every module that is required to build this module should have one entry. -# Each of the module version specifiers can take one of the following values: -# - A specific Git revision. -# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) -# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) -# -%dependencies = ( - "qtbase" => "", - "qtdeclarative" => "", - "qtmultimedia" => "", - "qtquickcontrols" => "", - "qtsvg" => "", - "qtxmlpatterns" => "", -); diff --git a/tests/auto/inputpanel/BLACKLIST b/tests/auto/inputpanel/BLACKLIST new file mode 100644 index 00000000..9d4e1e38 --- /dev/null +++ b/tests/auto/inputpanel/BLACKLIST @@ -0,0 +1,10 @@ +[tst_plugin::test_inputLocale:row 10] +windows msvc-2015 +[tst_plugin::test_japaneseInputModes:row 0] +windows msvc-2015 +[tst_plugin::test_japaneseInputModes:row 1] +windows msvc-2015 +[tst_plugin::test_japaneseInputModes:row 2] +windows msvc-2015 +[tst_plugin::test_japaneseInputModes:row 3] +windows msvc-2015 diff --git a/tests/auto/inputpanel/data/inputpanel/handwriting.js b/tests/auto/inputpanel/data/inputpanel/handwriting.js index 44ae92ec..36b67240 100644 --- a/tests/auto/inputpanel/data/inputpanel/handwriting.js +++ b/tests/auto/inputpanel/data/inputpanel/handwriting.js @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ .pragma library diff --git a/tests/auto/inputpanel/data/inputpanel/handwritinginputpanel.qml b/tests/auto/inputpanel/data/inputpanel/handwritinginputpanel.qml index d1787e66..692116d0 100644 --- a/tests/auto/inputpanel/data/inputpanel/handwritinginputpanel.qml +++ b/tests/auto/inputpanel/data/inputpanel/handwritinginputpanel.qml @@ -1,27 +1,35 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtTest 1.0 import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 +import QtQuick.VirtualKeyboard 2.1 import "handwriting.js" as Handwriting import "utils.js" as Utils diff --git a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml index 9586a736..4d42d941 100644 --- a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml +++ b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml @@ -1,28 +1,36 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtTest 1.0 import QtQuick 2.0 -import QtQuick.Enterprise.VirtualKeyboard 2.0 -import QtQuick.Enterprise.VirtualKeyboard.Settings 2.0 +import QtQuick.VirtualKeyboard 2.1 +import QtQuick.VirtualKeyboard.Settings 2.1 import "handwriting.js" as Handwriting import "utils.js" as Utils @@ -59,6 +67,9 @@ InputPanel { naviationHighlight.widthAnimation.running || naviationHighlight.heightAnimation.running readonly property var wordCandidateView: Utils.findChildByProperty(keyboard, "objectName", "wordCandidateView", null) + readonly property var selectionControl: Utils.findChild(inputPanel, null, function(obj, param) { return obj.hasOwnProperty("handleIsMoving")}) + readonly property var anchorHandle: selectionControl.children[0] + readonly property var cursorHandle: selectionControl.children[1] readonly property bool wordCandidateListVisibleHint: InputContext.inputEngine.wordCandidateListVisibleHint readonly property bool keyboardLayoutsAvailable: keyboard.availableLocaleIndices.length > 0 && keyboard.availableLocaleIndices.indexOf(-1) === -1 property alias keyboardLayoutsAvailableSpy: keyboardLayoutsAvailableSpy diff --git a/tests/auto/inputpanel/data/inputpanel/unipen_data.js b/tests/auto/inputpanel/data/inputpanel/unipen_data.js index 068f1d47..4c69b43d 100644 --- a/tests/auto/inputpanel/data/inputpanel/unipen_data.js +++ b/tests/auto/inputpanel/data/inputpanel/unipen_data.js @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ var unipenData = { "0x0020": { diff --git a/tests/auto/inputpanel/data/inputpanel/utils.js b/tests/auto/inputpanel/data/inputpanel/utils.js index d20694a9..de5117b1 100644 --- a/tests/auto/inputpanel/data/inputpanel/utils.js +++ b/tests/auto/inputpanel/data/inputpanel/utils.js @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ .pragma library diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml index 919597a1..915d7441 100644 --- a/tests/auto/inputpanel/data/tst_inputpanel.qml +++ b/tests/auto/inputpanel/data/tst_inputpanel.qml @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ import QtTest 1.0 import QtQuick 2.0 @@ -108,46 +116,58 @@ Rectangle { return [ // Note: Add new import versions here { qml: "import QtQuick 2.0; \ - import QtQuick.Enterprise.VirtualKeyboard 1.0; \ + import QtQuick.VirtualKeyboard 1.0; \ Item {}" }, { qml: "import QtQuick 2.0; \ - import QtQuick.Enterprise.VirtualKeyboard 1.1; \ + import QtQuick.VirtualKeyboard 1.1; \ Item {}" }, { qml: "import QtQuick 2.0; \ - import QtQuick.Enterprise.VirtualKeyboard 1.2; \ + import QtQuick.VirtualKeyboard 1.2; \ Item {}" }, { qml: "import QtQuick 2.0; \ - import QtQuick.Enterprise.VirtualKeyboard 1.3; \ + import QtQuick.VirtualKeyboard 1.3; \ Item {}" }, { qml: "import QtQuick 2.0; \ - import QtQuick.Enterprise.VirtualKeyboard 2.0; \ + import QtQuick.VirtualKeyboard 2.0; \ Item {}" }, { qml: "import QtQuick 2.0; \ - import QtQuick.Enterprise.VirtualKeyboard.Styles 1.0; \ + import QtQuick.VirtualKeyboard 2.1; \ + Item {}" }, + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard.Styles 1.0; \ + KeyboardStyle {}" }, + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard.Styles 1.1; \ KeyboardStyle {}" }, { qml: "import QtQuick 2.0; \ - import QtQuick.Enterprise.VirtualKeyboard.Styles 1.1; \ + import QtQuick.VirtualKeyboard.Styles 1.2; \ KeyboardStyle {}" }, { qml: "import QtQuick 2.0; \ - import QtQuick.Enterprise.VirtualKeyboard.Styles 1.2; \ + import QtQuick.VirtualKeyboard.Styles 1.3; \ KeyboardStyle {}" }, { qml: "import QtQuick 2.0; \ - import QtQuick.Enterprise.VirtualKeyboard.Styles 1.3; \ + import QtQuick.VirtualKeyboard.Styles 2.0; \ KeyboardStyle {}" }, { qml: "import QtQuick 2.0; \ - import QtQuick.Enterprise.VirtualKeyboard.Styles 2.0; \ + import QtQuick.VirtualKeyboard.Styles 2.1; \ KeyboardStyle {}" }, { qml: "import QtQuick 2.0; \ - import QtQuick.Enterprise.VirtualKeyboard.Settings 1.0; \ + import QtQuick.VirtualKeyboard.Settings 1.0; \ Item { property var styleName: VirtualKeyboardSettings.styleName }" }, { qml: "import QtQuick 2.0; \ - import QtQuick.Enterprise.VirtualKeyboard.Settings 1.1; \ + import QtQuick.VirtualKeyboard.Settings 1.1; \ Item { property var styleName: VirtualKeyboardSettings.styleName }" }, { qml: "import QtQuick 2.0; \ - import QtQuick.Enterprise.VirtualKeyboard.Settings 1.2; \ + import QtQuick.VirtualKeyboard.Settings 1.2; \ Item { property var styleName: VirtualKeyboardSettings.styleName }" }, { qml: "import QtQuick 2.0; \ - import QtQuick.Enterprise.VirtualKeyboard.Settings 2.0; \ + import QtQuick.VirtualKeyboard.Settings 2.0; \ + Item { property var styleName: VirtualKeyboardSettings.styleName; \ + property var locale: VirtualKeyboardSettings.locale; \ + property var availableLocales: VirtualKeyboardSettings.availableLocales; \ + property var activeLocales: VirtualKeyboardSettings.activeLocales }" }, + { qml: "import QtQuick 2.0; \ + import QtQuick.VirtualKeyboard.Settings 2.1; \ Item { property var styleName: VirtualKeyboardSettings.styleName; \ property var locale: VirtualKeyboardSettings.locale; \ property var availableLocales: VirtualKeyboardSettings.availableLocales; \ @@ -307,10 +327,11 @@ Rectangle { } function test_inputMethodHints_data() { + var decmialPoint = Qt.locale().decimalPoint return [ { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhUppercaseOnly, inputSequence: "uppercase text? yes.", outputText: "UPPERCASE TEXT? YES." }, { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhLowercaseOnly, inputSequence: "uppercase text? no.", outputText: "uppercase text? no." }, - { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhDigitsOnly, inputSequence: "1234567890.", outputText: "1234567890." }, + { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhDigitsOnly, inputSequence: "1234567890" + decmialPoint, outputText: "1234567890" + decmialPoint }, { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhFormattedNumbersOnly, inputSequence: "1234567890+-,.()", outputText: "1234567890+-,.()" }, { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhDialableCharactersOnly, inputSequence: "1234567890+*#", outputText: "1234567890+*#" }, ] @@ -1371,5 +1392,33 @@ Rectangle { expectFail("", "Prediction/spell correction not enabled") compare(textInput.text, data.expectedText) } + + function test_selection_data() { + return [ + { initText: "Hello cruel world", selectionStart: 2, selectionEnd: 9, expectHandlesToBeVisible: true }, + { initText: "Hello cruel world", selectionStart: 9, selectionEnd: 9, expectHandlesToBeVisible: false }, + { initText: "Hello cruel world", selectionStart: 2, selectionEnd: 9, expectHandlesToBeVisible: true }, + { initText: "Hello cruel world", selectionStart: 0, selectionEnd: 17, expectHandlesToBeVisible: true }, + ] + } + + function test_selection(data) { + waitForRendering(textInput) + prepareTest(data) + compare(inputPanel.cursorHandle.visible, data.expectHandlesToBeVisible) + compare(inputPanel.anchorHandle.visible, data.expectHandlesToBeVisible) + if (data.expectHandlesToBeVisible) { + var cursorHandlePointsTo = Qt.point(inputPanel.cursorHandle.x + inputPanel.cursorHandle.width/2, inputPanel.cursorHandle.y) + var anchorHandlePointsTo = Qt.point(inputPanel.anchorHandle.x + inputPanel.anchorHandle.width/2, inputPanel.anchorHandle.y) + var anchorRect = textInput.positionToRectangle(data.selectionStart) + var cursorRect = textInput.positionToRectangle(data.selectionEnd) + + compare(cursorHandlePointsTo.x, cursorRect.x) + compare(cursorHandlePointsTo.y, cursorRect.y + cursorRect.height) + + compare(anchorHandlePointsTo.x, anchorRect.x) + compare(anchorHandlePointsTo.y, anchorRect.y + anchorRect.height) + } + } } } diff --git a/tests/auto/inputpanel/tst_inputpanel.cpp b/tests/auto/inputpanel/tst_inputpanel.cpp index da5b97dd..8b84f67b 100644 --- a/tests/auto/inputpanel/tst_inputpanel.cpp +++ b/tests/auto/inputpanel/tst_inputpanel.cpp @@ -1,23 +1,31 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ #include <QtQuickTest/quicktest.h> #include <QByteArray> |
