From f5c97bb358b175d8f517391f284cc2f6770a81f3 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 18 Jun 2012 14:01:58 +0200 Subject: [PATCH 1/7] changed maximum left and right palette --- src/gui/UBLeftPalette.cpp | 2 +- src/gui/UBRightPalette.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/UBLeftPalette.cpp b/src/gui/UBLeftPalette.cpp index 00e0a4d9..dc93d6ec 100644 --- a/src/gui/UBLeftPalette.cpp +++ b/src/gui/UBLeftPalette.cpp @@ -45,7 +45,7 @@ UBLeftPalette::~UBLeftPalette() */ void UBLeftPalette::updateMaxWidth() { - setMaximumWidth(270); + setMaximumWidth((int)(parentWidget()->width() * 0.45)); } /** diff --git a/src/gui/UBRightPalette.cpp b/src/gui/UBRightPalette.cpp index 26923eac..f8190528 100644 --- a/src/gui/UBRightPalette.cpp +++ b/src/gui/UBRightPalette.cpp @@ -69,7 +69,7 @@ void UBRightPalette::resizeEvent(QResizeEvent *event) */ void UBRightPalette::updateMaxWidth() { - setMaximumWidth((int)((parentWidget()->width() * 2)/3)); + setMaximumWidth((int)(parentWidget()->width() * 0.45)); setMaximumHeight(parentWidget()->height()); setMinimumHeight(parentWidget()->height()); } From 4014240178071f0f2f15b44fbed553d8c9685467 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 18 Jun 2012 14:20:00 +0200 Subject: [PATCH 2/7] CFF dll copied into the build directory --- release.win7.vc9.bat | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release.win7.vc9.bat b/release.win7.vc9.bat index c11d938d..3f61b63a 100644 --- a/release.win7.vc9.bat +++ b/release.win7.vc9.bat @@ -65,6 +65,9 @@ copy %BASE_QT_TRANSLATIONS_DIRECTORY%\qt_*.qm build\win32\release\product\i18n\ mkdir build\win32\release\product\customizations xcopy /s resources\customizations\* build\win32\release\product\customizations +copy plugins\cffadaptor\build\win32\release\lib\CFF_Adaptor.dll build\win32\release\product\ + + del build\win32\release\product\i18n\qt_help* del "build\win32\release\product\Sankore.pdb" From ca612dedf7dcbb70c41b81bb864cca57da976f7e Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 18 Jun 2012 18:02:37 +0200 Subject: [PATCH 3/7] lgpl good licence --- lgpl.txt | 592 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 432 insertions(+), 160 deletions(-) diff --git a/lgpl.txt b/lgpl.txt index 65c5ca88..e346a12e 100644 --- a/lgpl.txt +++ b/lgpl.txt @@ -1,165 +1,437 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + 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 Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the 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 a program 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. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + 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, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +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 compile 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) 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. + + c) 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. + + d) 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 source code 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 to +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 Library 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 \ No newline at end of file From ed89d1e826873f5af7ede9ffd069fb4438838823 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 21 Jun 2012 11:41:35 +0200 Subject: [PATCH 4/7] fixed issue on document navigator when the palette is resized --- src/gui/UBDocumentNavigator.cpp | 8 -------- src/gui/UBThumbnailWidget.cpp | 5 ----- 2 files changed, 13 deletions(-) diff --git a/src/gui/UBDocumentNavigator.cpp b/src/gui/UBDocumentNavigator.cpp index 1c349038..c947d902 100644 --- a/src/gui/UBDocumentNavigator.cpp +++ b/src/gui/UBDocumentNavigator.cpp @@ -264,14 +264,6 @@ void UBDocumentNavigator::resizeEvent(QResizeEvent *event) // Update the thumbnails width mThumbnailWidth = (width() > mThumbnailMinWidth) ? width() - 2*border() : mThumbnailMinWidth; - // Update the scene rect - // QRect sceneRect; - // sceneRect.setWidth(width() - 2*border()); - // sceneRect.setHeight(height() - 2*border()); - // sceneRect.moveLeft(border()); - // sceneRect.moveTop(border()); - // scene()->setSceneRect(sceneRect); - // Refresh the scene refreshScene(); } diff --git a/src/gui/UBThumbnailWidget.cpp b/src/gui/UBThumbnailWidget.cpp index 4f22cc42..fbe03045 100644 --- a/src/gui/UBThumbnailWidget.cpp +++ b/src/gui/UBThumbnailWidget.cpp @@ -887,11 +887,6 @@ void UBImgTextThumbnailElement::Place(int row, int col, qreal width, qreal heigh qreal scaleFactor = qMin(scaleWidth, scaleHeight); UBThumbnail* pix = dynamic_cast(this->thumbnail); - if(pix) - { - scaleFactor = qMin(scaleFactor, 1.0); - } - QTransform transform; transform.scale(scaleFactor, scaleFactor); From a9752aaf002f1a6b4acf1a933bfd725b6e16041d Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 22 Jun 2012 11:12:59 +0200 Subject: [PATCH 5/7] added -lang parameter to application to be able to choose the language. Available on linux --- src/core/UBApplication.cpp | 65 +++++++++++++++++------- src/core/UBApplication.h | 1 + src/frameworks/UBPlatformUtils.h | 5 +- src/frameworks/UBPlatformUtils_linux.cpp | 17 +++++-- src/frameworks/UBPlatformUtils_win.cpp | 16 ++++-- 5 files changed, 77 insertions(+), 27 deletions(-) diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index faab24bf..cd477981 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -135,27 +135,13 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing UBResources::resources(); if (!undoStack) - { undoStack = new QUndoStack(staticMemoryCleaner); - } - - mApplicationTranslator = new QTranslator(this); - mApplicationTranslator->load(UBPlatformUtils::preferredTranslation(QString("sankore_"))); - installTranslator(mApplicationTranslator); - - QString localString; - if (!mApplicationTranslator->isEmpty()) - localString = UBPlatformUtils::preferredLanguage(); - else - localString = "en_US"; - mQtGuiTranslator = new QTranslator(this); - mQtGuiTranslator->load(UBPlatformUtils::preferredTranslation(QString("qt_"))); - installTranslator(mQtGuiTranslator); + QString forcedLanguage(""); + if(args.contains("-lang")) + forcedLanguage=args.at(args.indexOf("-lang") + 1); - - QLocale::setDefault(QLocale(localString)); - qDebug() << "Running application in:" << localString; + setupTranslator(forcedLanguage); UBSettings *settings = UBSettings::settings(); @@ -217,6 +203,49 @@ UBApplication::~UBApplication() staticMemoryCleaner = 0; } + +void UBApplication::setupTranslator(QString forcedLanguage) +{ + QStringList availablesTranslations = UBPlatformUtils::availableTranslations(); + QString language(""); + if(!forcedLanguage.isEmpty()){ + if(availablesTranslations.contains(forcedLanguage,Qt::CaseInsensitive)) + language = forcedLanguage; + else + qDebug() << "forced language " << forcedLanguage << " not available"; + } + else{ + QString systemLanguage = UBPlatformUtils::systemLanguage(); + if(availablesTranslations.contains(systemLanguage,Qt::CaseInsensitive)) + language = systemLanguage; + else + qDebug() << "translation for system language " << systemLanguage << " not found"; + } + + if(language.isEmpty()){ + language = "en_US"; + //fallback if no translation are available + } + else{ + mApplicationTranslator = new QTranslator(this); + mQtGuiTranslator = new QTranslator(this); + + mApplicationTranslator->load(UBPlatformUtils::translationPath(QString("sankore_"),language)); + installTranslator(mApplicationTranslator); + + + mQtGuiTranslator->load(UBPlatformUtils::translationPath(QString("qt_"),language)); + if(mQtGuiTranslator){ + // checked because this translation could be not available + installTranslator(mQtGuiTranslator); + } + } + + + QLocale::setDefault(QLocale(language)); + qDebug() << "Running application in:" << language; +} + int UBApplication::exec(const QString& pFileToImport) { QPixmapCache::setCacheLimit(1024 * 100); diff --git a/src/core/UBApplication.h b/src/core/UBApplication.h index 2950005f..efe2c0ec 100644 --- a/src/core/UBApplication.h +++ b/src/core/UBApplication.h @@ -121,6 +121,7 @@ class UBApplication : public QtSingleApplication private: void updateProtoActionsState(); + void setupTranslator(QString forcedLanguage); QList mProtoMenus; bool mIsVerbose; diff --git a/src/frameworks/UBPlatformUtils.h b/src/frameworks/UBPlatformUtils.h index a4d6d886..0b99b370 100644 --- a/src/frameworks/UBPlatformUtils.h +++ b/src/frameworks/UBPlatformUtils.h @@ -103,8 +103,8 @@ class UBPlatformUtils static void setFileType(const QString &filePath, unsigned long fileType); static void fadeDisplayOut(); static void fadeDisplayIn(); - static QString preferredTranslation(QString pFilePrefix); - static QString preferredLanguage(); + static QString translationPath(QString pFilePrefix, QString pLanguage); + static QString systemLanguage(); static bool hasVirtualKeyboard(); //static void showVirtualKeyboard(); static void runInstaller(const QString &installerFilePath); @@ -115,6 +115,7 @@ class UBPlatformUtils static QString computerName(); static UBKeyboardLocale** getKeyboardLayouts(int& nCount); static QString urlFromClipboard(); + static QStringList availableTranslations(); }; diff --git a/src/frameworks/UBPlatformUtils_linux.cpp b/src/frameworks/UBPlatformUtils_linux.cpp index 174e3694..6be93d3f 100644 --- a/src/frameworks/UBPlatformUtils_linux.cpp +++ b/src/frameworks/UBPlatformUtils_linux.cpp @@ -20,6 +20,8 @@ #include #include +#include "frameworks/UBFileSystemUtils.h" + void UBPlatformUtils::init() { @@ -55,13 +57,22 @@ void UBPlatformUtils::fadeDisplayIn() // NOOP } -QString UBPlatformUtils::preferredTranslation(QString pFilePrefix) +QStringList UBPlatformUtils::availableTranslations() +{ + QString translationsPath = applicationResourcesDirectory() + "/" + "i18n" + "/"; + QStringList translationsList = UBFileSystemUtils::allFiles(translationsPath); + QRegExp sankoreTranslationFiles(".*sankore_.*.qm"); + translationsList=translationsList.filter(sankoreTranslationFiles); + return translationsList.replaceInStrings(QRegExp("(.*)sankore_(.*).qm"),"\\2"); +} + +QString UBPlatformUtils::translationPath(QString pFilePrefix,QString pLanguage) { - QString qmPath = applicationResourcesDirectory() + "/" + "i18n" + "/" + pFilePrefix + preferredLanguage() + ".qm"; + QString qmPath = applicationResourcesDirectory() + "/" + "i18n" + "/" + pFilePrefix + pLanguage + ".qm"; return qmPath; } -QString UBPlatformUtils::preferredLanguage() +QString UBPlatformUtils::systemLanguage() { return QLocale::system().name(); } diff --git a/src/frameworks/UBPlatformUtils_win.cpp b/src/frameworks/UBPlatformUtils_win.cpp index 04f09420..dff427c5 100644 --- a/src/frameworks/UBPlatformUtils_win.cpp +++ b/src/frameworks/UBPlatformUtils_win.cpp @@ -59,14 +59,22 @@ void UBPlatformUtils::fadeDisplayIn() // NOOP } -QString UBPlatformUtils::preferredTranslation(QString pFilePrefix) +QStringList UBPlatformUtils::availableTranslations() { - QString localPreferredLanguage = preferredLanguage(); - QString qmPath = applicationResourcesDirectory() + "/" + "i18n" + "/" + pFilePrefix + localPreferredLanguage + ".qm"; + QString translationsPath = applicationResourcesDirectory() + "/" + "i18n" + "/"; + QStringList translationsList = UBFileSystemUtils::allFiles(translationsPath); + QRegExp sankoreTranslationFiles(".*sankore_.*.qm"); + translationsList=translationsList.filter(sankoreTranslationFiles); + return translationsList.replaceInStrings(QRegExp("(.*)sankore_(.*).qm"),"\\2"); +} + +QString UBPlatformUtils::translationPath(QString pFilePrefix,QString pLanguage) +{ + QString qmPath = applicationResourcesDirectory() + "/" + "i18n" + "/" + pFilePrefix + pLanguage + ".qm"; return qmPath; } -QString UBPlatformUtils::preferredLanguage() +QString UBPlatformUtils::systemLanguage() { return QLocale::system().name(); } From 31a814360a74eebe2e2e0b0f792e89328a79a86d Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 22 Jun 2012 11:34:44 +0200 Subject: [PATCH 6/7] language can be choosed on windows system too --- src/board/UBBoardController.cpp | 3 ++- src/core/UBApplication.cpp | 4 +++- src/frameworks/UBPlatformUtils_win.cpp | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index b94fbc16..d70efe1f 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -1233,11 +1233,12 @@ void UBBoardController::setActiveDocumentScene(UBDocumentProxy* pDocumentProxy, if(documentChange) { emit activeDocumentChanged(); + emit setDocOnPageNavigator(pDocumentProxy); UBGraphicsTextItem::lastUsedTextColor = QColor(); } // Notify the navigator palette that the document has changed - emit setDocOnPageNavigator(pDocumentProxy); + //emit setDocOnPageNavigator(pDocumentProxy); if (sceneChange) { diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index cd477981..699f9a37 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -235,10 +235,12 @@ void UBApplication::setupTranslator(QString forcedLanguage) mQtGuiTranslator->load(UBPlatformUtils::translationPath(QString("qt_"),language)); - if(mQtGuiTranslator){ + if(!mQtGuiTranslator->isEmpty()){ // checked because this translation could be not available installTranslator(mQtGuiTranslator); } + else + qDebug() << "Qt gui translation in " << language << " are not available"; } diff --git a/src/frameworks/UBPlatformUtils_win.cpp b/src/frameworks/UBPlatformUtils_win.cpp index dff427c5..4127e7f1 100644 --- a/src/frameworks/UBPlatformUtils_win.cpp +++ b/src/frameworks/UBPlatformUtils_win.cpp @@ -20,6 +20,7 @@ #include #include +#include "frameworks/UBFileSystemUtils.h" #include "core/memcheck.h" void UBPlatformUtils::init() From 28bb7a67f7ce3cfe2cd76aecdde51c36515e5066 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 22 Jun 2012 14:34:51 +0200 Subject: [PATCH 7/7] startup language available on the all OS --- src/frameworks/UBFileSystemUtils.cpp | 4 +- src/frameworks/UBFileSystemUtils.h | 2 +- src/frameworks/UBPlatformUtils_mac.mm | 69 ++++++++++++++++++++------- 3 files changed, 54 insertions(+), 21 deletions(-) diff --git a/src/frameworks/UBFileSystemUtils.cpp b/src/frameworks/UBFileSystemUtils.cpp index 5d9e018c..658a4389 100644 --- a/src/frameworks/UBFileSystemUtils.cpp +++ b/src/frameworks/UBFileSystemUtils.cpp @@ -177,7 +177,7 @@ void UBFileSystemUtils::cleanupGhostTempFolders(const QString& templateString) } -QStringList UBFileSystemUtils::allFiles(const QString& pDirPath) +QStringList UBFileSystemUtils::allFiles(const QString& pDirPath, bool isRecursive) { QStringList result; if (pDirPath == "" || pDirPath == "." || pDirPath == "..") @@ -187,7 +187,7 @@ QStringList UBFileSystemUtils::allFiles(const QString& pDirPath) foreach(QFileInfo dirContent, dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot , QDir::Name)) { - if (dirContent.isDir()) + if (isRecursive && dirContent.isDir()) { result << allFiles(dirContent.absoluteFilePath()); } diff --git a/src/frameworks/UBFileSystemUtils.h b/src/frameworks/UBFileSystemUtils.h index bd20755b..26ec89d2 100644 --- a/src/frameworks/UBFileSystemUtils.h +++ b/src/frameworks/UBFileSystemUtils.h @@ -37,7 +37,7 @@ class UBFileSystemUtils static QFileInfoList allElementsInDirectory(const QString& pDirPath); - static QStringList allFiles(const QString& pDirPath); + static QStringList allFiles(const QString& pDirPath, const bool isRecurive=true); static bool deleteDir(const QString& pDirPath); diff --git a/src/frameworks/UBPlatformUtils_mac.mm b/src/frameworks/UBPlatformUtils_mac.mm index e94d254b..33d2bc25 100644 --- a/src/frameworks/UBPlatformUtils_mac.mm +++ b/src/frameworks/UBPlatformUtils_mac.mm @@ -184,31 +184,64 @@ void UBPlatformUtils::fadeDisplayIn() } } -QString UBPlatformUtils::preferredTranslation(QString pFilePrefix) -{ - QString qmPath; - NSString* filePrefix = [[NSString alloc] initWithUTF8String:(const char*)(pFilePrefix.toUtf8())]; +//QString UBPlatformUtils::preferredTranslation(QString pFilePrefix) +//{ +// QString qmPath; +// NSString* filePrefix = [[NSString alloc] initWithUTF8String:(const char*)(pFilePrefix.toUtf8())]; + +// NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + +// NSString *lprojPath = [[[NSBundle mainBundle] pathForResource:@"Localizable" ofType:@"strings"] stringByDeletingLastPathComponent]; +// if (lprojPath) +// { +// NSString *lang = [[lprojPath lastPathComponent] stringByDeletingPathExtension]; +// NSString *translationFilePath = [lprojPath stringByAppendingPathComponent:[[filePrefix stringByAppendingString:lang] stringByAppendingPathExtension:@"qm"]]; +// qmPath = QString::fromUtf8([translationFilePath UTF8String], strlen([translationFilePath UTF8String])); +// } + +// [pool drain]; +// return qmPath; +//} + +//QString UBPlatformUtils::preferredLanguage() +//{ +// QFileInfo qmFileInfo = QFileInfo(preferredTranslation("sankore_")); +// QDir lprojPath = qmFileInfo.dir(); +// QFileInfo lprojFileInfo = QFileInfo(lprojPath.absolutePath()); +// return lprojFileInfo.baseName(); +//} + +QStringList UBPlatformUtils::availableTranslations() +{ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSString *lprojPath = [[NSBundle mainBundle] resourcePath]; + QString translationsPath = QString::fromUtf8([lprojPath UTF8String], strlen([lprojPath UTF8String])); + QStringList translationsList = UBFileSystemUtils::allFiles(translationsPath, false); + QRegExp sankoreTranslationFiles(".*lproj"); + translationsList=translationsList.filter(sankoreTranslationFiles); + [pool drain]; + return translationsList.replaceInStrings(QRegExp("(.*)/(.*).lproj"),"\\2"); +} - NSString *lprojPath = [[[NSBundle mainBundle] pathForResource:@"Localizable" ofType:@"strings"] stringByDeletingLastPathComponent]; - if (lprojPath) - { - NSString *lang = [[lprojPath lastPathComponent] stringByDeletingPathExtension]; - NSString *translationFilePath = [lprojPath stringByAppendingPathComponent:[[filePrefix stringByAppendingString:lang] stringByAppendingPathExtension:@"qm"]]; - qmPath = QString::fromUtf8([translationFilePath UTF8String], strlen([translationFilePath UTF8String])); - } - +QString UBPlatformUtils::translationPath(QString pFilePrefix, QString pLanguage) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSString *lprojPath = [[NSBundle mainBundle] resourcePath]; + QString translationsPath = QString::fromUtf8([lprojPath UTF8String], strlen([lprojPath UTF8String])); [pool drain]; - return qmPath; + return translationsPath + "/" + pLanguage + ".lproj/" + pFilePrefix + pLanguage + ".qm"; } -QString UBPlatformUtils::preferredLanguage() +QString UBPlatformUtils::systemLanguage() { - QFileInfo qmFileInfo = QFileInfo(preferredTranslation("sankore_")); - QDir lprojPath = qmFileInfo.dir(); - QFileInfo lprojFileInfo = QFileInfo(lprojPath.absolutePath()); - return lprojFileInfo.baseName(); + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + NSUserDefaults* defs = [NSUserDefaults standardUserDefaults]; + NSArray* languages = [defs objectForKey:@"AppleLanguages"]; + NSString* preferredLang = [languages objectAtIndex:0]; + QString result = QString::fromUtf8([preferredLang UTF8String], strlen([preferredLang UTF8String])); + [pool drain]; + return result; } void UBPlatformUtils::runInstaller(const QString &installerFilePath)