diff options
102 files changed, 2304 insertions, 767 deletions
diff --git a/LGPL_EXCEPTION.TXT b/LGPL_EXCEPTION.TXT new file mode 100644 index 0000000..a54c00e --- /dev/null +++ b/LGPL_EXCEPTION.TXT @@ -0,0 +1,22 @@ +Nokia Qt LGPL Exception version 1.1 + +As an additional permission to the GNU Lesser General Public License version +2.1, the object code form of a "work that uses the Library" may incorporate +material from a header file that is part of the Library. You may distribute +such object code under terms of your choice, provided that: + (i) the header files of the Library have not been modified; and + (ii) the incorporated material is limited to numerical parameters, data + structure layouts, accessors, macros, inline functions and + templates; and + (iii) you comply with the terms of Section 6 of the GNU Lesser General + Public License version 2.1. + +Moreover, you may apply this exception to a modified version of the Library, +provided that such modification does not involve copying material from the +Library into the modified Library's header files unless such material is +limited to (i) numerical parameters; (ii) data structure layouts; +(iii) accessors; and (iv) small macros, templates and inline functions of +five lines or less in length. + +Furthermore, you are not required to apply this additional permission to a +modified version of the Library. diff --git a/LICENSE.LGPL b/LICENSE.LGPL new file mode 100644 index 0000000..602bfc9 --- /dev/null +++ b/LICENSE.LGPL @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. 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 not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the 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 +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/models/symbian3/N8_3D_back.png b/models/symbian3/N8_3D_back.png Binary files differdeleted file mode 100644 index 5238a10..0000000 --- a/models/symbian3/N8_3D_back.png +++ /dev/null diff --git a/models/symbian3/N8_3D_bottom.png b/models/symbian3/N8_3D_bottom.png Binary files differdeleted file mode 100644 index 19d8fba..0000000 --- a/models/symbian3/N8_3D_bottom.png +++ /dev/null diff --git a/models/symbian3/N8_3D_front.png b/models/symbian3/N8_3D_front.png Binary files differdeleted file mode 100644 index 113d99c..0000000 --- a/models/symbian3/N8_3D_front.png +++ /dev/null diff --git a/models/symbian3/N8_3D_right.png b/models/symbian3/N8_3D_right.png Binary files differdeleted file mode 100644 index c3b8121..0000000 --- a/models/symbian3/N8_3D_right.png +++ /dev/null diff --git a/models/symbian3/N8_3D_top.png b/models/symbian3/N8_3D_top.png Binary files differdeleted file mode 100644 index 6d5d30a..0000000 --- a/models/symbian3/N8_3D_top.png +++ /dev/null diff --git a/src/main.cpp b/src/main.cpp index 03a19d5..9ed3b90 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/mobility/contacts.cpp b/src/mobility/contacts.cpp index b75a3e9..fbe05eb 100644 --- a/src/mobility/contacts.cpp +++ b/src/mobility/contacts.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/mobility/contacts.h b/src/mobility/contacts.h index ffa6671..a851e1c 100644 --- a/src/mobility/contacts.h +++ b/src/mobility/contacts.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/mobility/feedback.cpp b/src/mobility/feedback.cpp index 108f3d7..d6288e6 100644 --- a/src/mobility/feedback.cpp +++ b/src/mobility/feedback.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/mobility/feedback.h b/src/mobility/feedback.h index b520f56..9732b9a 100644 --- a/src/mobility/feedback.h +++ b/src/mobility/feedback.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/mobility/messaging.cpp b/src/mobility/messaging.cpp index 8b7ebeb..722160e 100644 --- a/src/mobility/messaging.cpp +++ b/src/mobility/messaging.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/mobility/messaging.h b/src/mobility/messaging.h index ad55c9c..a60637c 100644 --- a/src/mobility/messaging.h +++ b/src/mobility/messaging.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/mobility/mobilitydata.cpp b/src/mobility/mobilitydata.cpp index 9b2c82a..f6d385d 100644 --- a/src/mobility/mobilitydata.cpp +++ b/src/mobility/mobilitydata.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ @@ -51,6 +55,7 @@ MobilityData::MobilityData(QObject *parent) , mMessaging(new Messaging(this)) , mSensorsUi(0) , mCameraUi(0) + , mNfcUi(0) , mInitialized(false) { } diff --git a/src/mobility/mobilitydata.h b/src/mobility/mobilitydata.h index 6e67a6b..b4c280c 100644 --- a/src/mobility/mobilitydata.h +++ b/src/mobility/mobilitydata.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ @@ -45,6 +49,7 @@ #include "sensorsui.h" #include "cameraui.h" #include "deviceitem.h" +#include "nfcui.h" #include <remotecontrolwidget/locationui.h> @@ -65,6 +70,7 @@ public: Messaging *mMessaging; SensorsUi *mSensorsUi; CameraUi *mCameraUi; + NfcUi *mNfcUi; void setInitialData(); diff --git a/src/mobility/mobilitymanager.cpp b/src/mobility/mobilitymanager.cpp index f1f14b2..f1caa37 100644 --- a/src/mobility/mobilitymanager.cpp +++ b/src/mobility/mobilitymanager.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ @@ -496,6 +500,12 @@ void MobilityClient::setRequestsSensors() "initialSensorsDataSent"); } +void MobilityClient::setRequestsNfc() +{ + connect(mMobilityServer->mMobility->mNfcUi, SIGNAL(targetInRange(QByteArray)), + SLOT(sendNfcTargetInRange(QByteArray))); +} + void MobilityClient::setRequestsOrganizer() { QOrganizerManager *manager = mMobilityServer->mMobility->mOrganizer->manager(); @@ -552,7 +562,7 @@ void MobilityClient::setRequestsDocGallery() connect(mMobilityServer->mMobility->mDocGalleryUi, SIGNAL(docGalleryDataChanged(QtMobility::DocGallerySimulatorData)), this, SLOT(sendDocGallery(QtMobility::DocGallerySimulatorData))); - sendDocGallery(mMobilityServer->mMobility->mDocGalleryUi->data); + sendDocGallery(mMobilityServer->mMobility->mDocGalleryUi->data()); QtSimulatorPrivate::RemoteMetacall<void>::call(mSendSocket, QtSimulatorPrivate::NoSync, "initialDocGalleryDataSent"); } @@ -649,6 +659,11 @@ Simulator::SaveRelationshipReply MobilityClient::requestSaveRelationship(const Q return reply; } +QByteArray MobilityClient::nfcSendCommand(const QByteArray &command) +{ + return mMobilityServer->mMobility->mNfcUi->processCommand(command); +} + int MobilityClient::requestRemoveRelationship(const QContactRelationship &relationship) { // execute change and notify other clients in the process @@ -974,3 +989,10 @@ void MobilityClient::sendEffectStateChange(int effectId, QtMobility::QFeedbackEf QtSimulatorPrivate::RemoteMetacall<void>::call(mSendSocket, QtSimulatorPrivate::NoSync, "setFeedbackEffectState", effectId, static_cast<int>(state)); } + +void MobilityClient::sendNfcTargetInRange(const QByteArray &uid) +{ + QtSimulatorPrivate::RemoteMetacall<void>::call(mSendSocket, QtSimulatorPrivate::NoSync, + "targetInRange", uid); +} + diff --git a/src/mobility/mobilitymanager.h b/src/mobility/mobilitymanager.h index 54be88c..f765ffe 100644 --- a/src/mobility/mobilitymanager.h +++ b/src/mobility/mobilitymanager.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ @@ -117,6 +121,8 @@ public slots: void sendCameraRemoved(const QString &name); void sendCameraChanged(const QString &name, const CameraUi::CameraData::CameraDetails &newDetails); + void sendNfcTargetInRange(const QByteArray &uid); + private slots: void disconnect(); void readyRead(); @@ -142,6 +148,7 @@ private slots: void setRequestsLocationInfo(); void setRequestsContactInfo(); void setRequestsSensors(); + void setRequestsNfc(); void setRequestsOrganizer(); void setRequestsFeedback(); void setRequestsDocGallery(); @@ -171,6 +178,8 @@ private slots: void setFeedbackEffectDuration(int effectId, int duration); void setFeedbackActuatorEnabled(int actuatorId, bool enabled); + QByteArray nfcSendCommand(const QByteArray &command); + private: void syncOrganizerDetailDefinitions(); diff --git a/src/mobility/organizer.cpp b/src/mobility/organizer.cpp index 13165c5..3bb065b 100644 --- a/src/mobility/organizer.cpp +++ b/src/mobility/organizer.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/mobility/organizer.h b/src/mobility/organizer.h index 94afe04..bb660c7 100644 --- a/src/mobility/organizer.h +++ b/src/mobility/organizer.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/mobility/organizertreemodel.cpp b/src/mobility/organizertreemodel.cpp index bca8f8a..0f410db 100644 --- a/src/mobility/organizertreemodel.cpp +++ b/src/mobility/organizertreemodel.cpp @@ -1,3 +1,36 @@ +/************************************************************************** +** +** This file is part of Qt Simulator +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** No Commercial Usage +** +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + #include "organizertreemodel.h" #ifdef QT_DEBUG #include <modeltest.h> diff --git a/src/mobility/organizertreemodel.h b/src/mobility/organizertreemodel.h index 88e56b0..ab7640e 100644 --- a/src/mobility/organizertreemodel.h +++ b/src/mobility/organizertreemodel.h @@ -1,3 +1,36 @@ +/************************************************************************** +** +** This file is part of Qt Simulator +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** No Commercial Usage +** +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + #ifndef ORGANIZERTREEMODEL_H #define ORGANIZERTREEMODEL_H diff --git a/src/modeltest/modeltest.cpp b/src/modeltest/modeltest.cpp index 377577a..79bc47d 100644 --- a/src/modeltest/modeltest.cpp +++ b/src/modeltest/modeltest.cpp @@ -1,25 +1,35 @@ -/**************************************************************************** +/************************************************************************** ** -** Copyright (C) 2007 Trolltech ASA. All rights reserved. +** This file is part of Qt Simulator ** -** This file is part of the Qt Concurrent project on Trolltech Labs. +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://www.trolltech.com/products/qt/opensource.html +** Contact: Nokia Corporation (qt-info@nokia.com) ** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://www.trolltech.com/products/qt/licensing.html or contact the -** sales department at sales@trolltech.com. +** No Commercial Usage ** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** -****************************************************************************/ +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ #include <QtGui/QtGui> diff --git a/src/modeltest/modeltest.h b/src/modeltest/modeltest.h index 38b6b2b..e9b1547 100644 --- a/src/modeltest/modeltest.h +++ b/src/modeltest/modeltest.h @@ -1,25 +1,35 @@ -/**************************************************************************** +/************************************************************************** ** -** Copyright (C) 2007 Trolltech ASA. All rights reserved. +** This file is part of Qt Simulator ** -** This file is part of the Qt Concurrent project on Trolltech Labs. +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://www.trolltech.com/products/qt/opensource.html +** Contact: Nokia Corporation (qt-info@nokia.com) ** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://www.trolltech.com/products/qt/licensing.html or contact the -** sales department at sales@trolltech.com. +** No Commercial Usage ** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** -****************************************************************************/ +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ #ifndef MODELTEST_H #define MODELTEST_H diff --git a/src/other/application.cpp b/src/other/application.cpp index 8645779..1352bda 100644 --- a/src/other/application.cpp +++ b/src/other/application.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/application.h b/src/other/application.h index 3927006..9a7b8fb 100644 --- a/src/other/application.h +++ b/src/other/application.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/applicationmanager.cpp b/src/other/applicationmanager.cpp index b59a534..674599d 100644 --- a/src/other/applicationmanager.cpp +++ b/src/other/applicationmanager.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/applicationmanager.h b/src/other/applicationmanager.h index b42c674..1f73f6a 100644 --- a/src/other/applicationmanager.h +++ b/src/other/applicationmanager.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/configurationreader.cpp b/src/other/configurationreader.cpp index dd92c19..7f621d9 100644 --- a/src/other/configurationreader.cpp +++ b/src/other/configurationreader.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/configurationreader.h b/src/other/configurationreader.h index 7e10adc..fcdaff5 100644 --- a/src/other/configurationreader.h +++ b/src/other/configurationreader.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/deviceitem.cpp b/src/other/deviceitem.cpp index 175a03d..06c1ce2 100644 --- a/src/other/deviceitem.cpp +++ b/src/other/deviceitem.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ @@ -68,59 +72,10 @@ DeviceItem::DeviceItem(QGraphicsItem *parent) const int rotationDuration = 250; - stateHash[topUp] = new QState; - stateHash[topDown] = new QState; - stateHash[leftUp] = new QState; - stateHash[rightUp] = new QState; - delegationState = new QState; - - stateHash[topUp]->assignProperty(this, "rotation", 0); - stateHash[topDown]->assignProperty(this, "rotation", 180); - stateHash[leftUp]->assignProperty(this, "rotation", 90); - stateHash[rightUp]->assignProperty(this, "rotation", 270); - - connect(delegationState, SIGNAL(exited()), this, SLOT(startRotate())); - connect(delegationState, SIGNAL(entered()), this, SLOT(initiateRotate())); - - stateHash[topUp]->addTransition(this, "rotationSignal()", delegationState); - QSignalTransition *toTopUpTransition = delegationState->addTransition(this, "rotateToTopUp()", stateHash[topUp]); - QPropertyAnimation *toTopUpAnimation = new QPropertyAnimation(this, "rotation", this); - toTopUpAnimation->setDuration(rotationDuration); - toTopUpTransition->addAnimation(toTopUpAnimation); - connect(toTopUpAnimation, SIGNAL(finished()), this, SLOT(newViewSize())); - connect(toTopUpAnimation, SIGNAL(finished()), this, SLOT(updateScreenOrientation())); - - stateHash[topDown]->addTransition(this, "rotationSignal()", delegationState); - QSignalTransition *toTopDownTransition = delegationState->addTransition(this, "rotateToTopDown()", stateHash[topDown]); - QPropertyAnimation *toTopDownAnimation = new QPropertyAnimation(this, "rotation", this); - toTopDownAnimation->setDuration(rotationDuration); - toTopDownTransition->addAnimation(toTopDownAnimation); - connect(toTopDownAnimation, SIGNAL(finished()), this, SLOT(newViewSize())); - connect(toTopDownAnimation, SIGNAL(finished()), this, SLOT(updateScreenOrientation())); - - stateHash[leftUp]->addTransition(this, "rotationSignal()", delegationState); - QSignalTransition *toLeftUpTransition = delegationState->addTransition(this, "rotateToLeftUp()", stateHash[leftUp]); - QPropertyAnimation *toLeftUpAnimation = new QPropertyAnimation(this, "rotation", this); - toLeftUpAnimation->setDuration(rotationDuration); - toLeftUpTransition->addAnimation(toLeftUpAnimation); - connect(toLeftUpAnimation, SIGNAL(finished()), this, SLOT(newViewSize())); - connect(toLeftUpAnimation, SIGNAL(finished()), this, SLOT(updateScreenOrientation())); - - stateHash[rightUp]->addTransition(this, "rotationSignal()", delegationState); - QSignalTransition *toRightUpTransition = delegationState->addTransition(this, "rotateToRightUp()", stateHash[rightUp]); - QPropertyAnimation *toRightUpAnimation = new QPropertyAnimation(this, "rotation", this); - toRightUpAnimation->setDuration(rotationDuration); - toRightUpTransition->addAnimation(toRightUpAnimation); - connect(toRightUpAnimation, SIGNAL(finished()), this, SLOT(newViewSize())); - connect(toRightUpAnimation, SIGNAL(finished()), this, SLOT(updateScreenOrientation())); - - mStateMachine.addState(stateHash[topUp]); - mStateMachine.setInitialState(stateHash[topUp]); - mStateMachine.addState(stateHash[topDown]); - mStateMachine.addState(stateHash[leftUp]); - mStateMachine.addState(stateHash[rightUp]); - mStateMachine.addState(delegationState); - mStateMachine.start(); + mDefaultAnimation = new QPropertyAnimation(this, "rotation", this); + mDefaultAnimation->setDuration(rotationDuration); + connect(mDefaultAnimation, SIGNAL(finished()), this, SLOT(newViewSize())); + connect(mDefaultAnimation, SIGNAL(finished()), this, SLOT(updateScreenOrientation())); } DeviceItem::~DeviceItem() @@ -239,7 +194,7 @@ void DeviceItem::changeOrientation(Orientation newOrientation, bool rotateScreen } if (animatedRotate) - emit rotationSignal(); + initiateRotate(); emit orientationChanged(newOrientation); } @@ -253,14 +208,24 @@ bool DeviceItem::needsAnimation(Orientation oldValue, Orientation newValue) void DeviceItem::setInitialRotation(Orientation device, Orientation screen) { - if (mStateMachine.isRunning()) - return; mDeviceOrientation = device; mScreenOrientation = screen; - setRotation(stateHash[device]->property("rotation").toInt()); + switch (device) { + case topUp: + setRotation(0); + break; + case topDown: + setRotation(180); + break; + case leftUp: + setRotation(90); + break; + case rightUp: + setRotation(-90); + break; + } newViewSize(); updateScreenOrientation(); - mStateMachine.setInitialState(stateHash[device]); emit orientationChanged(device); } @@ -310,28 +275,26 @@ void DeviceItem::updateScreenOrientation() void DeviceItem::initiateRotate() { + // set the view to the maximum size + int rotationSide = rotationSideLength() * scale(); + setPos(rotationSide/2, rotationSide/2); + emit viewSizeRequired(QSize(rotationSide, rotationSide)); + switch (mDeviceOrientation) { case topUp: - emit rotateToTopUp(); + mDefaultAnimation->setEndValue(0); break; case topDown: - emit rotateToTopDown(); + mDefaultAnimation->setEndValue(180); break; case leftUp: - emit rotateToLeftUp(); + mDefaultAnimation->setEndValue(90); break; case rightUp: - emit rotateToRightUp(); + mDefaultAnimation->setEndValue(-90); break; } -} - -void DeviceItem::startRotate() -{ - // set the view to the maximum size - int rotationSide = rotationSideLength() * scale(); - setPos(rotationSide/2, rotationSide/2); - emit viewSizeRequired(QSize(rotationSide, rotationSide)); + mDefaultAnimation->start(); } void DeviceItem::changeScaleFactor(qreal newScaleFactor) diff --git a/src/other/deviceitem.h b/src/other/deviceitem.h index 81b3d9e..65788ba 100644 --- a/src/other/deviceitem.h +++ b/src/other/deviceitem.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ @@ -106,6 +110,7 @@ struct DeviceData class DisplayWidget; class QState; +class QPropertyAnimation; class MenuPixmapItem: public QGraphicsPixmapItem { @@ -259,10 +264,7 @@ private: DisplayWidget *mDisplay; QGraphicsPixmapItem *mMockup; - QStateMachine mStateMachine; - QHash<Orientation, QState*> stateHash; - QState *delegationState; - + QPropertyAnimation *mDefaultAnimation; QPoint mDragOffset; QList<KeyButton*> mButtons; @@ -273,19 +275,10 @@ private: private slots: void initiateRotate(); - void startRotate(); void newViewSize(); void updateScreenOrientation(); signals: - void rotationSignal(); - void rotationSignal(Orientation newOrientation); - void rotateToTopUp(); - void rotateToTopDown(); - void rotateToLeftUp(); - void rotateToRightUp(); - void rotateToFaceUp(); - void rotateToFaceDown(); void sizeChanged(const QSize &size); void drag(const QPoint &to); // to is the new top-left point of the view in screen coordinates void viewSizeRequired(const QSize &size); @@ -300,6 +293,8 @@ signals: void symbianSoftKeyClicked(int buttonNr); void orientationChanged(Orientation to); + + friend class InputScriptInterface; }; #endif //DEVICEITEM_H diff --git a/src/other/displaywidget.cpp b/src/other/displaywidget.cpp index 95e43fa..6a97487 100644 --- a/src/other/displaywidget.cpp +++ b/src/other/displaywidget.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/displaywidget.h b/src/other/displaywidget.h index 6064482..4c3d45a 100644 --- a/src/other/displaywidget.h +++ b/src/other/displaywidget.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/phononmanager.cpp b/src/other/phononmanager.cpp index 110b18e..cb2bcb9 100644 --- a/src/other/phononmanager.cpp +++ b/src/other/phononmanager.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/phononmanager.h b/src/other/phononmanager.h index ee5197d..c626815 100644 --- a/src/other/phononmanager.h +++ b/src/other/phononmanager.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/phononsignalbridges.cpp b/src/other/phononsignalbridges.cpp index 10bb731..73892a9 100644 --- a/src/other/phononsignalbridges.cpp +++ b/src/other/phononsignalbridges.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/phononsignalbridges.h b/src/other/phononsignalbridges.h index ab6a166..b5f6d59 100644 --- a/src/other/phononsignalbridges.h +++ b/src/other/phononsignalbridges.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/phononvideowidget.cpp b/src/other/phononvideowidget.cpp index f3367c8..6b607b0 100644 --- a/src/other/phononvideowidget.cpp +++ b/src/other/phononvideowidget.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/phononvideowidget.h b/src/other/phononvideowidget.h index 8e0af97..031758d 100644 --- a/src/other/phononvideowidget.h +++ b/src/other/phononvideowidget.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/widget.cpp b/src/other/widget.cpp index 7e16891..40510f3 100644 --- a/src/other/widget.cpp +++ b/src/other/widget.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/widget.h b/src/other/widget.h index 087a136..e4b727e 100644 --- a/src/other/widget.h +++ b/src/other/widget.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/widgetmanager.cpp b/src/other/widgetmanager.cpp index b9e647f..28c9cb2 100644 --- a/src/other/widgetmanager.cpp +++ b/src/other/widgetmanager.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/other/widgetmanager.h b/src/other/widgetmanager.h index 84131cf..d5c8ac2 100644 --- a/src/other/widgetmanager.h +++ b/src/other/widgetmanager.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/shared/qtlockedfile/qtlockedfile.cpp b/src/shared/qtlockedfile/qtlockedfile.cpp index 9277510..b87eb20 100644 --- a/src/shared/qtlockedfile/qtlockedfile.cpp +++ b/src/shared/qtlockedfile/qtlockedfile.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/shared/qtlockedfile/qtlockedfile.h b/src/shared/qtlockedfile/qtlockedfile.h index 1a438e7..13b2589 100644 --- a/src/shared/qtlockedfile/qtlockedfile.h +++ b/src/shared/qtlockedfile/qtlockedfile.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/shared/qtlockedfile/qtlockedfile_unix.cpp b/src/shared/qtlockedfile/qtlockedfile_unix.cpp index 76eb151..675e3c6 100644 --- a/src/shared/qtlockedfile/qtlockedfile_unix.cpp +++ b/src/shared/qtlockedfile/qtlockedfile_unix.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/shared/qtlockedfile/qtlockedfile_win.cpp b/src/shared/qtlockedfile/qtlockedfile_win.cpp index 758055f..4d73c57 100644 --- a/src/shared/qtlockedfile/qtlockedfile_win.cpp +++ b/src/shared/qtlockedfile/qtlockedfile_win.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/shared/qtsingleapplication/qtlocalpeer.cpp b/src/shared/qtsingleapplication/qtlocalpeer.cpp index 45b130c..9dcc247 100644 --- a/src/shared/qtsingleapplication/qtlocalpeer.cpp +++ b/src/shared/qtsingleapplication/qtlocalpeer.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/shared/qtsingleapplication/qtlocalpeer.h b/src/shared/qtsingleapplication/qtlocalpeer.h index c708b9b..6665c18 100644 --- a/src/shared/qtsingleapplication/qtlocalpeer.h +++ b/src/shared/qtsingleapplication/qtlocalpeer.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/shared/qtsingleapplication/qtsingleapplication.cpp b/src/shared/qtsingleapplication/qtsingleapplication.cpp index 2032471..96272e3 100644 --- a/src/shared/qtsingleapplication/qtsingleapplication.cpp +++ b/src/shared/qtsingleapplication/qtsingleapplication.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/shared/qtsingleapplication/qtsingleapplication.h b/src/shared/qtsingleapplication/qtsingleapplication.h index 0fbd77b..a2a604e 100644 --- a/src/shared/qtsingleapplication/qtsingleapplication.h +++ b/src/shared/qtsingleapplication/qtsingleapplication.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/shared/qtsingleapplication/qtsinglecoreapplication.cpp b/src/shared/qtsingleapplication/qtsinglecoreapplication.cpp index 5cbb606..13ebae5 100644 --- a/src/shared/qtsingleapplication/qtsinglecoreapplication.cpp +++ b/src/shared/qtsingleapplication/qtsinglecoreapplication.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/shared/qtsingleapplication/qtsinglecoreapplication.h b/src/shared/qtsingleapplication/qtsinglecoreapplication.h index 275c520..71005d5 100644 --- a/src/shared/qtsingleapplication/qtsinglecoreapplication.h +++ b/src/shared/qtsingleapplication/qtsinglecoreapplication.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/src.pri b/src/src.pri index b910ff6..3458f7f 100644 --- a/src/src.pri +++ b/src/src.pri @@ -30,6 +30,7 @@ INCLUDEPATH += \ $$QT_MOBILITY_SOURCE_PATH/src/multimedia \ $$QT_MOBILITY_SOURCE_PATH/src/organizer \ $$QT_MOBILITY_SOURCE_PATH/src/feedback \ + $$QT_MOBILITY_SOURCE_PATH/src/connectivity/nfc \ $$QT_MOBILITY_SOURCE_PATH/plugins/sensors/simulator \ $$QT_MOBILITY_SOURCE_PATH/plugins/organizer/simulator \ $$QT_MOBILITY_SOURCE_PATH/plugins/feedback/simulator @@ -41,7 +42,8 @@ SOURCES += $$QT_MOBILITY_SOURCE_PATH/src/systeminfo/qsysteminfodata_simulator.cp $$QT_MOBILITY_SOURCE_PATH/plugins/organizer/simulator/qorganizerdata_simulator.cpp \ $$QT_MOBILITY_SOURCE_PATH/plugins/feedback/simulator/qfeedbackdata_simulator.cpp \ $$QT_MOBILITY_SOURCE_PATH/src/gallery/simulator/docgallerysimulatordata.cpp \ - $$QT_MOBILITY_SOURCE_PATH/plugins/multimedia/simulator/qsimulatormultimediadata.cpp + $$QT_MOBILITY_SOURCE_PATH/plugins/multimedia/simulator/qsimulatormultimediadata.cpp \ + $$QT_MOBILITY_SOURCE_PATH/src/connectivity/nfc/targetemulator.cpp HEADERS += $$QT_MOBILITY_SOURCE_PATH/src/systeminfo/qsysteminfodata_simulator_p.h \ $$QT_MOBILITY_SOURCE_PATH/src/location/qlocationdata_simulator_p.h \ $$QT_MOBILITY_SOURCE_PATH/src/contacts/engines/qcontactmemorybackenddata_simulator_p.h \ @@ -49,7 +51,8 @@ HEADERS += $$QT_MOBILITY_SOURCE_PATH/src/systeminfo/qsysteminfodata_simulator_p. $$QT_MOBILITY_SOURCE_PATH/plugins/organizer/simulator/qorganizerdata_simulator_p.h \ $$QT_MOBILITY_SOURCE_PATH/plugins/feedback/simulator/qfeedbackdata_simulator_p.h \ $$QT_MOBILITY_SOURCE_PATH/src/gallery/simulator/docgallerysimulatordata.h \ - $$QT_MOBILITY_SOURCE_PATH/plugins/multimedia/simulator/qsimulatormultimediadata_p.h + $$QT_MOBILITY_SOURCE_PATH/plugins/multimedia/simulator/qsimulatormultimediadata_p.h \ + $$QT_MOBILITY_SOURCE_PATH/src/connectivity/nfc/targetemulator_p.h OTHER_FILES += \ $$QT_MOBILITY_SOURCE_PATH/src/mobilitysimulator/mobilityconnection.cpp \ diff --git a/src/ui/accelerometercontrol.cpp b/src/ui/accelerometercontrol.cpp index 3f5ea8f..d4656f6 100644 --- a/src/ui/accelerometercontrol.cpp +++ b/src/ui/accelerometercontrol.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ @@ -73,26 +77,22 @@ void AccelerometerControl::initializeGL() glEnable(GL_DEPTH_TEST); glEnable(GL_TEXTURE_2D); - QDir n8ModelDir(QCoreApplication::applicationDirPath()); - n8ModelDir.cd("models/symbian3"); - QImage frontImg(n8ModelDir.absoluteFilePath("N8_3D_front.png")); - QImage backImg(n8ModelDir.absoluteFilePath("N8_3D_back.png")); - QImage rightImg(n8ModelDir.absoluteFilePath("N8_3D_right.png")); - QImage topImg(n8ModelDir.absoluteFilePath("N8_3D_top.png")); - QImage bottomImg(n8ModelDir.absoluteFilePath("N8_3D_bottom.png")); + QImage frontImg(":ui/textures/N8_3D_front.png"); + QImage backImg(":ui/textures/N8_3D_back.png"); + QImage rightImg(":ui/textures/N8_3D_right.png"); + QImage topImg(":ui/textures/N8_3D_top.png"); + QImage bottomImg(":ui/textures/N8_3D_bottom.png"); mFrontPortraitTexture = bindTexture(frontImg); mBackPortraitTexture = bindTexture(backImg); mLeftPortraitTexture = bindTexture(rightImg); mRightPortraitTexture = bindTexture(rightImg); mTopPortraitTexture = bindTexture(topImg); mBottomPortraitTexture = bindTexture(bottomImg); - QDir n900ModelDir(QCoreApplication::applicationDirPath()); - n900ModelDir.cd("models/maemoFremantle"); - frontImg = QImage(n900ModelDir.absoluteFilePath("N900.png")); - backImg = QImage(n900ModelDir.absoluteFilePath("N900_back.png")); - rightImg = QImage(n900ModelDir.absoluteFilePath("N900_left.png")); - topImg = QImage(n900ModelDir.absoluteFilePath("N900_top.png")); - bottomImg = QImage(n900ModelDir.absoluteFilePath("N900_top.png")); + frontImg = QImage(":ui/textures/N900_front.png"); + backImg = QImage(":ui/textures/N900_back.png"); + rightImg = QImage(":ui/textures/N900_left.png"); + topImg = QImage(":ui/textures/N900_top.png"); + bottomImg = QImage(":ui/textures/N900_top.png"); mFrontLandscapeTexture = bindTexture(frontImg); mBackLandscapeTexture = bindTexture(backImg); mLeftLandscapeTexture = bindTexture(rightImg); @@ -207,13 +207,13 @@ void AccelerometerControl::drawMobile() glBindTexture(GL_TEXTURE_2D, mFrontTexture); glBegin(GL_QUADS); glColor3f(1, 1, 1); - glTexCoord2f(1, 0); + glTexCoord2f(0, 0); glVertex3f(-width, -height, -depth); - glTexCoord2f(1, 1); - glVertex3f(-width, height, -depth); glTexCoord2f(0, 1); + glVertex3f(-width, height, -depth); + glTexCoord2f(1, 1); glVertex3f(width, height, -depth); - glTexCoord2f(0, 0); + glTexCoord2f(1, 0); glVertex3f(width, -height, -depth); glEnd(); } diff --git a/src/ui/accelerometercontrol.h b/src/ui/accelerometercontrol.h index ff0631c..81993fb 100644 --- a/src/ui/accelerometercontrol.h +++ b/src/ui/accelerometercontrol.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/applicationtablewidget.cpp b/src/ui/applicationtablewidget.cpp index d607021..898dffc 100644 --- a/src/ui/applicationtablewidget.cpp +++ b/src/ui/applicationtablewidget.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/applicationtablewidget.h b/src/ui/applicationtablewidget.h index 1953b42..935785a 100644 --- a/src/ui/applicationtablewidget.h +++ b/src/ui/applicationtablewidget.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/cameraui.cpp b/src/ui/cameraui.cpp index 13f397d..7943f2d 100644 --- a/src/ui/cameraui.cpp +++ b/src/ui/cameraui.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/cameraui.h b/src/ui/cameraui.h index 385b54e..5f0eaf1 100644 --- a/src/ui/cameraui.h +++ b/src/ui/cameraui.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/configurationwidget.cpp b/src/ui/configurationwidget.cpp index ea16db2..667a79a 100644 --- a/src/ui/configurationwidget.cpp +++ b/src/ui/configurationwidget.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/configurationwidget.h b/src/ui/configurationwidget.h index b528c30..040dcf8 100644 --- a/src/ui/configurationwidget.h +++ b/src/ui/configurationwidget.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/contactsui.cpp b/src/ui/contactsui.cpp index 1354a85..c0da7c0 100644 --- a/src/ui/contactsui.cpp +++ b/src/ui/contactsui.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/contactsui.h b/src/ui/contactsui.h index 1576037..e9f41e9 100644 --- a/src/ui/contactsui.h +++ b/src/ui/contactsui.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/docgalleryui.cpp b/src/ui/docgalleryui.cpp index 1ef59cd..f47311b 100644 --- a/src/ui/docgalleryui.cpp +++ b/src/ui/docgalleryui.cpp @@ -1,3 +1,36 @@ +/************************************************************************** +** +** This file is part of Qt Simulator +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** No Commercial Usage +** +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + #include "docgalleryui.h" #include <QtGui/QTreeWidget> @@ -7,6 +40,7 @@ #include <QtGui/QApplication> #include <QtGui/QDesktopServices> #include <QtCore/QUrl> +#include <QtCore/QtConcurrentRun> DocGalleryUi::DocGalleryUi(QWidget *parent) : ToolBoxPage(parent) @@ -14,23 +48,23 @@ DocGalleryUi::DocGalleryUi(QWidget *parent) : QStringList tags; QList<OptionsItem *> optionsList; - docGalleryTreeWidget = new QTreeWidget(); + mDocGalleryTreeWidget = new QTreeWidget(); QStringList items; items << "FileName" << "" << "" << "" << ""; - docGalleryTreeWidget->setHeaderLabels(items); - docGalleryTreeWidget->setColumnCount(5); - docGalleryTreeWidget->setColumnWidth(1, 50); - docGalleryTreeWidget->setColumnWidth(2, 50); - connect(docGalleryTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(openItem(QTreeWidgetItem*, int))); + mDocGalleryTreeWidget->setHeaderLabels(items); + mDocGalleryTreeWidget->setColumnCount(5); + mDocGalleryTreeWidget->setColumnWidth(1, 50); + mDocGalleryTreeWidget->setColumnWidth(2, 50); + connect(mDocGalleryTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(openItem(QTreeWidgetItem*, int))); - artistHead = new QTreeWidgetItem(docGalleryTreeWidget); - artistHead->setText(0, QLatin1String("Artists")); - imageHead = new QTreeWidgetItem(docGalleryTreeWidget); - imageHead->setText(0, QLatin1String("Images")); + mArtistHead = new QTreeWidgetItem(mDocGalleryTreeWidget); + mArtistHead->setText(0, QLatin1String("Artists")); + mImageHead = new QTreeWidgetItem(mDocGalleryTreeWidget); + mImageHead->setText(0, QLatin1String("Images")); addStandardItems(); - OptionsItem *item = new OptionsItem("", docGalleryTreeWidget, true); + OptionsItem *item = new OptionsItem("", mDocGalleryTreeWidget, true); tags << QLatin1String("Artist") << QLatin1String("Document") << QLatin1String("Video") << QLatin1String("Images"); item->setTags(tags); optionsList << item; @@ -41,37 +75,60 @@ DocGalleryUi::DocGalleryUi(QWidget *parent) : void DocGalleryUi::addStandardItems() { - data.images.clear(); - data.artists.clear(); + mData.images.clear(); + mData.artists.clear(); // Add some images QString modelPath = qApp->applicationDirPath() + "/models"; - QDirIterator it(modelPath, QDirIterator::Subdirectories); - QLocale locale; + + mImageReaderWatcher.setFuture(QtConcurrent::run(this, &DocGalleryUi::readImages, modelPath)); + connect(&mImageReaderWatcher, SIGNAL(finished()), this, SLOT(finishReadingImages())); +} + +void DocGalleryUi::openItem(QTreeWidgetItem *widgetItem, int) +{ + QDesktopServices::openUrl(QUrl::fromLocalFile(widgetItem->text(0))); +} + +QtMobility::DocGallerySimulatorData DocGalleryUi::data() const +{ + return mData; +} + +QList<QtMobility::DocGalleryImageItem> DocGalleryUi::readImages(const QString &directory) +{ + QList<QtMobility::DocGalleryImageItem> results; + QDirIterator it(directory, QDirIterator::Subdirectories); while (it.hasNext()) { QString item = it.next(); QImage image(item); if (image.isNull()) continue; - QTreeWidgetItem* treeItem = new QTreeWidgetItem(imageHead); - treeItem->setText(0, item); - treeItem->setText(1, locale.toString(image.width())); - treeItem->setText(2, locale.toString(image.height())); - treeItem->setText(3, QLatin1String("Some model image")); - treeItem->setText(4, QLatin1String("Simulator Model")); QtMobility::DocGalleryImageItem imageItem; imageItem.fileName = item; imageItem.width = image.width(); imageItem.height = image.height(); - imageItem.title = treeItem->text(3); - imageItem.tags = treeItem->text(4); - data.images.append(imageItem); + imageItem.title = QLatin1String("Some model image"); + imageItem.tags = QLatin1String("Simulator Model"); + results.append(imageItem); } + return results; } -void DocGalleryUi::openItem(QTreeWidgetItem *widgetItem, int) +void DocGalleryUi::finishReadingImages() { - QDesktopServices::openUrl(QUrl::fromLocalFile(widgetItem->text(0))); + QList<QtMobility::DocGalleryImageItem> imageList = mImageReaderWatcher.future().result(); + foreach (const QtMobility::DocGalleryImageItem &item, imageList) { + QLocale locale; + QTreeWidgetItem* treeItem = new QTreeWidgetItem(mImageHead); + treeItem->setText(0, item.fileName); + treeItem->setText(1, locale.toString(item.width)); + treeItem->setText(2, locale.toString(item.height)); + treeItem->setText(3, item.title); + treeItem->setText(4, item.tags); + mData.images.append(item); + } + emit docGalleryDataChanged(mData); } #include "moc_docgalleryui.cpp" diff --git a/src/ui/docgalleryui.h b/src/ui/docgalleryui.h index 7ae56bb..901a108 100644 --- a/src/ui/docgalleryui.h +++ b/src/ui/docgalleryui.h @@ -1,9 +1,43 @@ +/************************************************************************** +** +** This file is part of Qt Simulator +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** No Commercial Usage +** +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + #ifndef DOCGALLERYUI_H #define DOCGALLERYUI_H #include <QObject> #include <remotecontrolwidget/toolbox.h> #include <gallery/simulator/docgallerysimulatordata.h> +#include <QtCore/QFutureWatcher> #include <QtGui/QTreeWidget> @@ -12,20 +46,26 @@ class DocGalleryUi : public ToolBoxPage Q_OBJECT public: explicit DocGalleryUi(QWidget *parent = 0); + QtMobility::DocGallerySimulatorData data() const; signals: - void docGalleryDataChanged(const QtMobility::DocGallerySimulatorData &data); + void docGalleryDataChanged(const QtMobility::DocGallerySimulatorData &mData); public slots: void openItem(QTreeWidgetItem*, int); +private slots: + void finishReadingImages(); + private: - friend class MobilityClient; - QtMobility::DocGallerySimulatorData data; void addStandardItems(); - QTreeWidget* docGalleryTreeWidget; - QTreeWidgetItem* artistHead; - QTreeWidgetItem* imageHead; + QList<QtMobility::DocGalleryImageItem> readImages(const QString &directory); + + QtMobility::DocGallerySimulatorData mData; + QTreeWidget* mDocGalleryTreeWidget; + QTreeWidgetItem* mArtistHead; + QTreeWidgetItem* mImageHead; + QFutureWatcher< QList<QtMobility::DocGalleryImageItem> > mImageReaderWatcher; }; #endif // DOCGALLERYUI_H diff --git a/src/ui/feedbackui.cpp b/src/ui/feedbackui.cpp index 15f07c4..e2b38e6 100644 --- a/src/ui/feedbackui.cpp +++ b/src/ui/feedbackui.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/feedbackui.h b/src/ui/feedbackui.h index 0bb58b4..c923156 100644 --- a/src/ui/feedbackui.h +++ b/src/ui/feedbackui.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/inputscriptinterface.cpp b/src/ui/inputscriptinterface.cpp new file mode 100644 index 0000000..df57c6c --- /dev/null +++ b/src/ui/inputscriptinterface.cpp @@ -0,0 +1,198 @@ +#include "inputscriptinterface.h" +#include "mainwindow.h" + +#include <QtCore/QMetaEnum> +#include <QtGui/QApplication> +#include <QtGui/QGraphicsView> + +InputScriptInterface::InputScriptInterface(MainWindow *ui, QWidget *viewport) + : QObject(ui) + , mUi(ui) + , mViewport(viewport) + , mPressedButtons(NoButton) +{ + int enumIndex = metaObject()->indexOfEnumerator("MouseButton"); + QMetaEnum metaEnum = metaObject()->enumerator(enumIndex); + for (int i = 0; i < metaEnum.keyCount(); ++i) + setProperty(metaEnum.key(i), metaEnum.value(i)); +} + +InputScriptInterface::~InputScriptInterface() +{ +} + +void InputScriptInterface::mousePress(MouseButton button, qint32 x, qint32 y) +{ + mousePress(button, x, y, false); +} + +void InputScriptInterface::mousePress(MouseButton button, qint32 x, qint32 y, bool doubleClick) +{ + mPressedButtons |= static_cast<Qt::MouseButton>(button); + QPoint pos = mapPositionToDevice(QPoint(x, y)); + QEvent::Type type; + if (doubleClick) + type = QEvent::MouseButtonDblClick; + else + type = QEvent::MouseButtonPress; + QMouseEvent *event = new QMouseEvent(type, pos, + static_cast<Qt::MouseButton>(button), + static_cast<Qt::MouseButtons>(mPressedButtons), + Qt::NoModifier); + qApp->postEvent(mViewport, event); +} + +void InputScriptInterface::mouseMove(qint32 x, qint32 y) +{ + QPoint pos = mapPositionToDevice(QPoint(x, y)); + QMouseEvent *event = new QMouseEvent(QEvent::MouseMove, pos, + Qt::NoButton, + static_cast<Qt::MouseButtons>(mPressedButtons), + Qt::NoModifier); + qApp->postEvent(mViewport, event); +} + +void InputScriptInterface::mouseRelease(MouseButton button, qint32 x, qint32 y) +{ + mPressedButtons &= ~static_cast<Qt::MouseButton>(button); + QPoint pos = mapPositionToDevice(QPoint(x, y)); + QMouseEvent *event = new QMouseEvent(QEvent::MouseButtonRelease, pos, + static_cast<Qt::MouseButton>(button), + static_cast<Qt::MouseButtons>(mPressedButtons), + Qt::NoModifier); + qApp->postEvent(mViewport, event); +} + +void InputScriptInterface::click(qint32 x, qint32 y) +{ + mousePress(LeftButton, x, y); + mouseRelease(LeftButton, x, y); +} + +void InputScriptInterface::doubleClick(qint32 x, qint32 y) +{ + click(x, y); + mousePress(LeftButton, x, y, true); + mouseRelease(LeftButton, x, y); +} + +void InputScriptInterface::rightClick(qint32 x, qint32 y) +{ + mousePress(RightButton, x, y); + mouseRelease(RightButton, x, y); +} + + +QPoint InputScriptInterface::mapPositionToDevice(QPoint position) +{ + DeviceData d = mUi->deviceItem()->mDeviceData; + QPoint returnedPosition; + + switch (mUi->deviceItem()->screenOrientation()) { + case topUp: + switch (mUi->deviceItem()->deviceOrientation()) { + case topUp: + returnedPosition = position + d.offset + d.availableGeometry.topLeft(); + break; + case topDown: + returnedPosition.setX(d.mockup->width() - d.offset.x() - d.availableGeometry.x() - position.x()); + returnedPosition.setY(d.mockup->height() - d.offset.y() - d.availableGeometry.y() - position.y()); + break; + case leftUp: + returnedPosition.setX(d.mockup->height() - d.offset.y() - d.availableGeometry.y() - position.y()); + returnedPosition.setY(d.offset.x() + d.availableGeometry.x() + position.x()); + break; + case rightUp: + returnedPosition.setX(d.offset.y() + d.availableGeometry.y() + position.y()); + returnedPosition.setY(d.mockup->width() - d.offset.x() - d.availableGeometry.x() - position.x()); + break; + } + break; + case topDown: + switch (mUi->deviceItem()->deviceOrientation()) { + case topUp: + returnedPosition.setX(d.offset.x() + d.resolution.width() - d.availableGeometry.x() - position.x()); + returnedPosition.setY(d.mockup->height() - d.offset.y() - d.availableGeometry.y() - position.y()); + break; + case topDown: + returnedPosition.setX(d.mockup->width() - d.offset.x() - d.resolution.width() + d.availableGeometry.x() + position.x()); + returnedPosition.setY(d.mockup->height() - d.offset.y() - d.resolution.height() + d.availableGeometry.y() + position.y()); + break; + case leftUp: + returnedPosition.setX(d.mockup->height() - d.offset.y() - d.resolution.height() + d.availableGeometry.y() + position.y()); + returnedPosition.setY(d.offset.x() +d.resolution.width() - d.availableGeometry.x() - position.x()); + break; + case rightUp: + returnedPosition.setX(d.offset.y() + d.resolution.height() - d.availableGeometry.y() - position.y()); + returnedPosition.setY(d.mockup->width() - d.offset.x() - d.resolution.width() + d.availableGeometry.x() + position.x()); + break; + } + break; + case leftUp: + switch (mUi->deviceItem()->deviceOrientation()) { + case topUp: + returnedPosition.setX(d.offset.x() + d.availableGeometry.y() + position.y()); + returnedPosition.setY(d.offset.y() + d.resolution.height() - d.availableGeometry.x() - position.x()); + break; + case topDown: + returnedPosition.setX(d.mockup->width() - d.offset.x() - d.availableGeometry.y() - position.y()); + returnedPosition.setY(d.mockup->height() - d.offset.y() - d.resolution.height() + d.availableGeometry.x() + position.x()); + break; + case leftUp: + returnedPosition.setX(d.mockup->height() - d.offset.y() - d.resolution.height() + d.availableGeometry.x() + position.x()); + returnedPosition.setY(d.offset.x() + d.availableGeometry.y() + position.y()); + break; + case rightUp: + returnedPosition.setX(d.offset.y() + d.resolution.height() - d.availableGeometry.x() - position.x()); + returnedPosition.setY(d.mockup->width() - d.offset.x() - d.availableGeometry.y() - position.y()); + break; + } + break; + case rightUp: + switch (mUi->deviceItem()->deviceOrientation()) { + case topUp: + returnedPosition.setX(d.offset.x() + d.resolution.width() - d.availableGeometry.y() - position.y()); + returnedPosition.setY(d.offset.y() + d.availableGeometry.x() + position.x()); + break; + case topDown: + returnedPosition.setX(d.mockup->width() - d.offset.x() - d.resolution.width() + d.availableGeometry.y() + position.y()); + returnedPosition.setY(d.mockup->height() - d.offset.y() - d.availableGeometry.x() - position.x()); + break; + case leftUp: + returnedPosition.setX(d.mockup->height() - d.offset.y() - d.availableGeometry.x() - position.x()); + returnedPosition.setY(d.offset.x() +d.resolution.width() - d.availableGeometry.y() - position.y()); + break; + case rightUp: + returnedPosition.setX(d.offset.y() + d.availableGeometry.left() + position.x()); + returnedPosition.setY(d.mockup->width() - d.offset.x() - d.resolution.width() + d.availableGeometry.y() + position.y()); + break; + } + break; + } + return returnedPosition; +} + +void InputScriptInterface::keyPress(QChar c) +{ + QKeyEvent *event = new QKeyEvent(QEvent::KeyPress, c.unicode(), Qt::NoModifier, QString(c)); + qApp->postEvent(mViewport, event); +} + +void InputScriptInterface::keyRelease(QChar c) +{ + QKeyEvent *event = new QKeyEvent(QEvent::KeyRelease, c.unicode(), Qt::NoModifier, QString(c)); + qApp->postEvent(mViewport, event); +} + +void InputScriptInterface::type(QChar c) +{ + keyPress(c); + keyRelease(c); +} + +void InputScriptInterface::type(const QString &string) +{ + foreach (const QChar &c, string) { + type(c); + } +} diff --git a/src/ui/inputscriptinterface.h b/src/ui/inputscriptinterface.h new file mode 100644 index 0000000..853e4ea --- /dev/null +++ b/src/ui/inputscriptinterface.h @@ -0,0 +1,53 @@ +#ifndef INPUTSCRIPTINTERFACE_H +#define INPUTSCRIPTINTERFACE_H + +#include <QtCore/QObject> +#include <QtCore/QPoint> + +class MainWindow; + +class InputScriptInterface : public QObject +{ + Q_OBJECT +public: + // depends on order of items + // has to match Qt::MouseButton + enum MouseButton { + NoButton = 0x00000000, + LeftButton = 0x00000001, + RightButton = 0x00000002, + MidButton = 0x00000004, // ### Qt 5: remove me + MiddleButton = MidButton, + XButton1 = 0x00000008, + XButton2 = 0x00000010, + MouseButtonMask = 0x000000ff + }; + Q_ENUMS(MouseButton); + Q_DECLARE_FLAGS(MouseButtons, MouseButton) + + InputScriptInterface(MainWindow *mUi, QWidget *viewport); + virtual ~InputScriptInterface(); + + Q_INVOKABLE void mousePress(MouseButton button, qint32 x, qint32 y); + Q_INVOKABLE void mouseMove(qint32 x, qint32 y); + Q_INVOKABLE void mouseRelease(MouseButton button, qint32 x, qint32 y); + + Q_INVOKABLE void click(qint32 x, qint32 y); + Q_INVOKABLE void doubleClick(qint32 x, qint32 y); + Q_INVOKABLE void rightClick(qint32 x, qint32 y); + + Q_INVOKABLE void keyPress(QChar c); + Q_INVOKABLE void keyRelease(QChar c); + Q_INVOKABLE void type(const QString &string); + +private: + void type(QChar c); + void mousePress(MouseButton button, qint32 x, qint32 y, bool doubleClick); + QPoint mapPositionToDevice(QPoint position); + + MainWindow *mUi; + QWidget *mViewport; + Qt::MouseButtons mPressedButtons; +}; + +#endif // INPUTSCRIPTINTERFACE_H diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index e61adb0..6564e1b 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ @@ -46,6 +50,8 @@ #include "feedbackui.h" #include "docgalleryui.h" #include "cameraui.h" +#include "nfcui.h" +#include "inputscriptinterface.h" #include <remotecontrolwidget/locationui.h> #include <remotecontrolwidget/scriptui.h> @@ -89,7 +95,7 @@ MainWindow::MainWindow(QWidget *parent) , view(0) , config(0) , applicationManager(0) - , deviceItem(0) + , mDeviceItem(0) , debugWindow(0) , startupError(false) { @@ -125,9 +131,9 @@ MainWindow::MainWindow(QWidget *parent) scene = new QGraphicsScene(this); - deviceItem = new DeviceItem; + mDeviceItem = new DeviceItem; - scene->addItem(deviceItem); + scene->addItem(mDeviceItem); view = new QGraphicsView(scene); view->setOptimizationFlag(QGraphicsView::DontSavePainterState); @@ -141,23 +147,23 @@ MainWindow::MainWindow(QWidget *parent) phononManager->setObjectName("PhononManager"); applicationManager->setPhononManager(phononManager); - WidgetManager *widgetManager = new WidgetManager(deviceItem->display(), this); + WidgetManager *widgetManager = new WidgetManager(mDeviceItem->display(), this); applicationManager->setWidgetManager(widgetManager); connect(applicationManager, SIGNAL(applicationRegistered(Application*)), this, SLOT(activateWindow())); connect(applicationManager, SIGNAL(applicationUnRegistered(int)), widgetManager, SLOT(onApplicationUnregistered(int))); - connect(widgetManager, SIGNAL(symbianSoftKeyTextChanged(int,QString)), deviceItem, SLOT(setSymbianSoftKeyText(int,QString))); - connect(widgetManager, SIGNAL(maemoNavigationChanged(MaemoNavigationMode)), deviceItem, SLOT(setMaemoNavigationMode(MaemoNavigationMode))); - connect(deviceItem, SIGNAL(deviceChanged(QSize,DeviceData)), applicationManager, SLOT(updateDisplayInformation(QSize,DeviceData))); - connect(deviceItem, SIGNAL(drag(QPoint)), this, SLOT(dragFromView(QPoint))); - connect(deviceItem, SIGNAL(viewSizeRequired(QSize)), this, SLOT(setViewSize(QSize))); - connect(deviceItem, SIGNAL(buttonPressed(Qt::Key, QString)), widgetManager, SLOT(sendKeyPress(Qt::Key, QString))); - connect(deviceItem, SIGNAL(buttonReleased(Qt::Key)), widgetManager, SLOT(sendKeyRelease(Qt::Key))); - connect(deviceItem, SIGNAL(closeWindowPressed()), widgetManager, SLOT(closeCurrentWindow())); - connect(deviceItem, SIGNAL(symbianSoftKeyClicked(int)), widgetManager, SLOT(triggerSymbianSoftKeyAction(int))); - connect(deviceItem, SIGNAL(offsetChanged(const QPoint &)), widgetManager, SLOT(changeOffset(const QPoint &))); - connect(deviceItem, SIGNAL(deviceChanged(QSize,DeviceData)), widgetManager, SLOT(updateSymbianSoftKeys())); - connect(deviceItem, SIGNAL(orientationChanged(Orientation)), mobility, SLOT(rotateDevice(Orientation))); + connect(widgetManager, SIGNAL(symbianSoftKeyTextChanged(int,QString)), mDeviceItem, SLOT(setSymbianSoftKeyText(int,QString))); + connect(widgetManager, SIGNAL(maemoNavigationChanged(MaemoNavigationMode)), mDeviceItem, SLOT(setMaemoNavigationMode(MaemoNavigationMode))); + connect(mDeviceItem, SIGNAL(deviceChanged(QSize,DeviceData)), applicationManager, SLOT(updateDisplayInformation(QSize,DeviceData))); + connect(mDeviceItem, SIGNAL(drag(QPoint)), this, SLOT(dragFromView(QPoint))); + connect(mDeviceItem, SIGNAL(viewSizeRequired(QSize)), this, SLOT(setViewSize(QSize))); + connect(mDeviceItem, SIGNAL(buttonPressed(Qt::Key, QString)), widgetManager, SLOT(sendKeyPress(Qt::Key, QString))); + connect(mDeviceItem, SIGNAL(buttonReleased(Qt::Key)), widgetManager, SLOT(sendKeyRelease(Qt::Key))); + connect(mDeviceItem, SIGNAL(closeWindowPressed()), widgetManager, SLOT(closeCurrentWindow())); + connect(mDeviceItem, SIGNAL(symbianSoftKeyClicked(int)), widgetManager, SLOT(triggerSymbianSoftKeyAction(int))); + connect(mDeviceItem, SIGNAL(offsetChanged(const QPoint &)), widgetManager, SLOT(changeOffset(const QPoint &))); + connect(mDeviceItem, SIGNAL(deviceChanged(QSize,DeviceData)), widgetManager, SLOT(updateSymbianSoftKeys())); + connect(mDeviceItem, SIGNAL(orientationChanged(Orientation)), mobility, SLOT(rotateDevice(Orientation))); connect(mobilityServer, SIGNAL(applicationConnected(int, VersionStruct)), applicationManager, SLOT(updateMobilityVersion(int, VersionStruct))); @@ -174,7 +180,7 @@ MainWindow::MainWindow(QWidget *parent) debugWindow->setLayout(layout); // Setup configuration window. - config = new ConfigurationWidget(deviceItem, this); + config = new ConfigurationWidget(mDeviceItem, this); config->setWindowFlags(Qt::Window); if (!config->initializeDeviceList()) { QTimer::singleShot(0, this, SLOT(close())); @@ -182,14 +188,14 @@ MainWindow::MainWindow(QWidget *parent) return; } connect(widgetManager, SIGNAL(topWidgetChanged(Widget *)), config, SLOT(updateMenuBarWidget(Widget *))); - connect(config, SIGNAL(deviceSelectionChanged(const DeviceData &)), deviceItem, SLOT(changeDevice(const DeviceData &))); - connect(deviceItem, SIGNAL(sizeChanged(const QSize &)), this, SLOT(setSizeToDevice(const QSize &))); - connect(deviceItem, SIGNAL(orientationChanged(Orientation)), config, SLOT(updateOrientationButtonsState(Orientation))); - connect(deviceItem, SIGNAL(deviceChanged(bool)), config, SLOT(updateOrientationsButtonsIcons(bool))); + connect(config, SIGNAL(deviceSelectionChanged(const DeviceData &)), mDeviceItem, SLOT(changeDevice(const DeviceData &))); + connect(mDeviceItem, SIGNAL(sizeChanged(const QSize &)), this, SLOT(setSizeToDevice(const QSize &))); + connect(mDeviceItem, SIGNAL(orientationChanged(Orientation)), config, SLOT(updateOrientationButtonsState(Orientation))); + connect(mDeviceItem, SIGNAL(deviceChanged(bool)), config, SLOT(updateOrientationsButtonsIcons(bool))); connect(config, SIGNAL(closeMainWindow()), this, SLOT(close())); connect(config, SIGNAL(orientationChangeRequested(Orientation, bool)), - deviceItem, SLOT(changeOrientation(Orientation, bool))); - connect(config, SIGNAL(scaleFactorChanged(qreal)), deviceItem, SLOT(changeScaleFactor(qreal))); + mDeviceItem, SLOT(changeOrientation(Orientation, bool))); + connect(config, SIGNAL(scaleFactorChanged(qreal)), mDeviceItem, SLOT(changeScaleFactor(qreal))); connect(config, SIGNAL(exitButtonClicked()), applicationManager, SLOT(killCurrentApplication())); scriptAdapter = new ScriptAdapter(this); @@ -217,7 +223,7 @@ MainWindow::MainWindow(QWidget *parent) SensorsUi *sensorsUi = new SensorsUi(this); mobility->mSensorsUi = sensorsUi; config->addSimulateSubPage(sensorsUi); - connect(deviceItem, SIGNAL(deviceChanged(bool)), sensorsUi, SLOT(updateDeviceDefaultOrientation(bool))); + connect(mDeviceItem, SIGNAL(deviceChanged(bool)), sensorsUi, SLOT(updateDeviceDefaultOrientation(bool))); OrganizerUi *organizerUi = new OrganizerUi(mobility->mOrganizer, this); config->addSimulateSubPage(organizerUi); @@ -233,6 +239,10 @@ MainWindow::MainWindow(QWidget *parent) mobility->mCameraUi = cameraUi; config->addSimulateSubPage(cameraUi); + NfcUi *nfcUi = new NfcUi(this); + mobility->mNfcUi = nfcUi; + config->addSimulateSubPage(nfcUi); + ScriptUi *scriptUi = new ScriptUi(scriptAdapter, this); FavoriteScriptButton *scriptButton = new FavoriteScriptButton(this); setupScriptDirectories(scriptUi, scriptButton); @@ -271,6 +281,8 @@ MainWindow::MainWindow(QWidget *parent) scriptAdapter, SLOT(run(QString))); config->addMenuButton(scriptButton); + InputScriptInterface *inputScriptInterface = new InputScriptInterface(this, view->viewport()); + // register script interfaces scriptAdapter->addScriptInterface("simulator", config->scriptInterface()); scriptAdapter->addScriptInterface("sensors", sensorsUi->scriptInterface()); @@ -279,6 +291,7 @@ MainWindow::MainWindow(QWidget *parent) scriptAdapter->addScriptInterface("sysinfo.network", networkSystemInfoUi->scriptInterface()); scriptAdapter->addScriptInterface("sysinfo.storage", storageSystemInfoUi->scriptInterface()); scriptAdapter->addScriptInterface("camera", cameraUi->scriptInterface()); + scriptAdapter->addScriptInterface("input", inputScriptInterface); connect(config, SIGNAL(deviceSelectionChanged(const DeviceData &)), SLOT(callDeviceScript(const DeviceData &))); @@ -405,9 +418,9 @@ void MainWindow::writeSettings() const settings.beginGroup("MainWindow"); settings.setValue("pos", pos()); - int deviceOrientation = static_cast<int>(deviceItem->deviceOrientation()); + int deviceOrientation = static_cast<int>(mDeviceItem->deviceOrientation()); settings.setValue("deviceOrientation", deviceOrientation); - int screenOrientation = static_cast<int>(deviceItem->screenOrientation()); + int screenOrientation = static_cast<int>(mDeviceItem->screenOrientation()); settings.setValue("screenOrientation", screenOrientation); settings.endGroup(); } @@ -437,8 +450,8 @@ void MainWindow::readSettings() if (orientationInt != 0) screenOrientation = static_cast<Orientation>(orientationInt); } - deviceItem->setInitialRotation(deviceOrientation, screenOrientation); - deviceItem->setMaemoNavigationMode(maemoClose); + mDeviceItem->setInitialRotation(deviceOrientation, screenOrientation); + mDeviceItem->setMaemoNavigationMode(maemoClose); settings.endGroup(); } diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h index 41bf185..03597d9 100644 --- a/src/ui/mainwindow.h +++ b/src/ui/mainwindow.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ @@ -42,6 +46,7 @@ class QGraphicsView; class QGraphicsScene; class ScriptUi; class FavoriteScriptButton; +class InputScriptInterface; extern const VersionStruct simulatorVersion; @@ -56,6 +61,7 @@ public: virtual bool eventFilter(QObject *watched, QEvent *event); virtual void closeEvent(QCloseEvent *event); + DeviceItem *deviceItem() const { return mDeviceItem; } QString userResourcePath() const; public slots: @@ -81,7 +87,7 @@ private: ConfigurationWidget *config; ApplicationManager *applicationManager; - DeviceItem *deviceItem; + DeviceItem *mDeviceItem; MobilityServer *mobilityServer; diff --git a/src/ui/messagingui.cpp b/src/ui/messagingui.cpp index 6ebc22e..c5c993d 100644 --- a/src/ui/messagingui.cpp +++ b/src/ui/messagingui.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/messagingui.h b/src/ui/messagingui.h index 372f7bf..6cd607f 100644 --- a/src/ui/messagingui.h +++ b/src/ui/messagingui.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/nfcui.cpp b/src/ui/nfcui.cpp new file mode 100644 index 0000000..36733c0 --- /dev/null +++ b/src/ui/nfcui.cpp @@ -0,0 +1,210 @@ +/************************************************************************** +** +** This file is part of Qt Simulator +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** No Commercial Usage +** +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + + +#include "nfcui.h" +#include "targetemulator_p.h" + +#include <QtCore/QModelIndex> +#include <QtCore/QDirIterator> +#include <QtCore/QSettings> + +#include <QtGui/QListWidget> +#include <QtGui/QPushButton> + +#include <QtCore/QDebug> + +class NfcTargetItem : public QListWidgetItem +{ +public: + NfcTargetItem(); + virtual ~NfcTargetItem(); + + enum Roles { + NameRole = Qt::DisplayRole, + InProximity = Qt::UserRole + }; + + QVariant data(int role) const; + void setData(int role, const QVariant &value); + + TagBase *tag() const; + void setTag(TagBase *tag); + +private: + TagBase *m_tag; +}; + +NfcTargetItem::NfcTargetItem() +: m_tag(0) +{ + setData(InProximity, false); +} + +NfcTargetItem::~NfcTargetItem() +{ +} + +QVariant NfcTargetItem::data(int role) const +{ + if (role == NameRole && QListWidgetItem::data(InProximity).toBool()) { + return NfcUi::tr("%1 (in proximity)").arg(QListWidgetItem::data(NameRole).toString()); + } + + return QListWidgetItem::data(role); +} + +void NfcTargetItem::setData(int role, const QVariant &value) +{ + QListWidgetItem::setData(role, value); +} + +TagBase *NfcTargetItem::tag() const +{ + return m_tag; +} + +void NfcTargetItem::setTag(TagBase *tag) +{ + m_tag = tag; +} + +NfcUi::NfcUi(QWidget *parent) +: ToolBoxPage(parent) +{ + QList<OptionsItem *> optionsList; + + mTargets = new QListWidget(); + connect(mTargets, SIGNAL(activated(QModelIndex)), SLOT(targetActivated(QModelIndex))); + + QDirIterator nfcTargets("stubdata/nfctargets", QStringList(QLatin1String("*.nfc")), + QDir::Files); + while (nfcTargets.hasNext()) { + const QString targetFilename = nfcTargets.next(); + + QSettings target(targetFilename, QSettings::IniFormat); + + NfcTargetItem *targetItem = new NfcTargetItem; + + target.beginGroup(QLatin1String("Target")); + targetItem->setData(NfcTargetItem::NameRole, + target.value(QLatin1String("Name")).toString()); + + + const QString tagType = target.value(QLatin1String("Type")).toString(); + + target.endGroup(); + + if (tagType == QLatin1String("TagType1")) { + NfcTagType1 *tag = new NfcTagType1; + tag->load(&target); + targetItem->setTag(tag); + } else { + qWarning("Unknown tag type %s\n", qPrintable(tagType)); + } + + mTargets->addItem(targetItem); + } + + optionsList << new OptionsItem(tr("Targets"), mTargets); + + mReset = new QPushButton(tr("Reset Target")); + mReset->setToolTip(tr("Resets the selected target factory defaults.")); + connect(mReset, SIGNAL(clicked()), this, SLOT(resetTarget())); + + optionsList <<new OptionsItem(QString(), mReset, true); + + setTitle(tr("Near Field Communication")); + setOptions(optionsList); +} + +NfcUi::~NfcUi() +{ +} + +QByteArray NfcUi::processCommand(const QByteArray &command) +{ + QByteArray response; + bool collision = false; + + for (int i = 0; i < mTargets->count(); ++i) { + NfcTargetItem *targetItem = static_cast<NfcTargetItem *>(mTargets->item(i)); + // check if target is in proximity + if (!targetItem->data(NfcTargetItem::InProximity).toBool()) + continue; + + QByteArray targetResponse = targetItem->tag()->processCommand(command); + + // skip if target didn't respond (e.g. UID mismatch) + if (targetResponse.isEmpty()) + continue; + + if (response.isEmpty()) { + response = targetResponse; + } else { + collision = true; + qWarning("Collision detected, multiple NFC targets responded."); + } + } + + if (collision) + return QByteArray(); + + return response; +} + +void NfcUi::targetActivated(const QModelIndex &index) +{ + // toggle in proximity + NfcTargetItem *targetItem = static_cast<NfcTargetItem *>(mTargets->item(index.row())); + if (targetItem) { + if (targetItem->data(NfcTargetItem::InProximity).toBool()) { + targetItem->setData(NfcTargetItem::InProximity, false); + } else { + targetItem->setData(NfcTargetItem::InProximity, true); + emit targetInRange(targetItem->tag()->uid()); + } + } +} + +void NfcUi::resetTarget() +{ + NfcTargetItem *targetItem = static_cast<NfcTargetItem *>(mTargets->currentItem()); + if (targetItem) { + if (targetItem->data(NfcTargetItem::InProximity).toBool()) + targetItem->setData(NfcTargetItem::InProximity, false); + + qDebug() << "Need to reset" << targetItem->data(NfcTargetItem::NameRole).toString(); + } +} + diff --git a/src/ui/nfcui.h b/src/ui/nfcui.h new file mode 100644 index 0000000..d9efed7 --- /dev/null +++ b/src/ui/nfcui.h @@ -0,0 +1,67 @@ +/************************************************************************** +** +** This file is part of Qt Simulator +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** No Commercial Usage +** +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + +#ifndef NFCUI_H +#define NFCUI_H + +#include <remotecontrolwidget/toolbox.h> + +class QListWidget; +class QModelIndex; +class QPushButton; + +class NfcUi : public ToolBoxPage +{ + Q_OBJECT + +public: + explicit NfcUi(QWidget *parent = 0); + virtual ~NfcUi(); + + QByteArray processCommand(const QByteArray &command); + +public slots: + +signals: + void targetInRange(const QByteArray &uid); + +private slots: + void targetActivated(const QModelIndex &index); + void resetTarget(); + +private: + QListWidget *mTargets; + QPushButton *mReset; +}; + +#endif // NFCUI_H diff --git a/src/ui/organizerui.cpp b/src/ui/organizerui.cpp index 497a2ba..e169119 100644 --- a/src/ui/organizerui.cpp +++ b/src/ui/organizerui.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/organizerui.h b/src/ui/organizerui.h index 0ba1604..c3e3456 100644 --- a/src/ui/organizerui.h +++ b/src/ui/organizerui.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/sensorsui.cpp b/src/ui/sensorsui.cpp index 5b7b813..a49b9f0 100644 --- a/src/ui/sensorsui.cpp +++ b/src/ui/sensorsui.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/sensorsui.h b/src/ui/sensorsui.h index c2e1d6f..fbaa847 100644 --- a/src/ui/sensorsui.h +++ b/src/ui/sensorsui.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/systeminfogenericui.cpp b/src/ui/systeminfogenericui.cpp index 1830a93..aa3ebe8 100644 --- a/src/ui/systeminfogenericui.cpp +++ b/src/ui/systeminfogenericui.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/systeminfogenericui.h b/src/ui/systeminfogenericui.h index 30013dc..f5bed3a 100644 --- a/src/ui/systeminfogenericui.h +++ b/src/ui/systeminfogenericui.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/systeminfonetworkui.cpp b/src/ui/systeminfonetworkui.cpp index 9f0104a..e8f2cf7 100644 --- a/src/ui/systeminfonetworkui.cpp +++ b/src/ui/systeminfonetworkui.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/systeminfonetworkui.h b/src/ui/systeminfonetworkui.h index 8fdbab5..a8d881d 100644 --- a/src/ui/systeminfonetworkui.h +++ b/src/ui/systeminfonetworkui.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/systeminfostorageui.cpp b/src/ui/systeminfostorageui.cpp index d896930..243ec85 100644 --- a/src/ui/systeminfostorageui.cpp +++ b/src/ui/systeminfostorageui.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/systeminfostorageui.h b/src/ui/systeminfostorageui.h index aab3741..33702d2 100644 --- a/src/ui/systeminfostorageui.h +++ b/src/ui/systeminfostorageui.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/textures/N8_3D_back.png b/src/ui/textures/N8_3D_back.png Binary files differnew file mode 100644 index 0000000..dd54be0 --- /dev/null +++ b/src/ui/textures/N8_3D_back.png diff --git a/src/ui/textures/N8_3D_bottom.png b/src/ui/textures/N8_3D_bottom.png Binary files differnew file mode 100644 index 0000000..d3ce564 --- /dev/null +++ b/src/ui/textures/N8_3D_bottom.png diff --git a/src/ui/textures/N8_3D_front.png b/src/ui/textures/N8_3D_front.png Binary files differnew file mode 100644 index 0000000..b799386 --- /dev/null +++ b/src/ui/textures/N8_3D_front.png diff --git a/src/ui/textures/N8_3D_right.png b/src/ui/textures/N8_3D_right.png Binary files differnew file mode 100644 index 0000000..caf8470 --- /dev/null +++ b/src/ui/textures/N8_3D_right.png diff --git a/src/ui/textures/N8_3D_top.png b/src/ui/textures/N8_3D_top.png Binary files differnew file mode 100644 index 0000000..67deee5 --- /dev/null +++ b/src/ui/textures/N8_3D_top.png diff --git a/src/ui/textures/N900_back.png b/src/ui/textures/N900_back.png Binary files differnew file mode 100644 index 0000000..dc74ee1 --- /dev/null +++ b/src/ui/textures/N900_back.png diff --git a/src/ui/textures/N900_front.png b/src/ui/textures/N900_front.png Binary files differnew file mode 100644 index 0000000..212d6c9 --- /dev/null +++ b/src/ui/textures/N900_front.png diff --git a/src/ui/textures/N900_left.png b/src/ui/textures/N900_left.png Binary files differnew file mode 100644 index 0000000..73855c8 --- /dev/null +++ b/src/ui/textures/N900_left.png diff --git a/src/ui/textures/N900_top.png b/src/ui/textures/N900_top.png Binary files differnew file mode 100644 index 0000000..79326eb --- /dev/null +++ b/src/ui/textures/N900_top.png diff --git a/src/ui/ui.pri b/src/ui/ui.pri index 563f032..bad855e 100644 --- a/src/ui/ui.pri +++ b/src/ui/ui.pri @@ -14,7 +14,9 @@ HEADERS += applicationtablewidget.h \ organizerui.h \ feedbackui.h \ docgalleryui.h \ - cameraui.h + cameraui.h \ + nfcui.h \ + inputscriptinterface.h SOURCES += applicationtablewidget.cpp \ mainwindow.cpp \ configurationwidget.cpp \ @@ -29,7 +31,9 @@ SOURCES += applicationtablewidget.cpp \ organizerui.cpp \ feedbackui.cpp \ docgalleryui.cpp \ - cameraui.cpp + cameraui.cpp \ + nfcui.cpp \ + inputscriptinterface.cpp FORMS += inspector.ui \ viewconfiguration.ui diff --git a/src/ui/ui.qrc b/src/ui/ui.qrc index 4c9a842..708a217 100644 --- a/src/ui/ui.qrc +++ b/src/ui/ui.qrc @@ -13,5 +13,14 @@ <file>icons/topup_landscape.png</file> <file>icons/facedown_landscape.png</file> <file>icons/faceup_landscape.png</file> + <file>textures/N8_3D_back.png</file> + <file>textures/N8_3D_bottom.png</file> + <file>textures/N8_3D_front.png</file> + <file>textures/N8_3D_right.png</file> + <file>textures/N8_3D_top.png</file> + <file>textures/N900_back.png</file> + <file>textures/N900_front.png</file> + <file>textures/N900_left.png</file> + <file>textures/N900_top.png</file> </qresource> </RCC> diff --git a/src/ui/viewconfiguration.cpp b/src/ui/viewconfiguration.cpp index 8069bbd..052452b 100644 --- a/src/ui/viewconfiguration.cpp +++ b/src/ui/viewconfiguration.cpp @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/src/ui/viewconfiguration.h b/src/ui/viewconfiguration.h index cfec72e..7625ebf 100644 --- a/src/ui/viewconfiguration.h +++ b/src/ui/viewconfiguration.h @@ -2,16 +2,16 @@ ** ** This file is part of Qt Simulator ** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** Commercial Usage +** No Commercial Usage ** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** @@ -22,8 +22,12 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. ** **************************************************************************/ diff --git a/stubdata/nfctargets/Qt Labs Website Tag.nfc b/stubdata/nfctargets/Qt Labs Website Tag.nfc new file mode 100644 index 0000000..1c4be9a --- /dev/null +++ b/stubdata/nfctargets/Qt Labs Website Tag.nfc @@ -0,0 +1,8 @@ +[Target] +Name=Qt Labs Website Tag +Type=TagType1 + +[TagType1] +HR0=17 +HR1=0 +Data=@ByteArray(wfUD3\"\x11\0\xe1\x10\xe\0\x3(\x11\x1\rT\x5\x65n_USQt Labs\x11\x1\x13U\x3labs.qt.nokia.com/\xfe\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1`\0\0\0\0\0\0) diff --git a/stubdata/nfctargets/Qt Website Tag.nfc b/stubdata/nfctargets/Qt Website Tag.nfc new file mode 100644 index 0000000..1a6c92d --- /dev/null +++ b/stubdata/nfctargets/Qt Website Tag.nfc @@ -0,0 +1,9 @@ +[Target] +Name=Qt Website Tag +UID=11:22:33:44:55:66:77 +Type=TagType1 + +[TagType1] +HR0=18 +HR1=0 +Data="@ByteArray(\x11\"3DUfw\0\xe1\x10\xff\0\x3\xff\x4*\x82\t\0\0\x3\xc0image/png\x89PNG\r\n\x1a\n\0\0\0\rIHDR\0\0\0\x39\0\0\0\x43\b\x3\0\0\0\x11\x7f]\x10\0\0\0\x1sRGB\0\xae\xce\x1c\xe9\0\0\0\xc0PLTE\x2\x43\x11\x2\x46\x1a\x4I\b\x1I#\0K\x1e\x11K'\0\0\0\0\0\0\0\0\0\x1`\0\0\0\0\0\0\0\0\0\0\0\0\0\0T\x1a\x1V\v\x10S,\x10`#\x1eZ8\xen\x10*cA\x13q\0\x1bv\x13:qO,\x82\x16\x39\x80\x42.\x8c\x1b.\x91\xfO\x7f\x63.\x95\x3;\x96\"8\x9b\x18\x36\x9f\x2^\x8bpB\xa2\x1a\x45\xa4\x1d\x43\xab\x17J\xa9\"M\xaa\x18m\x99}N\xb2\x14V\xae\x32\x80\xa1\x8bj\xadY`\xb3\x43x\xafos\xbcQy\xbeZ\x93\xb1\x9f{\xbf\x64\x92\xba\x8f\x88\xc5i\x9e\xbc\xa8\x93\xcbz\x9b\xce\x88\xb7\xcd\xbf\xba\xd0\xc2\xb1\xda\x9a\xb3\xdb\xa4\xcb\xd9\xcd\xc2\xe1\xb0\xc8\xe4\xba\xcc\xe8\xc5\xdb\xe5\xdf\xdb\xee\xd3\xe0\xf4\xd0\xe9\xf0\xec\xe8\xf3\xe1\xeb\xf6\xea\xf7\xfa\xf6\xfc\xfe\xfb\xfe\xff\xfc\xfe\x35:\x8c\0\0\0\x1\x62KGD\0\x88\x5\x1dH\0\0\0\tpHYs\0\0\v\x13\0\0\v\x13\x1\0\x9a\x9c\x18\0\0\0\atIME\a\xda\n\x1c\x5\f\t\xfc\xacP,\0\0\x2yIDATH\xc7\xed\x97k{\xda \x14\xc7\xf1\xb2\xdaj\x1b\x9dNE!q\xb4\xce\xe8\x66\xb4\xad\xb9\x38\x3\xe5\xfb\x7f\xab\x2\x41\x1bS\r\xb8\xe7\xd9\x9e\xbd\xf0\xbcJb~\xf9\xc3\xb9q\x4\xfcO\r\\\xc9\xff\x9e\x64\xec_k\xb2\xe7\xc7\xc9\x8f\xc5l\xb1\n\xb7\xf4\"2i\x83j\xf\x66\xe6N\xfd \x8c\xa9\x1d\xb9k\x82\xfa\x10#m\x12\x1fK\xfe\x35NM\xe4\b\xd4\x9c\x3\x98\xe3!\"\x8ag\xe7\xc8\xddm\xbd\xde\xf3\xd0)\x1bK}Df\xc1k\x94\xe3\xf\xe4\x6TnP\xa9\x65\xfa\xdbO\xe4\xdaHfxt\x82\xac\xe7I\xf7\x1c\x19\x97\x93\x18\xf6\x91\xeb\x8a\xf5]Jz\xf_\x97\t\xa5\xdb\xd0\xd7,\x96.\xb2!\x1b\xa3\x37\xfd\x34&\n\xed<\xf9S\x1b\xb2\x31\xfa\x88Z*P\xdc\xfd\x92\xf0\xd4Lb\xa7\xb9S\xcc\xcf\x39\xe3\x8cG\x82l\xdds\x1b\x12\x81G\x1\b\xb1~\xe3\x9b\xfc\xc1\x87\x9e\\D\xea\x9aH\xdc\xa9%\xf2>\x80\xde\0\xac\x95\xe8\x10\xcc\x5\t\x95\xb7\xca\xc8\x46[\xddO\xc7\xc8\x13\xa2\x42\xfdn\x92\x88\xe5\xd3U\xe0\x1bV[\x9d\xc8\xd7\xa9X\x9c\xda\x1f\xe7m\xf5@\xd8\xb6\x9c\x94Kc\xd9[\xd8\xb9\x95>\x9a\xd8\x91XnN\x6\x12\xea-3\x1e\xb6\x64\x94\xe8j\x15\x94\x93\xdd\xca\x46\xde\x46P_3\xfe\xfb\xa1\xc9,<\x84;\x95\xa4H:Mn\x11\x95}P\xc2O$\xfa\x8b\xe4\xb9\xd5\x1a\xc9\x13\x1e\xb2$\a\xe0\xb9\x18\x15G\xf9\xd6\x44zC\xb0<dB\xa7\xb6\x13\xd7/v\xa4\xc8>U*4\xab\x37\x99<\xc1\x83\x1d\xe9\x65\xb5\xc5\xc9!og\x96\x9aZ\x88/ r\xab#!O\x89&\xb1\xa9\xcat\xe2\x86\x87\xfaT\xdfz\xe3~\xe7\xc9-\xdf\xa7\xaeJ\xee\xf7\xb3~\xe4\xc3\xaeJ\xe\xb6\x63\xc4\xd0\x87\x6\x95\xb5\x42\xd7\x42[H\x8avYU\x85\xc7\x99\xe8\x66\xa5}H\xb5\xb0\xfd\xc9#\x13\x1dw\xef\x96\x8c\xa5\xd1/c\xd7\xf4\x9c\xfb\x8d~\x1a\xb9\xd2-\x18\xf5\bA\xa6>\xa4T{\xad\xd1&kc\xfb\x8f\x8d\xa1\xdd\xb9\x82\xbe\x37T(W\xf0\xd2\x13\tyY\xb1\xb1`ZD\xb7\xa6SP'\xa1\xf2g\xde\b3\x91\"\xdb\xd5N\v$\f\xb8QS\x86\"\xa5\x34&G \xa1\x66\x32;}\vc\xc2\x34\xe5\xdc\x66Np\x8f\x46\v1\x9a\xc4'\xa7\x9aS\x13\x6\xfc`\xd2\xf3\x93\xd4\xf1T\x93g\x98i\x6\x9b\x83\x9b#\xe6%J\x99\xe5\xc4\xb8\xac\xf6\xed\x98\"\xc9\xf8za\xc7\\\xffu\\\xc9\xbc\xbd\x3\x80M\xdfk\x14\xf5\x10\xdf\0\0\0\0IEND\xae\x42`\x82\x11\x1\x10T\x5\x65n_USQt Website\x11\x1\x1dT\x5ja_JPQt\xe3\x81\xae\xe3\x83\x9b\xe3\x83\xbc\xe3\x83\xa0\xe3\x83\x9a\xe3\x83\xbc\xe3\x82\xb8\x11\x1\x10T\x5nb_NOQt WebsideQ\x1\xeU\x3qt.nokia.com/\xfe\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0)" |
