From 2c20a0e7c7a35e40aaaf090b89acb51005fa48f5 Mon Sep 17 00:00:00 2001 From: cuke Date: Mon, 14 Sep 2015 23:38:02 +0200 Subject: [PATCH] Released version 0.4.5 --- LICENSE | 827 ++++-------------- NimQml.nimble | 9 - README.md | 21 +- doc/nimqml.md | 304 +++++++ examples/abstractitemmodel/.gitignore | 2 + .../abstractitemmodel.nimble | 10 + examples/abstractitemmodel/main.nim | 24 + examples/abstractitemmodel/main.qml | 25 + examples/abstractitemmodel/mylistmodel.nim | 37 + examples/contactapp/.gitignore | 2 + examples/contactapp/applicationlogic.nim | 33 + examples/contactapp/contact.nim | 49 ++ examples/contactapp/contactapp.nimble | 10 + examples/contactapp/contactlist.nim | 62 ++ examples/contactapp/main.nim | 17 + examples/contactapp/main.qml | 94 ++ examples/helloworld/.gitignore | 2 + examples/helloworld/helloworld.nimble | 10 + examples/helloworld/main.nim | 18 + examples/helloworld/main.qml | 12 + examples/qtobjectmacro/.gitignore | 2 + examples/qtobjectmacro/contact.nim | 29 + examples/qtobjectmacro/main.nim | 23 + examples/qtobjectmacro/main.qml | 33 + examples/qtobjectmacro/qtobjectmacro.nimble | 10 + examples/simpledata/.gitignore | 2 + examples/simpledata/main.nim | 34 + examples/simpledata/main.qml | 21 + examples/simpledata/simpledata.nimble | 10 + examples/slotsandproperties/.gitignore | 2 + examples/slotsandproperties/contact.nim | 40 + examples/slotsandproperties/main.nim | 24 + examples/slotsandproperties/main.qml | 33 + .../slotsandproperties.nimble | 10 + nimqml.nimble | 10 + NimQml.nim => src/nimqml.nim | 308 +++---- .../private/nimqmlmacros.nim | 82 +- .../private/nimqmltypes.nim | 0 38 files changed, 1362 insertions(+), 879 deletions(-) delete mode 100644 NimQml.nimble create mode 100644 doc/nimqml.md create mode 100644 examples/abstractitemmodel/.gitignore create mode 100644 examples/abstractitemmodel/abstractitemmodel.nimble create mode 100644 examples/abstractitemmodel/main.nim create mode 100644 examples/abstractitemmodel/main.qml create mode 100644 examples/abstractitemmodel/mylistmodel.nim create mode 100644 examples/contactapp/.gitignore create mode 100644 examples/contactapp/applicationlogic.nim create mode 100644 examples/contactapp/contact.nim create mode 100644 examples/contactapp/contactapp.nimble create mode 100644 examples/contactapp/contactlist.nim create mode 100644 examples/contactapp/main.nim create mode 100644 examples/contactapp/main.qml create mode 100644 examples/helloworld/.gitignore create mode 100644 examples/helloworld/helloworld.nimble create mode 100644 examples/helloworld/main.nim create mode 100644 examples/helloworld/main.qml create mode 100644 examples/qtobjectmacro/.gitignore create mode 100644 examples/qtobjectmacro/contact.nim create mode 100644 examples/qtobjectmacro/main.nim create mode 100644 examples/qtobjectmacro/main.qml create mode 100644 examples/qtobjectmacro/qtobjectmacro.nimble create mode 100644 examples/simpledata/.gitignore create mode 100644 examples/simpledata/main.nim create mode 100644 examples/simpledata/main.qml create mode 100644 examples/simpledata/simpledata.nimble create mode 100644 examples/slotsandproperties/.gitignore create mode 100644 examples/slotsandproperties/contact.nim create mode 100644 examples/slotsandproperties/main.nim create mode 100644 examples/slotsandproperties/main.qml create mode 100644 examples/slotsandproperties/slotsandproperties.nimble create mode 100644 nimqml.nimble rename NimQml.nim => src/nimqml.nim (80%) rename NimQmlMacros.nim => src/private/nimqmlmacros.nim (86%) rename NimQmlTypes.nim => src/private/nimqmltypes.nim (100%) diff --git a/LICENSE b/LICENSE index 6b156fe..fb6d90b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,675 +1,166 @@ -GNU GENERAL PUBLIC LICENSE +GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {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 . - -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: - - {project} Copyright (C) {year} {fullname} - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser 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 +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/NimQml.nimble b/NimQml.nimble deleted file mode 100644 index ab57634..0000000 --- a/NimQml.nimble +++ /dev/null @@ -1,9 +0,0 @@ -[Package] -name = "NimQml" -version = "0.3.0" -author = "Filippo Cucchetto, Will Szumski" -description = "QML bindings for Nimrod" -license = "GPLv3" - -[Deps] -Requires: "nimrod >= 0.10.2" diff --git a/README.md b/README.md index 28f5247..3ed5665 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,17 @@ -NimQml -====== +# NimQML -Qml bindings for the Nim programming language +QML binding for the Nim programming language -WARNING -======= +## Requirements +* [DOtherside](https://github.com/filcuc/DOtherSide) 0.4.5 or higher +* [Nim](http://nim-lang.org/) 0.11.2 or higher -The given repo is just a copy of https://github.com/filcuc/DOtherSide -and is provided for simple interfacing with the Nimble package manager \ No newline at end of file +## Build instructions +* Compile and Install DOtherside in your system PATH (i.e. /usr/lib) +* nimble install nimqml + +## Examples +* The examples can be built by executing the following command +* nimble compile -l:-lDOtherSide main.nim + +This invokes the nim compiler asking to link the DOtherSide lib diff --git a/doc/nimqml.md b/doc/nimqml.md new file mode 100644 index 0000000..acf19e2 --- /dev/null +++ b/doc/nimqml.md @@ -0,0 +1,304 @@ +:Authors: + Filippo Cucchetto + + Will Szumski +:Version: 0.4.5 +:Date: 2015/09/15 + +Introduction +----------- +The NimQml module adds Qt Qml bindings to the Nim programming language +allowing you to create new modern UI by mixing the Qml declarative syntax +and the Nim imperative language. + +The NimQml is made by two components: +* The DOtherSide C++ shared library +* The NimQml Nim module + +This first component implements the glue code necessary for +communicating with the Qt C++ library, the latter module wraps +the libDOtherSide exported symbols in Nim + +Building +-------- +At the time of writing the DOtherSide C++ library must be compiled +and installed manually from source. + +First clone the DOtherSide git repo +:: + git clone https://github.com/filcuc/DOtherSide + +than you can proceed with the common CMake build steps + +:: + mkdir build + cd build + cmake .. + make + +If everything goes correctly, you'll have built both +the DOtherSide C++ library and the Nim examples + +Installation +---------- +The installation is not mandatory, in fact you could try +the built Nim example in the following way +:: + cd path/to/build/dir + cd Nim/Examples/HelloWorld + export LD_LIBRARY_PATH=path/to/libDOtherSide.so + ./HelloWorld + +The DOtherSide project is made of two components +1. The DOtherSide C++ lib +2. The NimQml module + +You can procede with the installation of the C++ library +in the following way +:: + cd to/build/dir + make install +or by manually copying the library in your system lib directory +:: + sudo cp build/dir/path/DOtherSide/libDOtherSide.so /usr/lib + +For the NimQml module you can use the ``nimble`` package manager +:: + nimble install NimQml + +or +:: + cd to/build/dir/Nim/NimQml + nimble install + + +Example 1: HelloWorld +---------- +As usual lets start with an HelloWorld example. +Most of the NimQml projects are made by one or more nim and qml +files. Usually the .nim files contains your app logic and data +layer. The qml files contain the presentation layer and expose +the data in your nim files. + +``Examples/HelloWorld/main.nim`` + +.. code-block:: nim + :file: ../Examples/HelloWorld/main.nim + +``Examples/HelloWorld/main.qml`` + +.. code-block:: qml + :file: ../Examples/HelloWorld/main.qml + +The following example shows the basic steps of each NimQml app +1. Create the QApplication for initializing the Qt runtime +2. Create the QQmlApplicationEngine and load your main .qml file +3. Call the ``exec`` proc of the QApplication instance for starting +the Qt event loop + +Example 2: exposing data to Qml +------------------------------------ +The previous example shown you how to create a simple application +window and how to startup the Qt event loop. + +It's time to explore how to pass data to Qml, but lets see the +example code first: + +``Examples/SimpleData/main.nim`` + +.. code-block:: nim + :file: ../Examples/SimpleData/main.nim + +``Examples/SimpleData/main.qml`` + +.. code-block:: qml + :file: ../Examples/SimpleData/main.qml + +The following example shows how to expose simple data types to Qml: +1. Create a QVariant and set its internal value. +2. Create a property in the Qml root context with a given name. + +Once a property is set through the ``setContextProperty`` proc, it's available +globally in all the Qml script loaded by the current engine (see the official Qt +documentation for more details about the engine and context objects) + +At the time of writing the QVariant class support the following types: +* int +* string +* bool +* float +* QObject derived classes + +Example 3: exposing complex data and procedures to Qml +---------------------------------------------------------- +As seen by the second example, simple data is fine. However most +applications need to expose complex data, functions and +update the view when something changes in the data layer. +This is achieved by creating an object that derives from QObject. + +A QObject is made of : +1. ``Slots``: slots are functions that could be called from the qml engine and/or connected to Qt signals +2. ``Signals``: signals allow the sending of events and be connected to slots +3. ``Properties``: properties allow the passing of data to + the Qml view and make it aware of changes in the data layer + +A QObject property is made of three things: +* a read slot: a method that returns the current value of the property +* a write slot: a method that sets the value of the property +* a notify signal: emitted when the current value of the property is changed + +We'll start by looking at the main.nim file + +``Examples/SlotsAndProperties/main.nim`` + +.. code-block:: nim + :file: ../Examples/SlotsAndProperties/main.nim + +Here, nothing special happens except: +1. The creation of Contact object +2. The injection of the Contact object to the Qml root context + using the ``setContextProperty`` as seen in the previous + example + +The Qml file is as follows: + +``Examples/SlotsAndProperties/main.qml`` + +.. code-block:: qml + :file: ../Examples/SlotsAndProperties/main.qml + +The qml is made up of: a Label, a TextInput widget, and a button. +The label displays the contact name - this automatically updates when +the contact name changes. + +When clicked, the button updates the contact name with the text from +the TextInput widget. + +So where's the magic? + +The magic is in the Contact.nim file + +``Examples/SlotsAndProperties/Contact.nim`` + +.. code-block:: nim + :file: ../Examples/SlotsAndProperties/Contact.nim + +First we declare a QObject subclass and provide a simple +new method where we: +1. invoke the ``create()`` procedure. This invoke the C++ bridge and allocate +a QObject instance +2. register a slot ``getName`` for reading the Contact name field +3. register a slot ``setName`` for writing the Contact name +4. register a signal ``nameChanged`` for notify the contact name changes +5. register a property called ``name`` of type ``QString`` with the given + read, write slots and notify signal + +Looking at the ``getName`` and ``setName`` methods, you can see that slots, as defined in Nim, +are nothing more than standard methods. The method corresponding to the ``setName`` slot +demonstrates how to use the ``emit`` method to emit a signal. + +The last thing to consider is the override of the ``onSlotCalled`` method. +This method is called by the NimQml library when an invocation occurs from +the Qml side for one of the slots belonging to the QObject. +The usual implementation for the onSlotCalled method consists of a +switch statement that forwards the arguments to the correct slot. +If the invoked slot has a return value, this is always in the index position +0 of the args array. + + +Example 4: QtObject macro +------------------------- +The previous example shows how to create a simple QObject, however writing +all those ``register`` procs and writing the ``onSlotCalled`` method +becomes boring pretty soon. + +Furthermore all this information can be automatically generated. +For this purpose you can import the NimQmlMacros module that provides +the QtObject macro. + +Let's begin as usual with both the main.nim and main.qml files + +``Examples/QtObjectMacro/main.nim`` + +.. code-block:: nim + :file: ../Examples/QtObjectMacro/main.nim + + +``Examples/QtObjectMacro/main.qml`` + +.. code-block:: qml + :file: ../Examples/QtObjectMacro/main.qml + +Nothing is new in both the ``main.nim`` and ``main.qml`` with respect to +the previous example. What changed is the Contact object: + +``Examples/QtObjectMacro/Contact.nim`` + +.. code-block:: nim + :file: ../Examples/QtObjectMacro/Contact.nim + +In details: +1. Each QObject is defined inside the QtObject macro +2. Each slot is annotated with the ``{.slot.}`` pragma +3. Each signal is annotated with the ``{.signal.}`` pragma +4. Each property is created with the ``QtProperty`` macro + +The ``QtProperty`` macro has the following syntax + +.. code-block:: nim + QtProperty[typeOfProperty] nameOfProperty + +Example 5: ContactApp +------------------------- +The last example tries to show you all the stuff presented +in the previous chapters and gives you an introduction to how +to expose lists to qml. + +Qt models are a huge topic and explaining how they work is +out of scope. For further information please read the official +Qt documentation. + +The main file follows the basic logic of creating a qml +engine and exposing a QObject derived object "ApplicationLogic" +through a global "logic" property + +``Examples/ContactApp/main.nim`` + +.. code-block:: nim + :file: ../Examples/ContactApp/main.nim + +The qml file shows a simple app with a central tableview + +``Examples/ContactApp/main.qml`` + +.. code-block:: qml + :file: ../Examples/ContactApp/main.qml + +The important things to notice are: +1. The menubar load, save and exit items handlers call the logic load, save and exit slots +2. The TableView model is retrieved by the logic.contactList property +3. The delete and add buttons call the del and add slots of the logic.contactList model + +The ApplicationLogic object is as follows: + +``Examples/ContactApp/ApplicationLogic.nim`` + +.. code-block:: nim + :file: ../Examples/ContactApp/ApplicationLogic.nim + +The ApplicationLogic object, +1. expose some slots for handling the qml menubar triggered signals +2. expose a contactList property that return a QAbstractListModel derived object that manage the list of contacts + +The ContactList object is as follows: + +``Examples/ContactApp/ContactList.nim`` + +.. code-block:: nim + :file: ../Examples/ContactApp/ContactList.nim + +The ContactList object: +1. overrides the ``rowCount`` method for returning the number of rows stored in the model +2. overrides the ``data`` method for returning the value for the exported roles +3. overrides the ``roleNames`` method for returning the names of the roles of the model. This name are then available in the qml item delegates +4. defines two slots ``add`` and ``del`` that add or delete a Contact. During this operations the model execute the ``beginInsertRows`` and ``beginRemoveRows`` for notifing the view of an upcoming change. Once the add or delete operations are done the model execute the ``endInsertRows`` and ``endRemoveRows``. diff --git a/examples/abstractitemmodel/.gitignore b/examples/abstractitemmodel/.gitignore new file mode 100644 index 0000000..1b54545 --- /dev/null +++ b/examples/abstractitemmodel/.gitignore @@ -0,0 +1,2 @@ +main +nimcache \ No newline at end of file diff --git a/examples/abstractitemmodel/abstractitemmodel.nimble b/examples/abstractitemmodel/abstractitemmodel.nimble new file mode 100644 index 0000000..7c1e6db --- /dev/null +++ b/examples/abstractitemmodel/abstractitemmodel.nimble @@ -0,0 +1,10 @@ +[Package] +bin = "main" +name = "abstractitemmodel" +version = "0.1.0" +author = "Filippo Cucchetto" +description = "abstractitemmodel" +license = "MIT" + +[Deps] +Requires: "nim >= 0.11.2, nimqml >= 0.4.5" diff --git a/examples/abstractitemmodel/main.nim b/examples/abstractitemmodel/main.nim new file mode 100644 index 0000000..e4bea42 --- /dev/null +++ b/examples/abstractitemmodel/main.nim @@ -0,0 +1,24 @@ +import NimQml, MyListModel + +proc mainProc() = + echo "Starting" + var app = newQApplication() + defer: app.delete + + var myListModel = newMyListModel(); + defer: myListModel.delete + + var engine = newQQmlApplicationEngine() + defer: engine.delete + + var variant = newQVariant(myListModel) + defer: variant.delete + + engine.rootContext.setContextProperty("myListModel", variant) + engine.load("main.qml") + + app.exec() + +when isMainModule: + mainProc() + GC_fullcollect() diff --git a/examples/abstractitemmodel/main.qml b/examples/abstractitemmodel/main.qml new file mode 100644 index 0000000..d3aa3a3 --- /dev/null +++ b/examples/abstractitemmodel/main.qml @@ -0,0 +1,25 @@ +import QtQuick 2.2 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.1 +import QtQuick.Window 2.1 + +ApplicationWindow +{ + width: 400 + height: 300 + title: "AbstractItemModel" + Component.onCompleted: visible = true + + Component + { + id: myListModelDelegate + Label { text: "Name:" + name } + } + + ListView + { + anchors.fill: parent + model: myListModel + delegate: myListModelDelegate + } +} \ No newline at end of file diff --git a/examples/abstractitemmodel/mylistmodel.nim b/examples/abstractitemmodel/mylistmodel.nim new file mode 100644 index 0000000..8d19a47 --- /dev/null +++ b/examples/abstractitemmodel/mylistmodel.nim @@ -0,0 +1,37 @@ +import NimQml, Tables + +QtObject: + type + MyListModel* = ref object of QAbstractListModel + names*: seq[string] + RoleNames {.pure.} = enum + Name = 0, + + converter toCInt(value: RoleNames): cint = return value.cint + converter toCInt(value: int): cint = return value.cint + converter toInt(value: RoleNames): int = return value.int + converter toInt(value: cint): int = return value.int + converter toQVariant(value: string): QVariant = return value.newQVariant + + proc delete(self: MyListModel) = + let model = self.QAbstractListModel + model.delete + + proc newMyListModel*(): MyListModel = + new(result, delete) + result.names = @["John", "Max", "Paul", "Anna"] + result.create + + method rowCount(self: MyListModel, index: QModelIndex = nil): cint = + return self.names.len + + method data(self: MyListModel, index: QModelIndex, role: cint): QVariant = + if not index.isValid: + return + if index.row < 0 or index.row >= self.names.len: + return + return self.names[index.row] + + method roleNames(self: MyListModel): Table[cint, cstring] = + result = initTable[cint, cstring]() + result[RoleNames.Name] = "name" diff --git a/examples/contactapp/.gitignore b/examples/contactapp/.gitignore new file mode 100644 index 0000000..1b54545 --- /dev/null +++ b/examples/contactapp/.gitignore @@ -0,0 +1,2 @@ +main +nimcache \ No newline at end of file diff --git a/examples/contactapp/applicationlogic.nim b/examples/contactapp/applicationlogic.nim new file mode 100644 index 0000000..ce92a96 --- /dev/null +++ b/examples/contactapp/applicationlogic.nim @@ -0,0 +1,33 @@ +import NimQml, ContactList + +QtObject: + type ApplicationLogic* = ref object of QObject + contactList: ContactList + app: QApplication + + proc delete*(self: ApplicationLogic) = + let qobject = self.QObject + qobject.delete + self.contactList.delete + + proc newApplicationLogic*(app: QApplication): ApplicationLogic = + new(result) + result.contactList = newContactList() + result.app = app + result.create() + + method getContactList(self: ApplicationLogic): QVariant {.slot.} = + return newQVariant(self.contactList) + + method onLoadTriggered(self: ApplicationLogic) {.slot.} = + echo "Load Triggered" + self.contactList.add("John", "Doo") + + method onSaveTriggered(self: ApplicationLogic) {.slot.} = + echo "Save Triggered" + + method onExitTriggered(self: ApplicationLogic) {.slot.} = + self.app.quit + + QtProperty[QVariant] contactList: + read = getContactList diff --git a/examples/contactapp/contact.nim b/examples/contactapp/contact.nim new file mode 100644 index 0000000..abc2c0e --- /dev/null +++ b/examples/contactapp/contact.nim @@ -0,0 +1,49 @@ +import NimQml + +QtObject: + type Contact* = ref object of QObject + name: string + surname: string + + proc delete*(self: Contact) = + let qobject = self.QObject + qobject.delete + + proc newContact*(): Contact = + new(result) + result.name = "" + result.create + + method firstName*(self: Contact): string {.slot.} = + result = self.name + + method firstNameChanged*(self: Contact) {.signal.} + + method setFirstName(self: Contact, name: string) {.slot.} = + if self.name != name: + self.name = name + self.firstNameChanged() + + proc `firstName=`*(self: Contact, name: string) = self.setFirstName(name) + + QtProperty[string] firstName: + read = firstName + write = setFirstName + notify = firstNameChanged + + method surname*(self: Contact): string {.slot.} = + result = self.surname + + method surnameChanged*(self: Contact) {.signal.} + + method setSurname(self: Contact, surname: string) {.slot.} = + if self.surname != surname: + self.surname = surname + self.surnameChanged() + + proc `surname=`*(self: Contact, surname: string) = self.setSurname(surname) + + QtProperty[string] surname: + read = surname + write = setSurname + notify = surnameChanged diff --git a/examples/contactapp/contactapp.nimble b/examples/contactapp/contactapp.nimble new file mode 100644 index 0000000..29a2e05 --- /dev/null +++ b/examples/contactapp/contactapp.nimble @@ -0,0 +1,10 @@ +[Package] +bin = "main" +name = "contactapp" +version = "0.1.0" +author = "Filippo Cucchetto" +description = "contactapp" +license = "MIT" + +[Deps] +Requires: "nim >= 0.11.2, nimqml >= 0.4.5" diff --git a/examples/contactapp/contactlist.nim b/examples/contactapp/contactlist.nim new file mode 100644 index 0000000..d058fd3 --- /dev/null +++ b/examples/contactapp/contactlist.nim @@ -0,0 +1,62 @@ +import NimQml, Contact, Tables + +QtObject: + type + ContactList* = ref object of QAbstractListModel + contacts*: seq[Contact] + ContactRoles {.pure.} = enum + FirstName = 0 + Surname = 1 + + converter toCInt(value: ContactRoles): cint = return value.cint + converter toCInt(value: int): cint = return value.cint + converter toInt(value: ContactRoles): int = return value.int + converter toInt(value: cint): int = return value.int + converter toQVariant(value: string): QVariant = return value.newQVariant + + proc delete(self: ContactList) = + let model = self.QAbstractListModel + model.delete + for contact in self.contacts: + contact.delete + self.contacts = @[] + + proc newContactList*(): ContactList = + new(result, delete) + result.contacts = @[] + result.create + + method rowCount(self: ContactList, index: QModelIndex = nil): cint = + return self.contacts.len + + method data(self: ContactList, index: QModelIndex, role: cint): QVariant = + if not index.isValid: + return + if index.row < 0 or index.row >= self.contacts.len: + return + let contact = self.contacts[index.row] + let contactRole = role.ContactRoles + case contactRole: + of ContactRoles.FirstName: return contact.firstName + of ContactRoles.Surname: return contact.surname + else: return + + method roleNames(self: ContactList): Table[cint, cstring] = + result = initTable[cint, cstring]() + result[ContactRoles.FirstName] = "firstName" + result[ContactRoles.Surname] = "surname" + + method add*(self: ContactList, name: string, surname: string) {.slot.} = + let contact = newContact() + contact.firstName = name + contact.surname = surname + self.beginInsertRows(newQModelIndex(), self.contacts.len, self.contacts.len) + self.contacts.add(contact) + self.endInsertRows() + + method del*(self: ContactList, pos: int) {.slot.} = + if pos < 0 or pos >= self.contacts.len: + return + self.beginRemoveRows(newQModelIndex(), pos, pos) + self.contacts.del(pos) + self.endRemoveRows diff --git a/examples/contactapp/main.nim b/examples/contactapp/main.nim new file mode 100644 index 0000000..d5761fb --- /dev/null +++ b/examples/contactapp/main.nim @@ -0,0 +1,17 @@ +import NimQml, ApplicationLogic + +proc mainProc() = + let app = newQApplication() + defer: app.delete + let logic = newApplicationLogic(app) + defer: logic.delete + let engine = newQQmlApplicationEngine() + defer: engine.delete + let logicVariant = newQVariant(logic) + defer: logicVariant.delete + engine.rootContext.setContextProperty("logic", logicVariant) + engine.load("main.qml") + app.exec() + +when isMainModule: + mainProc() diff --git a/examples/contactapp/main.qml b/examples/contactapp/main.qml new file mode 100644 index 0000000..8d58acc --- /dev/null +++ b/examples/contactapp/main.qml @@ -0,0 +1,94 @@ +import QtQuick 2.2 +import QtQuick.Controls 1.1 +import QtQuick.Layouts 1.1 +import QtQuick.Window 2.1 + +ApplicationWindow { + + width: 500 + height: 300 + title: "ContactApp" + visible: true + + menuBar: MenuBar { + Menu { + title: "&File" + MenuItem { text: "&Load"; onTriggered: logic.onLoadTriggered() } + MenuItem { text: "&Save"; onTriggered: logic.onSaveTriggered() } + MenuItem { text: "&Exit"; onTriggered: logic.onExitTriggered() } + } + } + + ColumnLayout { + anchors.fill: parent + + Component { + id: tableTextDelegate + Label { + id: tableTextDelegateInstance + property var styleData: undefined + states: State { + when: styleData !== undefined + PropertyChanges { + target: tableTextDelegateInstance; + text: styleData.value; + color: styleData.textColor + } + } + } + } + + Component { + id: tableButtonDelegate + Button { + id: tableButtonDelegateInstance + property var styleData: undefined + text: "Delete" + onClicked: logic.contactList.del(styleData.row) + } + } + + Component { + id: tableItemDelegate + Loader { + id: tableItemDelegateInstance + sourceComponent: { + if (styleData.column === 0 || styleData.column === 1) + return tableTextDelegate + else if (styleData.column === 2) + return tableButtonDelegate + else + return tableTextDelegate + } + Binding { + target: tableItemDelegateInstance.item + property: "styleData" + value: styleData + } + } + } + + TableView { + model: logic.contactList + Layout.fillWidth: true + Layout.fillHeight: true + TableViewColumn { role: "firstName"; title: "FirstName"; width: 200 } + TableViewColumn { role: "surname"; title: "LastName"; width: 200} + TableViewColumn { width: 100; } + itemDelegate: tableItemDelegate + } + + RowLayout { + Label { text: "FirstName" } + TextField { id: nameTextField; Layout.fillWidth: true; text: "" } + Label { text: "LastName" } + TextField { id: surnameTextField; Layout.fillWidth: true; text: "" } + Button { + text: "Add" + onClicked: logic.contactList.add(nameTextField.text, surnameTextField.text) + enabled: nameTextField.text !== "" && surnameTextField.text !== "" + } + } + + } +} diff --git a/examples/helloworld/.gitignore b/examples/helloworld/.gitignore new file mode 100644 index 0000000..1b54545 --- /dev/null +++ b/examples/helloworld/.gitignore @@ -0,0 +1,2 @@ +main +nimcache \ No newline at end of file diff --git a/examples/helloworld/helloworld.nimble b/examples/helloworld/helloworld.nimble new file mode 100644 index 0000000..7995732 --- /dev/null +++ b/examples/helloworld/helloworld.nimble @@ -0,0 +1,10 @@ +[Package] +bin = "main" +name = "helloworld" +version = "0.1.0" +author = "Filippo Cucchetto" +description = "helloworld" +license = "MIT" + +[Deps] +Requires: "nim >= 0.11.2, nimqml >= 0.4.5" diff --git a/examples/helloworld/main.nim b/examples/helloworld/main.nim new file mode 100644 index 0000000..1936404 --- /dev/null +++ b/examples/helloworld/main.nim @@ -0,0 +1,18 @@ +import NimQml +import macros +import typeinfo + +proc mainProc() = + var app = newQApplication() + defer: app.delete() + + var engine = newQQmlApplicationEngine() + defer: engine.delete() + + engine.load("main.qml") + app.exec() + +when isMainModule: + mainProc() + GC_fullcollect() + diff --git a/examples/helloworld/main.qml b/examples/helloworld/main.qml new file mode 100644 index 0000000..612ae5b --- /dev/null +++ b/examples/helloworld/main.qml @@ -0,0 +1,12 @@ +import QtQuick 2.2 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.1 +import QtQuick.Window 2.1 + +ApplicationWindow +{ + width: 400 + height: 300 + title: "Hello World" + Component.onCompleted: visible = true +} diff --git a/examples/qtobjectmacro/.gitignore b/examples/qtobjectmacro/.gitignore new file mode 100644 index 0000000..1b54545 --- /dev/null +++ b/examples/qtobjectmacro/.gitignore @@ -0,0 +1,2 @@ +main +nimcache \ No newline at end of file diff --git a/examples/qtobjectmacro/contact.nim b/examples/qtobjectmacro/contact.nim new file mode 100644 index 0000000..82a1450 --- /dev/null +++ b/examples/qtobjectmacro/contact.nim @@ -0,0 +1,29 @@ +import NimQml + +QtObject: + type Contact* = ref object of QObject + m_name: string + + proc delete*(self: Contact) = + var qobject = self.QObject + qobject.delete() + + proc newContact*(): Contact = + new(result, delete) + result.m_name = "InitialName" + result.create + + method getName*(self: Contact): string {.slot.} = + result = self.m_name + + method nameChanged*(self: Contact) {.signal.} + + method setName*(self: Contact, name: string) {.slot.} = + if self.m_name != name: + self.m_name = name + self.nameChanged() + + QtProperty[string] name: + read = getName + write = setName + notify = nameChanged diff --git a/examples/qtobjectmacro/main.nim b/examples/qtobjectmacro/main.nim new file mode 100644 index 0000000..784a67d --- /dev/null +++ b/examples/qtobjectmacro/main.nim @@ -0,0 +1,23 @@ +import NimQml +import Contact + +proc mainProc() = + var app = newQApplication() + defer: app.delete() + + var contact = newContact() + defer: contact.delete() + + var engine = newQQmlApplicationEngine() + defer: engine.delete() + + var variant = newQVariant(contact) + defer: variant.delete() + + engine.rootContext.setContextProperty("contact", variant) + engine.load("main.qml") + app.exec() + +when isMainModule: + mainProc() + GC_fullcollect() diff --git a/examples/qtobjectmacro/main.qml b/examples/qtobjectmacro/main.qml new file mode 100644 index 0000000..f21c4be --- /dev/null +++ b/examples/qtobjectmacro/main.qml @@ -0,0 +1,33 @@ +import QtQuick 2.2 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.1 +import QtQuick.Window 2.1 + +ApplicationWindow +{ + width: 400 + height: 300 + + Component.onCompleted: visible = true + + ColumnLayout + { + anchors.fill: parent + + Label + { + text: "Current name is:" + contact.name + } + + TextField + { + id: textField + } + + Button + { + text: "Change Name" + onClicked: contact.name = textField.text + } + } +} diff --git a/examples/qtobjectmacro/qtobjectmacro.nimble b/examples/qtobjectmacro/qtobjectmacro.nimble new file mode 100644 index 0000000..4c49740 --- /dev/null +++ b/examples/qtobjectmacro/qtobjectmacro.nimble @@ -0,0 +1,10 @@ +[Package] +bin = "main" +name = "qtobjectmacro" +version = "0.1.0" +author = "Filippo Cucchetto" +description = "qtobjectmacro" +license = "MIT" + +[Deps] +Requires: "nim >= 0.11.2, nimqml >= 0.4.5" diff --git a/examples/simpledata/.gitignore b/examples/simpledata/.gitignore new file mode 100644 index 0000000..1b54545 --- /dev/null +++ b/examples/simpledata/.gitignore @@ -0,0 +1,2 @@ +main +nimcache \ No newline at end of file diff --git a/examples/simpledata/main.nim b/examples/simpledata/main.nim new file mode 100644 index 0000000..d20e464 --- /dev/null +++ b/examples/simpledata/main.nim @@ -0,0 +1,34 @@ +import NimQml +import macros +import typeinfo + +proc mainProc() = + var app = newQApplication() + defer: app.delete() + + var engine = newQQmlApplicationEngine() + defer: engine.delete() + + var qVar1 = newQVariant(10) + defer: qVar1.delete() + + var qVar2 = newQVariant("Hello World") + defer: qVar2.delete() + + var qVar3 = newQVariant(false) + defer: qVar3.delete() + + var qVar4 = newQVariant(3.5.float) + defer: qVar4.delete() + + engine.rootContext.setContextProperty("qVar1", qVar1) + engine.rootContext.setContextProperty("qVar2", qVar2) + engine.rootContext.setContextProperty("qVar3", qVar3) + engine.rootContext.setContextProperty("qVar4", qVar4) + engine.load("main.qml") + app.exec() + +when isMainModule: + mainProc() + GC_fullcollect() + diff --git a/examples/simpledata/main.qml b/examples/simpledata/main.qml new file mode 100644 index 0000000..99ecb91 --- /dev/null +++ b/examples/simpledata/main.qml @@ -0,0 +1,21 @@ +import QtQuick 2.2 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.1 +import QtQuick.Window 2.1 + +ApplicationWindow +{ + width: 400 + height: 300 + title: "SimpleData" + Component.onCompleted: visible = true + + ColumnLayout + { + anchors.fill: parent + SpinBox { value: qVar1} + TextField { text: qVar2} + CheckBox { checked: qVar3} + SpinBox { value: qVar4; decimals: 1 } + } +} diff --git a/examples/simpledata/simpledata.nimble b/examples/simpledata/simpledata.nimble new file mode 100644 index 0000000..d367024 --- /dev/null +++ b/examples/simpledata/simpledata.nimble @@ -0,0 +1,10 @@ +[Package] +bin = "main" +name = "simpledata" +version = "0.1.0" +author = "Filippo Cucchetto" +description = "simpledata" +license = "MIT" + +[Deps] +Requires: "nim >= 0.11.2, nimqml >= 0.4.5" diff --git a/examples/slotsandproperties/.gitignore b/examples/slotsandproperties/.gitignore new file mode 100644 index 0000000..1b54545 --- /dev/null +++ b/examples/slotsandproperties/.gitignore @@ -0,0 +1,2 @@ +main +nimcache \ No newline at end of file diff --git a/examples/slotsandproperties/contact.nim b/examples/slotsandproperties/contact.nim new file mode 100644 index 0000000..3310b0b --- /dev/null +++ b/examples/slotsandproperties/contact.nim @@ -0,0 +1,40 @@ +## Please note we are using templates where ordinarily we would like to use procedures +## due to bug: https://github.com/Araq/Nim/issues/1821 +import NimQml + +type Contact = ref object of QObject + m_name: string + +proc delete*(self: Contact) = + var qobject = self.QObject + qobject.delete() + +proc create*(self: Contact) = + var qobject = self.QObject + qobject.create() + self.m_name = "InitialName" + self.registerSlot("getName", [QMetaType.QString]) + self.registerSlot("setName", [QMetaType.Void, QMetaType.QString]) + self.registerSignal("nameChanged", [QMetaType.Void]) + self.registerProperty("name", QMetaType.QString, "getName", "setName", "nameChanged") + +proc newContact*(): Contact = + new(result, delete) + result.create() + +method getName*(self: Contact): string = + result = self.m_name + +method setName*(self: Contact, name: string) = + if self.m_name != name: + self.m_name = name + self.emit("nameChanged") + +method onSlotCalled(self: Contact, slotName: string, args: openarray[QVariant]) = + case slotName: + of "getName": + args[0].stringVal = self.getName() + of "setName": + self.setName(args[1].stringVal) + else: + discard() diff --git a/examples/slotsandproperties/main.nim b/examples/slotsandproperties/main.nim new file mode 100644 index 0000000..e395a41 --- /dev/null +++ b/examples/slotsandproperties/main.nim @@ -0,0 +1,24 @@ +import NimQml +import Contact + +proc mainProc() = + var app = newQApplication() + defer: app.delete() + + var contact = newContact() + defer: contact.delete() + + var engine = newQQmlApplicationEngine() + defer: engine.delete() + + var variant = newQVariant(contact) + defer: variant.delete() + + engine.rootContext.setContextProperty("contact", variant) + engine.load("main.qml") + app.exec() + +when isMainModule: + mainProc() + GC_fullcollect() + diff --git a/examples/slotsandproperties/main.qml b/examples/slotsandproperties/main.qml new file mode 100644 index 0000000..f21c4be --- /dev/null +++ b/examples/slotsandproperties/main.qml @@ -0,0 +1,33 @@ +import QtQuick 2.2 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.1 +import QtQuick.Window 2.1 + +ApplicationWindow +{ + width: 400 + height: 300 + + Component.onCompleted: visible = true + + ColumnLayout + { + anchors.fill: parent + + Label + { + text: "Current name is:" + contact.name + } + + TextField + { + id: textField + } + + Button + { + text: "Change Name" + onClicked: contact.name = textField.text + } + } +} diff --git a/examples/slotsandproperties/slotsandproperties.nimble b/examples/slotsandproperties/slotsandproperties.nimble new file mode 100644 index 0000000..5bcec79 --- /dev/null +++ b/examples/slotsandproperties/slotsandproperties.nimble @@ -0,0 +1,10 @@ +[Package] +bin = "main" +name = "slotsandproperties" +version = "0.1.0" +author = "Filippo Cucchetto" +description = "slotsandproperties" +license = "MIT" + +[Deps] +Requires: "nim >= 0.11.2, nimqml >= 0.4.5" diff --git a/nimqml.nimble b/nimqml.nimble new file mode 100644 index 0000000..daa0fed --- /dev/null +++ b/nimqml.nimble @@ -0,0 +1,10 @@ +[Package] +name = "nimqml" +version = "0.4.5" +author = "Filippo Cucchetto, Will Szumski" +description = "QML bindings for Nim" +license = "LGPLv3" +srcDir = "src" + +[Deps] +Requires: "nim >= 0.11.2" diff --git a/NimQml.nim b/src/nimqml.nim similarity index 80% rename from NimQml.nim rename to src/nimqml.nim index a9f8914..980abe7 100644 --- a/NimQml.nim +++ b/src/nimqml.nim @@ -1,4 +1,4 @@ -include NimQmlTypes +include private.nimqmltypes ## NimQml aims to provide binding to the QML for the Nim programming language ## @@ -11,29 +11,29 @@ include NimQmlTypes ## when a finalzier will be run, or if, indeed, it will run at all. type QMetaType* {.pure.} = enum ## \ - ## Qt metatypes values used for specifing the + ## Qt metatypes values used for specifing the ## signals and slots argument and return types. ## ## This enum mimic the QMetaType::Type C++ enum - UnknownType = cint(0), + UnknownType = cint(0), Bool = cint(1), - Int = cint(2), - QString = cint(10), + Int = cint(2), + QString = cint(10), VoidStar = cint(31), QObjectStar = cint(39), - QVariant = cint(41), + QVariant = cint(41), Void = cint(43), var qobjectRegistry = initTable[ptr QObjectObj, bool]() -template debugMsg(message: string) = +template debugMsg(message: string) = {.push warning[user]: off.} # workaround to remove warnings; this won't be needed soon when defined(debug): {.pop.} echo "NimQml: ", message else: {.pop.} - + template debugMsg(typeName: string, procName: string) = {.push warning[user]: off.} # workaround to remove warnings; this won't be needed soon when defined(debug): @@ -43,9 +43,9 @@ template debugMsg(typeName: string, procName: string) = message &= procName debugMsg(message) else: - {.pop.} + {.pop.} -template debugMsg(typeName: string, procName: string, userMessage: string) = +template debugMsg(typeName: string, procName: string, userMessage: string) = {.push warning[user]: off.} # workaround to remove warnings; this won't be needed soon when defined(debug): {.pop.} @@ -70,46 +70,46 @@ template newWithCondFinalizer(variable: expr, finalizer: expr) = new(variable) # QVariant -proc dos_qvariant_create(variant: var RawQVariant) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_create_int(variant: var RawQVariant, value: cint) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_create_bool(variant: var RawQVariant, value: bool) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_create_string(variant: var RawQVariant, value: cstring) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_create_qobject(variant: var RawQVariant, value: RawQObject) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_create_qvariant(variant: var RawQVariant, value: RawQVariant) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_create_float(variant: var RawQVariant, value: cfloat) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_create_double(variant: var RawQVariant, value: cdouble) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_delete(variant: RawQVariant) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_isnull(variant: RawQVariant, isNull: var bool) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_toInt(variant: RawQVariant, value: var cint) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_toBool(variant: RawQVariant, value: var bool) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_toString(variant: RawQVariant, value: var cstring, length: var cint) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_setInt(variant: RawQVariant, value: cint) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_setBool(variant: RawQVariant, value: bool) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_setString(variant: RawQVariant, value: cstring) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_assign(leftValue: RawQVariant, rightValue: RawQVariant) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_toFloat(variant: RawQVariant, value: var cfloat) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_setFloat(variant: RawQVariant, value: float) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_toDouble(variant: RawQVariant, value: var cdouble) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_setDouble(variant: RawQVariant, value: cdouble) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qvariant_setQObject(variant: RawQVariant, value: RawQObject) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_chararray_delete(rawCString: cstring) {.cdecl, dynlib:"libDOtherSide.so", importc.} +proc dos_qvariant_create(variant: var RawQVariant) {.cdecl, importc.} +proc dos_qvariant_create_int(variant: var RawQVariant, value: cint) {.cdecl, importc.} +proc dos_qvariant_create_bool(variant: var RawQVariant, value: bool) {.cdecl, importc.} +proc dos_qvariant_create_string(variant: var RawQVariant, value: cstring) {.cdecl, importc.} +proc dos_qvariant_create_qobject(variant: var RawQVariant, value: RawQObject) {.cdecl, importc.} +proc dos_qvariant_create_qvariant(variant: var RawQVariant, value: RawQVariant) {.cdecl, importc.} +proc dos_qvariant_create_float(variant: var RawQVariant, value: cfloat) {.cdecl, importc.} +proc dos_qvariant_create_double(variant: var RawQVariant, value: cdouble) {.cdecl, importc.} +proc dos_qvariant_delete(variant: RawQVariant) {.cdecl, importc.} +proc dos_qvariant_isnull(variant: RawQVariant, isNull: var bool) {.cdecl, importc.} +proc dos_qvariant_toInt(variant: RawQVariant, value: var cint) {.cdecl, importc.} +proc dos_qvariant_toBool(variant: RawQVariant, value: var bool) {.cdecl, importc.} +proc dos_qvariant_toString(variant: RawQVariant, value: var cstring) {.cdecl, importc.} +proc dos_qvariant_setInt(variant: RawQVariant, value: cint) {.cdecl, importc.} +proc dos_qvariant_setBool(variant: RawQVariant, value: bool) {.cdecl, importc.} +proc dos_qvariant_setString(variant: RawQVariant, value: cstring) {.cdecl, importc.} +proc dos_qvariant_assign(leftValue: RawQVariant, rightValue: RawQVariant) {.cdecl, importc.} +proc dos_qvariant_toFloat(variant: RawQVariant, value: var cfloat) {.cdecl, importc.} +proc dos_qvariant_setFloat(variant: RawQVariant, value: float) {.cdecl, importc.} +proc dos_qvariant_toDouble(variant: RawQVariant, value: var cdouble) {.cdecl, importc.} +proc dos_qvariant_setDouble(variant: RawQVariant, value: cdouble) {.cdecl, importc.} +proc dos_qvariant_setQObject(variant: RawQVariant, value: RawQObject) {.cdecl, importc.} +proc dos_chararray_delete(rawCString: cstring) {.cdecl, importc.} proc create*(variant: QVariant) = ## Create a new QVariant dos_qvariant_create(variant.data) variant.deleted = false -proc create*(variant: QVariant, value: cint) = +proc create*(variant: QVariant, value: cint) = ## Create a new QVariant given a cint value dos_qvariant_create_int(variant.data, value) variant.deleted = false proc create*(variant: QVariant, value: bool) = - ## Create a new QVariant given a bool value + ## Create a new QVariant given a bool value dos_qvariant_create_bool(variant.data, value) variant.deleted = false -proc create*(variant: QVariant, value: string) = +proc create*(variant: QVariant, value: string) = ## Create a new QVariant given a string value dos_qvariant_create_string(variant.data, value) variant.deleted = false @@ -124,7 +124,7 @@ proc create*(variant: QVariant, value: RawQVariant) = ## The inner value of the QVariant is copied dos_qvariant_create_qvariant(variant.data, value) variant.deleted = false - + proc create*(variant: QVariant, value: cfloat) = ## Create a new QVariant given a cfloat value dos_qvariant_create_float(variant.data, value) @@ -134,8 +134,8 @@ proc create*(variant: QVariant, value: QVariant) = ## Create a new QVariant given another QVariant. ## The inner value of the QVariant is copied create(variant, value.data) - -proc delete*(variant: QVariant) = + +proc delete*(variant: QVariant) = ## Delete a QVariant if not variant.deleted: debugMsg("QVariant", "delete") @@ -144,7 +144,7 @@ proc delete*(variant: QVariant) = variant.deleted = true proc newQVariant*(): QVariant = - ## Return a new QVariant + ## Return a new QVariant newWithCondFinalizer(result, delete) result.create() @@ -182,23 +182,23 @@ proc newQVariant*(value: float): QVariant = ## Return a new QVariant given a float newWithCondFinalizer(result, delete) result.create(value) - -proc isNull*(variant: QVariant): bool = + +proc isNull*(variant: QVariant): bool = ## Return true if the QVariant value is null, false otherwise dos_qvariant_isnull(variant.data, result) -proc intVal*(variant: QVariant): int = +proc intVal*(variant: QVariant): int = ## Return the QVariant value as int var rawValue: cint dos_qvariant_toInt(variant.data, rawValue) result = rawValue.cint -proc `intVal=`*(variant: QVariant, value: int) = +proc `intVal=`*(variant: QVariant, value: int) = ## Sets the QVariant value int value var rawValue = value.cint dos_qvariant_setInt(variant.data, rawValue) -proc boolVal*(variant: QVariant): bool = +proc boolVal*(variant: QVariant): bool = ## Return the QVariant value as bool dos_qvariant_toBool(variant.data, result) @@ -214,7 +214,7 @@ proc floatVal*(variant: QVariant): float = proc `floatVal=`*(variant: QVariant, value: float) = ## Sets the QVariant float value - dos_qvariant_setFloat(variant.data, value.cfloat) + dos_qvariant_setFloat(variant.data, value.cfloat) proc doubleVal*(variant: QVariant): cdouble = ## Return the QVariant value as double @@ -224,48 +224,47 @@ proc doubleVal*(variant: QVariant): cdouble = proc `doubleVal=`*(variant: QVariant, value: cdouble) = ## Sets the QVariant double value - dos_qvariant_setDouble(variant.data, value) - -proc stringVal*(variant: QVariant): string = + dos_qvariant_setDouble(variant.data, value) + +proc stringVal*(variant: QVariant): string = ## Return the QVariant value as string var rawCString: cstring - var rawCStringLength: cint - dos_qvariant_toString(variant.data, rawCString, rawCStringLength) + dos_qvariant_toString(variant.data, rawCString) result = $rawCString dos_chararray_delete(rawCString) -proc `stringVal=`*(variant: QVariant, value: string) = +proc `stringVal=`*(variant: QVariant, value: string) = ## Sets the QVariant string value dos_qvariant_setString(variant.data, value) proc `qobjectVal=`*(variant: QVariant, value: QObject) = ## Sets the QVariant qobject value dos_qvariant_setQObject(variant.data, value.data.RawQObject) - + proc assign*(leftValue: QVariant, rightValue: QVariant) = ## Assign a QVariant with another. The inner value of the QVariant is copied - dos_qvariant_assign(leftValue.data, rightValue.data) + dos_qvariant_assign(leftValue.data, rightValue.data) # QQmlApplicationEngine -proc dos_qqmlapplicationengine_create(engine: var RawQQmlApplicationEngine) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qqmlapplicationengine_load(engine: RawQQmlApplicationEngine, filename: cstring) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qqmlapplicationengine_context(engine: RawQQmlApplicationEngine, context: var QQmlContext) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qqmlapplicationengine_delete(engine: RawQQmlApplicationEngine) {.cdecl, dynlib:"libDOtherSide.so", importc.} +proc dos_qqmlapplicationengine_create(engine: var RawQQmlApplicationEngine) {.cdecl, importc.} +proc dos_qqmlapplicationengine_load(engine: RawQQmlApplicationEngine, filename: cstring) {.cdecl, importc.} +proc dos_qqmlapplicationengine_context(engine: RawQQmlApplicationEngine, context: var QQmlContext) {.cdecl, importc.} +proc dos_qqmlapplicationengine_delete(engine: RawQQmlApplicationEngine) {.cdecl, importc.} -proc create*(engine: QQmlApplicationEngine) = +proc create*(engine: QQmlApplicationEngine) = ## Create an new QQmlApplicationEngine dos_qqmlapplicationengine_create(engine.data) engine.deleted = false - -proc load*(engine: QQmlApplicationEngine, filename: cstring) = - ## Load the given Qml file + +proc load*(engine: QQmlApplicationEngine, filename: cstring) = + ## Load the given Qml file dos_qqmlapplicationengine_load(engine.data, filename) proc rootContext*(engine: QQmlApplicationEngine): QQmlContext = ## Return the engine root context dos_qqmlapplicationengine_context(engine.data, result) -proc delete*(engine: QQmlApplicationEngine) = +proc delete*(engine: QQmlApplicationEngine) = ## Delete the given QQmlApplicationEngine if not engine.deleted: debugMsg("QQmlApplicationEngine", "delete") @@ -274,24 +273,24 @@ proc delete*(engine: QQmlApplicationEngine) = engine.deleted = true proc newQQmlApplicationEngine*(): QQmlApplicationEngine = - ## Return a new QQmlApplicationEngine + ## Return a new QQmlApplicationEngine newWithCondFinalizer(result, delete) result.create() # QQmlContext -proc dos_qqmlcontext_setcontextproperty(context: QQmlContext, propertyName: cstring, propertyValue: RawQVariant) {.cdecl, dynlib:"libDOtherSide.so", importc.} +proc dos_qqmlcontext_setcontextproperty(context: QQmlContext, propertyName: cstring, propertyValue: RawQVariant) {.cdecl, importc.} -proc setContextProperty*(context: QQmlContext, propertyName: string, propertyValue: QVariant) = +proc setContextProperty*(context: QQmlContext, propertyName: string, propertyValue: QVariant) = ## Sets a new property with the given value dos_qqmlcontext_setcontextproperty(context, propertyName, propertyValue.data) # QApplication -proc dos_qapplication_create() {.cdecl, dynlib: "libDOtherSide.so", importc.} -proc dos_qapplication_exec() {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qapplication_quit() {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qapplication_delete() {.cdecl, dynlib:"libDOtherSide.so", importc.} +proc dos_qapplication_create() {.cdecl, importc.} +proc dos_qapplication_exec() {.cdecl, importc.} +proc dos_qapplication_quit() {.cdecl, importc.} +proc dos_qapplication_delete() {.cdecl, importc.} -proc create*(application: QApplication) = +proc create*(application: QApplication) = ## Create a new QApplication dos_qapplication_create() application.deleted = false @@ -301,10 +300,10 @@ proc exec*(application: QApplication) = dos_qapplication_exec() proc quit*(application: QApplication) = - ## Quit the Qt event loop + ## Quit the Qt event loop dos_qapplication_quit() - -proc delete*(application: QApplication) = + +proc delete*(application: QApplication) = ## Delete the given QApplication if not application.deleted: debugMsg("QApplication", "delete") @@ -312,17 +311,17 @@ proc delete*(application: QApplication) = application.deleted = true proc newQApplication*(): QApplication = - ## Return a new QApplication + ## Return a new QApplication newWithCondFinalizer(result, delete) result.create() # QGuiApplication -proc dos_qguiapplication_create() {.cdecl, dynlib: "libDOtherSide.so", importc.} -proc dos_qguiapplication_exec() {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qguiapplication_quit() {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qguiapplication_delete() {.cdecl, dynlib:"libDOtherSide.so", importc.} +proc dos_qguiapplication_create() {.cdecl, importc.} +proc dos_qguiapplication_exec() {.cdecl, importc.} +proc dos_qguiapplication_quit() {.cdecl, importc.} +proc dos_qguiapplication_delete() {.cdecl, importc.} -proc create*(application: QGuiApplication) = +proc create*(application: QGuiApplication) = ## Create a new QApplication dos_qguiapplication_create() application.deleted = false @@ -332,10 +331,10 @@ proc exec*(application: QGuiApplication) = dos_qguiapplication_exec() proc quit*(application: QGuiApplication) = - ## Quit the Qt event loop + ## Quit the Qt event loop dos_qguiapplication_quit() - -proc delete*(application: QGuiApplication) = + +proc delete*(application: QGuiApplication) = ## Delete the given QApplication if not application.deleted: debugMsg("QApplication", "delete") @@ -343,10 +342,10 @@ proc delete*(application: QGuiApplication) = application.deleted = true proc newQGuiApplication*(): QGuiApplication = - ## Return a new QApplication + ## Return a new QApplication newWithCondFinalizer(result, delete) result.create() - + # QObject type RawQVariantArray {.unchecked.} = array[0..0, RawQVariant] type RawQVariantArrayPtr = ptr RawQVariantArray @@ -372,13 +371,13 @@ proc toCIntSeq(metaTypes: openarray[QMetaType]): seq[cint] = result.add(cint(metaType)) type QObjectCallBack = proc(nimobject: ptr QObjectObj, slotName: RawQVariant, numArguments: cint, arguments: RawQVariantArrayPtr) {.cdecl.} - -proc dos_qobject_create(qobject: var RawQObject, nimobject: ptr QObjectObj, qobjectCallback: QObjectCallBack) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qobject_delete(qobject: RawQObject) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qobject_slot_create(qobject: RawQObject, slotName: cstring, argumentsCount: cint, argumentsMetaTypes: ptr cint, slotIndex: var cint) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qobject_signal_create(qobject: RawQObject, signalName: cstring, argumentsCount: cint, argumentsMetaTypes: ptr cint, signalIndex: var cint) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qobject_signal_emit(qobject: RawQObject, signalName: cstring, argumentsCount: cint, arguments: ptr RawQVariant) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qobject_property_create(qobject: RawQObject, propertyName: cstring, propertyType: cint, readSlot: cstring, writeSlot: cstring, notifySignal: cstring) {.cdecl, dynlib:"libDOtherSide.so", importc.} + +proc dos_qobject_create(qobject: var RawQObject, nimobject: ptr QObjectObj, qobjectCallback: QObjectCallBack) {.cdecl, importc.} +proc dos_qobject_delete(qobject: RawQObject) {.cdecl, importc.} +proc dos_qobject_slot_create(qobject: RawQObject, slotName: cstring, argumentsCount: cint, argumentsMetaTypes: ptr cint, slotIndex: var cint) {.cdecl, importc.} +proc dos_qobject_signal_create(qobject: RawQObject, signalName: cstring, argumentsCount: cint, argumentsMetaTypes: ptr cint, signalIndex: var cint) {.cdecl, importc.} +proc dos_qobject_signal_emit(qobject: RawQObject, signalName: cstring, argumentsCount: cint, arguments: ptr RawQVariant) {.cdecl, importc.} +proc dos_qobject_property_create(qobject: RawQObject, propertyName: cstring, propertyType: cint, readSlot: cstring, writeSlot: cstring, notifySignal: cstring) {.cdecl, importc.} method onSlotCalled*(nimobject: QObject, slotName: string, args: openarray[QVariant]) = ## Called from the NimQml bridge when a slot is called from Qml. @@ -409,8 +408,8 @@ proc create*(qobject: QObject) = let qobjectPtr = addr(qobject[]) dos_qobject_create(qobject.data, qobjectPtr, qobjectCallback) qobjectRegistry[qobjectPtr] = true - -proc delete*(qobject: QObject) = + +proc delete*(qobject: QObject) = ## Delete the given QObject if not qobject.deleted: debugMsg("QObject", "delete") @@ -419,27 +418,27 @@ proc delete*(qobject: QObject) = dos_qobject_delete(qobject.data) qobject.data = nil.RawQObject qobject.deleted = true - + proc newQObject*(): QObject = ## Return a new QObject newWithCondFinalizer(result, delete) result.create() proc registerSlot*(qobject: QObject, - slotName: string, + slotName: string, metaTypes: openarray[QMetaType]) = ## Register a slot in the QObject with the given name and signature # Copy the metatypes array var copy = toCIntSeq(metatypes) - var index: cint + var index: cint dos_qobject_slot_create(qobject.data, slotName, cint(copy.len), addr(copy[0].cint), index) qobject.slots[slotName] = index proc registerSignal*(qobject: QObject, - signalName: string, + signalName: string, metatypes: openarray[QMetaType]) = ## Register a signal in the QObject with the given name and signature - var index: cint + var index: cint if metatypes.len > 0: var copy = toCIntSeq(metatypes) dos_qobject_signal_create(qobject.data, signalName, copy.len.cint, addr(copy[0].cint), index) @@ -448,10 +447,10 @@ proc registerSignal*(qobject: QObject, qobject.signals[signalName] = index proc registerProperty*(qobject: QObject, - propertyName: string, - propertyType: QMetaType, - readSlot: string, - writeSlot: string, + propertyName: string, + propertyType: QMetaType, + readSlot: string, + writeSlot: string, notifySignal: string) = ## Register a property in the QObject with the given name and type. assert propertyName != nil, "property name cannot be nil" @@ -463,25 +462,25 @@ proc registerProperty*(qobject: QObject, proc emit*(qobject: QObject, signalName: string, args: openarray[QVariant] = []) = ## Emit the signal with the given name and values - if args.len > 0: + if args.len > 0: var copy = args.toRawVariantSeq dos_qobject_signal_emit(qobject.data, signalName, copy.len.cint, addr(copy[0])) else: dos_qobject_signal_emit(qobject.data, signalName, 0, nil) # QQuickView -proc dos_qquickview_create(view: var RawQQuickView) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qquickview_delete(view: RawQQuickView) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qquickview_show(view: RawQQuickView) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qquickview_source(view: RawQQuickView, filename: var cstring, length: var int) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qquickview_set_source(view: RawQQuickView, filename: cstring) {.cdecl, dynlib:"libDOtherSide.so", importc.} +proc dos_qquickview_create(view: var RawQQuickView) {.cdecl, importc.} +proc dos_qquickview_delete(view: RawQQuickView) {.cdecl, importc.} +proc dos_qquickview_show(view: RawQQuickView) {.cdecl, importc.} +proc dos_qquickview_source(view: RawQQuickView, filename: var cstring, length: var int) {.cdecl, importc.} +proc dos_qquickview_set_source(view: RawQQuickView, filename: cstring) {.cdecl, importc.} proc create(view: var QQuickView) = ## Create a new QQuickView dos_qquickview_create(view.data) view.deleted = false -proc source(view: QQuickView): cstring = +proc source(view: QQuickView): cstring = ## Return the source Qml file loaded by the view var length: int dos_qquickview_source(view.data, result, length) @@ -490,8 +489,8 @@ proc `source=`(view: QQuickView, filename: cstring) = ## Sets the source Qml file laoded by the view dos_qquickview_set_source(view.data, filename) -proc show(view: QQuickView) = - ## Sets the view visible +proc show(view: QQuickView) = + ## Sets the view visible dos_qquickview_show(view.data) proc delete(view: QQuickView) = @@ -503,20 +502,20 @@ proc delete(view: QQuickView) = view.deleted = true proc newQQuickView*(): QQuickView = - ## Return a new QQuickView + ## Return a new QQuickView newWithCondFinalizer(result, delete) result.create() # QModelIndex -proc dos_qmodelindex_create(modelIndex: var RawQModelIndex) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qmodelindex_delete(modelIndex: RawQModelIndex) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qmodelindex_row(modelIndex: RawQModelIndex, row: var cint) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qmodelindex_column(modelIndex: RawQModelIndex, column: var cint) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qmodelindex_isValid(modelIndex: RawQModelIndex, column: var bool) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qmodelindex_data(modelIndex: RawQModelIndex, role: cint, data: RawQVariant) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qmodelindex_parent(modelIndex: RawQModelIndex, parent: RawQModelIndex) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qmodelindex_child(modelIndex: RawQModelIndex, row: cint, column: cint, parent: RawQModelIndex) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qmodelindex_sibling(modelIndex: RawQModelIndex, row: cint, column: cint, sibling: RawQModelIndex) {.cdecl, dynlib:"libDOtherSide.so", importc.} +proc dos_qmodelindex_create(modelIndex: var RawQModelIndex) {.cdecl, importc.} +proc dos_qmodelindex_delete(modelIndex: RawQModelIndex) {.cdecl, importc.} +proc dos_qmodelindex_row(modelIndex: RawQModelIndex, row: var cint) {.cdecl, importc.} +proc dos_qmodelindex_column(modelIndex: RawQModelIndex, column: var cint) {.cdecl, importc.} +proc dos_qmodelindex_isValid(modelIndex: RawQModelIndex, column: var bool) {.cdecl, importc.} +proc dos_qmodelindex_data(modelIndex: RawQModelIndex, role: cint, data: RawQVariant) {.cdecl, importc.} +proc dos_qmodelindex_parent(modelIndex: RawQModelIndex, parent: RawQModelIndex) {.cdecl, importc.} +proc dos_qmodelindex_child(modelIndex: RawQModelIndex, row: cint, column: cint, parent: RawQModelIndex) {.cdecl, importc.} +proc dos_qmodelindex_sibling(modelIndex: RawQModelIndex, row: cint, column: cint, sibling: RawQModelIndex) {.cdecl, importc.} proc create*(modelIndex: var QModelIndex) = ## Create a new QModelIndex @@ -527,7 +526,7 @@ proc create*(modelIndex: var QModelIndex, rawQModelIndex: RawQModelIndex) = ## Create a new QModelIndex modelIndex.data = rawQModelIndex modelIndex.deleted = false - + proc delete*(modelIndex: QModelIndex) = ## Delete the given QModelIndex if not modelIndex.deleted: @@ -559,7 +558,7 @@ proc isValid*(modelIndex: QModelIndex): bool = dos_qmodelindex_isValid(modelIndex.data, result) proc data*(modelIndex: QModelIndex, role: cint): QVariant = - ## Return the model data associated to the given role + ## Return the model data associated to the given role result = newQVariant() dos_qmodelindex_data(modelIndex.data, role, result.data) @@ -579,10 +578,10 @@ proc sibling*(modelIndex: QModelIndex, row: cint, column: cint): QModelIndex = dos_qmodelindex_sibling(modelIndex.data, row, column, result.data) # QHashIntByteArray -proc dos_qhash_int_qbytearray_create(qHash: var RawQHashIntByteArray) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qhash_int_qbytearray_delete(qHash: RawQHashIntByteArray) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qhash_int_qbytearray_insert(qHash: RawQHashIntByteArray, key: int, value: cstring) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qhash_int_qbytearray_value(qHash: RawQHashIntByteArray, key: int, value: var cstring) {.cdecl, dynlib:"libDOtherSide.so", importc.} +proc dos_qhash_int_qbytearray_create(qHash: var RawQHashIntByteArray) {.cdecl, importc.} +proc dos_qhash_int_qbytearray_delete(qHash: RawQHashIntByteArray) {.cdecl, importc.} +proc dos_qhash_int_qbytearray_insert(qHash: RawQHashIntByteArray, key: int, value: cstring) {.cdecl, importc.} +proc dos_qhash_int_qbytearray_value(qHash: RawQHashIntByteArray, key: int, value: var cstring) {.cdecl, importc.} proc create*(qHash: var QHashIntByteArray) = ## Create the QHash @@ -593,7 +592,7 @@ proc create*(qHash: var QHashIntByteArray) = proc delete*(qHash: QHashIntByteArray) = ## Delete the QHash if not qHash.deleted: - debugMsg("QHashIntByteArray", "delete") + debugMsg("QHashIntByteArray", "delete") dos_qhash_int_qbytearray_delete(qHash.data) qHash.deleted = true @@ -602,17 +601,17 @@ proc insert*(qHash: QHashIntByteArray, key: int, value: cstring) = dos_qhash_int_qbytearray_insert(qHash.data, key, value) proc value*(qHash: QHashIntByteArray, key: int): string = - ## Return the value associated at the given key + ## Return the value associated at the given key var rawString: cstring dos_qhash_int_qbytearray_value(qHash.data, key, rawString) result = $rawString dos_chararray_delete(rawString) proc newQHashIntQByteArray*(): QHashIntByteArray = - ## Create a new QHashIntQByteArray + ## Create a new QHashIntQByteArray newWithCondFinalizer(result, delete) result.create() - + # QAbstractListModel type RowCountCallback = proc(modelObject: ptr QAbstractListModelObj, rawIndex: RawQModelIndex, result: var cint) {.cdecl.} @@ -632,25 +631,25 @@ proc dos_qabstractlistmodel_create(model: var RawQAbstractListModel, setDataCallback: SetDataCallBack, roleNamesCallback: RoleNamesCallback, flagsCallback: FlagsCallback, - headerDataCallback: HeaderDataCallback) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qabstractlistmodel_delete(model: RawQAbstractListModel) {.cdecl, dynlib:"libDOtherSide.so", importc.} + headerDataCallback: HeaderDataCallback) {.cdecl, importc.} +proc dos_qabstractlistmodel_delete(model: RawQAbstractListModel) {.cdecl, importc.} proc dos_qabstractlistmodel_beginInsertRows(model: RawQAbstractListModel, parentIndex: RawQModelIndex, first: cint, - last: cint) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qabstractlistmodel_endInsertRows(model: RawQAbstractListModel) {.cdecl, dynlib:"libDOtherSide.so", importc.} + last: cint) {.cdecl, importc.} +proc dos_qabstractlistmodel_endInsertRows(model: RawQAbstractListModel) {.cdecl, importc.} proc dos_qabstractlistmodel_beginRemoveRows(model: RawQAbstractListModel, parentIndex: RawQModelIndex, first: cint, - last: cint) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qabstractlistmodel_endRemoveRows(model: RawQAbstractListModel) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qabstractlistmodel_beginResetModel(model: RawQAbstractListModel) {.cdecl, dynlib:"libDOtherSide.so", importc.} -proc dos_qabstractlistmodel_endResetModel(model: RawQAbstractListModel) {.cdecl, dynlib:"libDOtherSide.so", importc.} + last: cint) {.cdecl, importc.} +proc dos_qabstractlistmodel_endRemoveRows(model: RawQAbstractListModel) {.cdecl, importc.} +proc dos_qabstractlistmodel_beginResetModel(model: RawQAbstractListModel) {.cdecl, importc.} +proc dos_qabstractlistmodel_endResetModel(model: RawQAbstractListModel) {.cdecl, importc.} proc dos_qabstractlistmodel_dataChanged(model: RawQAbstractListModel, parentLeft: RawQModelIndex, bottomRight: RawQModelIndex, rolesArrayPtr: ptr cint, - rolesArrayLength: cint) {.cdecl, dynlib:"libDOtherSide.so", importc.} + rolesArrayLength: cint) {.cdecl, importc.} method rowCount*(model: QAbstractListModel, index: QModelIndex): cint = ## Return the model's row count @@ -671,11 +670,11 @@ proc columnCountCallback(modelObject: ptr QAbstractListModelObj, rawIndex: RawQM let model = cast[QAbstractListModel](modelObject) let index = newQModelIndex(rawIndex) result = model.columnCount(index) - + method data*(model: QAbstractListModel, index: QModelIndex, role: cint): QVariant = ## Return the data at the given model index and role - return nil - + return nil + proc dataCallback(modelObject: ptr QAbstractListModelObj, rawIndex: RawQModelIndex, role: cint, result: RawQVariant) {.cdecl, exportc.} = debugMsg("QAbstractListModel", "dataCallback") let model = cast[QAbstractListModel](modelObject) @@ -687,7 +686,7 @@ proc dataCallback(modelObject: ptr QAbstractListModelObj, rawIndex: RawQModelInd method setData*(model: QAbstractListModel, index: QModelIndex, value: QVariant, role: cint): bool = ## Sets the data at the given index and role. Return true on success, false otherwise - return false + return false proc setDataCallback(modelObject: ptr QAbstractListModelObj, rawIndex: RawQModelIndex, rawQVariant: RawQVariant, role: cint, result: var bool) {.cdecl, exportc.} = debugMsg("QAbstractListModel", "setDataCallback") @@ -695,17 +694,17 @@ proc setDataCallback(modelObject: ptr QAbstractListModelObj, rawIndex: RawQModel let index = newQModelIndex(rawIndex) let variant = newQVariant(rawQVariant) result = model.setData(index, variant, role) - + method roleNames*(model: QAbstractListModel): Table[cint, cstring] = - ## Return the model role names + ## Return the model role names result = initTable[cint, cstring]() proc roleNamesCallback(modelObject: ptr QAbstractListModelObj, hash: RawQHashIntByteArray) {.cdecl, exportc.} = debugMsg("QAbstractListModel", "roleNamesCallback") let model = cast[QAbstractListModel](modelObject) let table = model.roleNames() - for pair in table.pairs: - dos_qhash_int_qbytearray_insert(hash, pair.key, pair.val) + for key, val in table.pairs: + dos_qhash_int_qbytearray_insert(hash, key, val) method flags*(model: QAbstractListModel, index: QModelIndex): QtItemFlag = ## Return the item flags and the given index @@ -728,7 +727,7 @@ proc headerDataCallback(modelObject: ptr QAbstractListModelObj, section: cint, o if variant != nil: dos_qvariant_assign(result, variant.data) variant.delete - + proc create*(model: var QAbstractListModel) = ## Create a new QAbstractListModel debugMsg("QAbstractListModel", "create") @@ -756,7 +755,7 @@ proc newQAbstractListModel*(): QAbstractListModel = result.create() proc beginInsertRows*(model: QAbstractListModel, parentIndex: QModelIndex, first: int, last: int) = - ## Notify the view that the model is about to inserting the given number of rows + ## Notify the view that the model is about to inserting the given number of rows dos_qabstractlistmodel_beginInsertRows(model.data.RawQAbstractListModel, parentIndex.data, first.cint, last.cint) proc endInsertRows*(model: QAbstractListModel) = @@ -764,7 +763,7 @@ proc endInsertRows*(model: QAbstractListModel) = dos_qabstractlistmodel_endInsertRows(model.data.RawQAbstractListModel) proc beginRemoveRows*(model: QAbstractListModel, parentIndex: QModelIndex, first: int, last: int) = - ## Notify the view that the model is about to remove the given number of rows + ## Notify the view that the model is about to remove the given number of rows dos_qabstractlistmodel_beginRemoveRows(model.data.RawQAbstractListModel, parentIndex.data, first.cint, last.cint) proc endRemoveRows*(model: QAbstractListModel) = @@ -785,5 +784,6 @@ proc dataChanged*(model: QAbstractListModel, roles: seq[cint]) = ## Notify the view that the model data changed var copy = roles - dos_qabstractlistmodel_dataChanged(model.data.RawQAbstractListModel, topLeft.data, bottomRight.data, copy[0].addr, copy.len.cint) - + dos_qabstractlistmodel_dataChanged(model.data.RawQAbstractListModel, topLeft.data, bottomRight.data, copy[0].addr, copy.len.cint) + +include private.nimqmlmacros diff --git a/NimQmlMacros.nim b/src/private/nimqmlmacros.nim similarity index 86% rename from NimQmlMacros.nim rename to src/private/nimqmlmacros.nim index fe6fc39..8a8bba8 100644 --- a/NimQmlMacros.nim +++ b/src/private/nimqmlmacros.nim @@ -31,9 +31,9 @@ let nim2QtMeta {.compileTime.} = { "" : "Void", # no return, which is represented by an nnkEmpty node }.toTable -proc getNodeOf*(tree: PNimrodNode, kind: TNimrodNodeKind): PNimrodNode {.compileTime.} = +proc getNodeOf*(tree: NimNode, kind: NimNodeKind): NimNode {.compileTime.} = ## recursively looks for a node of kind, ``kind``, in the tree provided as ``tree`` - ## Returnsthe first node that satisfies this condition + ## Returns the first node that satisfies this condition for i in 0.. 2: # more args than just type @@ -238,19 +238,19 @@ template prototypeOnSlotCalled(typ: expr): stmt {.dirty.} = procCall onSlotCalled(super, slotName, args) #FIXME: changed parent, typ from typedesc to expr to workaround Nim issue #1874 -template prototypeCreate(typ: expr): stmt = +template prototypeCreate(typ: expr): stmt {.dirty.}= proc create*(myQObject: var typ) = var super = (typ.superType())(myQObject) procCall create(super) -proc doRemoveOpenSym(a: var PNimrodNode): PNimrodNode {.compileTime.} = +proc doRemoveOpenSym(a: var NimNode): NimNode {.compileTime.} = hookOnNode(NullContext(),a, removeOpenSym, true) -proc templateBody*(a: PNimrodNode): PNimrodNode {.compileTime.} = +proc templateBody*(a: NimNode): NimNode {.compileTime.} = expectKind a, nnkTemplateDef result = a[6] -proc genArgTypeArray(params: PNimrodNode): PNimrodNode {.compileTime.} = +proc genArgTypeArray(params: NimNode): NimNode {.compileTime.} = expectKind params, nnkFormalParams result = newNimNode(nnkBracket) for i in 0 ..