Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~plough/design into 9.0

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {project}  Copyright (C) {year}  {fullname}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

build.release.gradle

@@ -2,8 +2,9 @@ apply plugin: "java"
 tasks.withType(JavaCompile){
 	options.encoding = "UTF-8"
 }
+
 def basicDir="../../"
-def libDir="${basicDir}/finereport-lib-stable/master"
+def libDir="${basicDir}/finereport-lib-stable"
 //获取什么分支名
 FileTree files =fileTree(dir:"./",include:"build.*.gradle")
 def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ("\\"))
@@ -26,8 +27,8 @@ task appletJar<<{
 			fileset(dir:"${basicDir}/finereport-performance-stable/${branchName}/build/classes/main")
 
 		}
-		unjar(src:"${libDir}/3rd.jar",dest:"./tmp")
+		unjar(src:"${libDir}/${branchName}/3rd.jar",dest:"./tmp")
-		unjar(src:"${libDir}/servlet-api.jar",dest:"./tmp")
+		unjar(src:"${libDir}/${branchName}/servlet-api.jar",dest:"./tmp")
 		jar(jarfile:"build/libs/fr-applet-8.0.jar"){
 			fileset(dir:"build/classes"){
 				exclude(name:"*.*")

designer/designer.iml

@@ -10,5 +10,35 @@
     <orderEntry type="module" module-name="designer_base" />
     <orderEntry type="module" module-name="designer_form" />
     <orderEntry type="module" module-name="designer_chart" />
+    <orderEntry type="module" module-name="designer_chart" />
+    <orderEntry type="module" module-name="designer_base" />
+    <orderEntry type="module" module-name="designer_form" />
+    <orderEntry type="module" module-name="base" />
+    <orderEntry type="module" module-name="base-basic" />
+    <orderEntry type="module" module-name="base-calculate" />
+    <orderEntry type="module" module-name="base-data" />
+    <orderEntry type="module" module-name="base-file" />
+    <orderEntry type="module" module-name="base-performance" />
+    <orderEntry type="module" module-name="base-plugin-engine" />
+    <orderEntry type="module" module-name="base-stable" />
+    <orderEntry type="module" module-name="chart-base" />
+    <orderEntry type="module" module-name="chart-chartattr" />
+    <orderEntry type="module" module-name="chart-chartdata" />
+    <orderEntry type="module" module-name="chart-chartglyph" />
+    <orderEntry type="module" module-name="chart-web" />
+    <orderEntry type="module" module-name="engine" />
+    <orderEntry type="module" module-name="engine-cross" />
+    <orderEntry type="module" module-name="engine-enhancement" />
+    <orderEntry type="module" module-name="engine-page" />
+    <orderEntry type="module" module-name="engine-remote" />
+    <orderEntry type="module" module-name="engine-view" />
+    <orderEntry type="module" module-name="engine-write" />
+    <orderEntry type="module" module-name="fmobile" />
+    <orderEntry type="module" module-name="form" />
+    <orderEntry type="module" module-name="fsbakrestore" />
+    <orderEntry type="module" module-name="fschedule" />
+    <orderEntry type="module" module-name="fservice" />
+    <orderEntry type="module" module-name="fsmonitor" />
+    <orderEntry type="library" name="lib" level="project" />
   </component>
 </module>

designer/src/com/fr/design/mainframe/ElementCasePane.java

@@ -242,6 +242,8 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
         initFormatBrush();
     }
 
+
+
     public int getMenuState() {
         return DesignState.WORK_SHEET;
     }

designer/src/com/fr/design/mainframe/InformationCollector.java

@@ -10,6 +10,7 @@ import com.fr.data.core.db.dml.Delete;
 import com.fr.data.core.db.dml.Select;
 import com.fr.data.core.db.dml.Table;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.mainframe.errorinfo.ErrorInfoUploader;
 import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
 import com.fr.general.*;
 import com.fr.general.http.HttpClient;
@@ -317,6 +318,7 @@ public class InformationCollector implements XMLReadable, XMLWriter {
                 sendFunctionsInfo();
                 sendUserInfo();
 				TemplateInfoCollector.getInstance().sendTemplateInfo();
+				ErrorInfoUploader.getInstance().sendErrorInfo();
 			}
 		});
     	sendThread.start();

designer/src/com/fr/design/mainframe/JWorkBook.java

@@ -35,6 +35,7 @@ import com.fr.design.parameter.ParameterDefinitePane;
 import com.fr.design.parameter.ParameterInputPane;
 import com.fr.design.preview.PagePreview;
 import com.fr.design.preview.ViewPreview;
+import com.fr.design.preview.WriteEnhancePreview;
 import com.fr.design.preview.WritePreview;
 import com.fr.design.roleAuthority.ReportAndFSManagePane;
 import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
@@ -86,7 +87,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
     private static final int TOOLBARPANEDIMHEIGHT = 26;
 
     private UIModeControlContainer centerPane;
-    private ReportComponentComposite reportComposite;
+    public ReportComponentComposite reportComposite;
     private ParameterDefinitePane parameterPane;
     private int resolution;
 
@@ -345,57 +346,59 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
     public void setScale(int resolution) {
         //更新resolution
         this.resolution = resolution;
-        if (reportComposite.centerCardPane.editingComponet.elementCasePane != null){
+        ElementCasePane elementCasePane = reportComposite.centerCardPane.editingComponet.elementCasePane;
-            reportComposite.centerCardPane.editingComponet.elementCasePane.setResolution(resolution);
+        PolyDesigner polyDezi = reportComposite.centerCardPane.getPolyDezi();
-            reportComposite.centerCardPane.editingComponet.elementCasePane.getGrid().getGridMouseAdapter().setResolution(resolution);
+        if (elementCasePane != null){
-            reportComposite.centerCardPane.editingComponet.elementCasePane.getGrid().setResolution(resolution);
+            elementCasePane.setResolution(resolution);
+            elementCasePane.getGrid().getGridMouseAdapter().setResolution(resolution);
+            elementCasePane.getGrid().setResolution(resolution);
             //更新Grid
-            Grid grid = reportComposite.centerCardPane.editingComponet.elementCasePane.getGrid();
+            Grid grid = elementCasePane.getGrid();
-            DynamicUnitList rowHeightList = ReportHelper.getRowHeightList(reportComposite.centerCardPane.editingComponet.elementCasePane.getEditingElementCase());
+            DynamicUnitList rowHeightList = ReportHelper.getRowHeightList(elementCasePane.getEditingElementCase());
-            DynamicUnitList columnWidthList = ReportHelper.getColumnWidthList(reportComposite.centerCardPane.editingComponet.elementCasePane.getEditingElementCase());
+            DynamicUnitList columnWidthList = ReportHelper.getColumnWidthList(elementCasePane.getEditingElementCase());
             grid.setVerticalExtent(GridUtils.getExtentValue(0, rowHeightList, grid.getHeight(), resolution));
             grid.setHorizontalExtent(GridUtils.getExtentValue(0, columnWidthList, grid.getWidth(), resolution));
-            reportComposite.centerCardPane.editingComponet.elementCasePane.getGrid().updateUI();
+            elementCasePane.getGrid().updateUI();
             //更新Column和Row
-            ((DynamicScrollBar)reportComposite.centerCardPane.editingComponet.elementCasePane.getVerticalScrollBar()).setDpi(resolution);
+            ((DynamicScrollBar)elementCasePane.getVerticalScrollBar()).setDpi(resolution);
-            ((DynamicScrollBar)reportComposite.centerCardPane.editingComponet.elementCasePane.getHorizontalScrollBar()).setDpi(resolution);
+            ((DynamicScrollBar)elementCasePane.getHorizontalScrollBar()).setDpi(resolution);
-            reportComposite.centerCardPane.editingComponet.elementCasePane.getGridColumn().setResolution(resolution);
+            elementCasePane.getGridColumn().setResolution(resolution);
-            reportComposite.centerCardPane.editingComponet.elementCasePane.getGridColumn().updateUI();
+            elementCasePane.getGridColumn().updateUI();
-            reportComposite.centerCardPane.editingComponet.elementCasePane.getGridRow().setResolution(resolution);
+            elementCasePane.getGridRow().setResolution(resolution);
-            reportComposite.centerCardPane.editingComponet.elementCasePane.getGridRow().updateUI();
+            elementCasePane.getGridRow().updateUI();
-        }
+        }
-        if (reportComposite.centerCardPane.polyDezi != null){
+        if (polyDezi != null){
-            reportComposite.centerCardPane.polyDezi.setResolution(resolution);
+            polyDezi.setResolution(resolution);
             HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setJTemplateResolution(resolution);
-            reportComposite.centerCardPane.polyDezi.updateUI();
+            polyDezi.updateUI();
         }
-//        reportComposite.centerCardPane.editingComponet.elementCasePane.getGrid().setVerticalValue(10);
-
         HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().fireTargetModified();
     }
     @Override
     public int selfAdaptUpdate(){
+        PolyDesigner polyDezi = reportComposite.centerCardPane.getPolyDezi();
+        ElementCasePane elementCasePane = reportComposite.centerCardPane.editingComponet.elementCasePane;
         if (resolution == 0){
             resolution = ScreenResolution.getScreenResolution();
         }
-        if (reportComposite.centerCardPane.polyDezi.getSelection() !=null){
+        if (polyDezi != null && polyDezi.getSelection() != null){
-            BlockCreator blockCreator =reportComposite.centerCardPane.polyDezi.getSelection();
+            BlockCreator blockCreator =polyDezi.getSelection();
             double x = blockCreator.getEditorBounds().getX();
             double y = blockCreator.getEditorBounds().getY();
-            reportComposite.centerCardPane.polyDezi.setHorizontalValue((int) x);
+            polyDezi.setHorizontalValue((int) x);
-            reportComposite.centerCardPane.polyDezi.setVerticalValue((int) y);
+            polyDezi.setVerticalValue((int) y);
             double creatorHeight = blockCreator.getEditorBounds().height;
             double creatorWidth = blockCreator.getEditorBounds().width;
-            double areaHeight = reportComposite.centerCardPane.polyDezi.polyArea.getHeight();
+            double areaHeight = polyDezi.polyArea.getHeight();
-            double areaWidth = reportComposite.centerCardPane.polyDezi.polyArea.getWidth();
+            double areaWidth = polyDezi.polyArea.getWidth();
             if (creatorWidth == 0||creatorHeight == 0){
                 return resolution;
             }
             double time =(areaHeight/creatorHeight)<(areaWidth/creatorWidth) ? (areaHeight/creatorHeight) : (areaWidth/creatorWidth);
-            return (int) (time * reportComposite.centerCardPane.polyDezi.getResolution());
+            return (int) (time * ScreenResolution.getScreenResolution());
 
-        }else if (reportComposite.centerCardPane.editingComponet.elementCasePane != null) {
+        }else if (elementCasePane != null) {
-            ElementCasePane reportPane = reportComposite.centerCardPane.editingComponet.elementCasePane.getGrid().getElementCasePane();
+            ElementCasePane reportPane = elementCasePane.getGrid().getElementCasePane();
             int column = reportPane.getSelection().getSelectedColumns()[0];
             double columnLength = reportPane.getSelection().getSelectedColumns().length;
             double columnExtent = reportPane.getGrid().getHorizontalExtent();
@@ -405,12 +408,12 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
             if (columnLength == 0||rowLength == 0){
                 return resolution;
             }
-            double time =(columnExtent/columnLength)<(rowExtent/rowLength) ? (columnExtent/columnLength) : (rowExtent/rowLength);
+            double time = (columnExtent/columnLength) < (rowExtent/rowLength) ? (columnExtent/columnLength) : (rowExtent/rowLength);
             if (reportPane.isHorizontalScrollBarVisible()) {
                 reportPane.getVerticalScrollBar().setValue(row);
                 reportPane.getHorizontalScrollBar().setValue(column);
             }
-            return (int) (time * reportComposite.centerCardPane.editingComponet.elementCasePane.getGrid().getResolution());
+            return (int) (time * elementCasePane.getGrid().getResolution());
         }else {
             return resolution;
         }
@@ -777,7 +780,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
     public PreviewProvider[] supportPreview() {
         Set<PreviewProvider> set = ExtraDesignClassManager.getInstance().getArray(PreviewProvider.MARK_STRING);
         return ArrayUtils.addAll(new PreviewProvider[]{
-                new PagePreview(), new WritePreview(), new ViewPreview()
+                new PagePreview(), new WritePreview(), new ViewPreview(), new WriteEnhancePreview()
         }, set.toArray(new PreviewProvider[set.size()]));
     }
 

designer/src/com/fr/design/mainframe/ReportComponent.java

@@ -27,13 +27,9 @@ import com.fr.design.selection.Selectedable;
  */
 public abstract class ReportComponent<T extends TemplateReport, E extends ElementCasePane, S extends SelectableElement> extends TargetComponent<T> implements Selectedable<S> {
 	protected E elementCasePane;
-//	protected P polyElementCasePane;
 	public E getEditingElementCasePane() {
 		return elementCasePane;
 	}
-//	public P getEditingPolyElementCasePane() {
-//		return polyElementCasePane;
-//	}
 	public ReportComponent(T t) {
 		super(t);
 	}

designer/src/com/fr/design/mainframe/ReportComponentCardPane.java

@@ -25,7 +25,7 @@ public class ReportComponentCardPane extends JComponent implements TargetModifie
 
     private CardLayout cl;
     private WorkSheetDesigner sheetDezi;
-    protected PolyDesigner polyDezi;
+    private PolyDesigner polyDezi;
 
     public ReportComponentCardPane() {
         this.setLayout(cl = new CardLayout());
@@ -37,6 +37,10 @@ public class ReportComponentCardPane extends JComponent implements TargetModifie
         }
     }
 
+    public PolyDesigner getPolyDezi(){
+        return this.polyDezi;
+    }
+
     protected void stopEditing() {
         if (editingComponet != null) {
             editingComponet.stopEditing();

designer/src/com/fr/design/mainframe/ReportComponentComposite.java

@@ -1,18 +1,5 @@
 package com.fr.design.mainframe;
 
-import java.awt.BorderLayout;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.util.ArrayList;
-
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JSplitPane;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
 import com.fr.base.FRContext;
 import com.fr.base.ScreenResolution;
 import com.fr.design.designer.EditingState;
@@ -26,6 +13,13 @@ import com.fr.grid.Grid;
 import com.fr.main.impl.WorkBook;
 import com.fr.report.report.TemplateReport;
 
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.*;
+import java.util.ArrayList;
+
 /**
  * 整个报表编辑区域 包括滚动条、中间的grid或者聚合块、下面的sheetTab
  *
@@ -51,12 +45,15 @@ public class ReportComponentComposite extends JComponent {
 
     private JSliderPane jSliderContainer;
 
+    private boolean isCtrl = false;
+
 
     /**
      * Constructor with workbook..
-     *
      */
     public ReportComponentComposite(JWorkBook jwb) {
+        setFocusable(true);
+        setFocusTraversalKeysEnabled(false);
         this.parent = jwb;
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.add(centerCardPane = new ReportComponentCardPane(), BorderLayout.CENTER);
@@ -67,15 +64,47 @@ public class ReportComponentComposite extends JComponent {
         this.add(createSouthControlPane(), BorderLayout.SOUTH);
         jSliderContainer.getShowVal().addChangeListener(showValSpinnerChangeListener);
         jSliderContainer.getSelfAdaptButton().addItemListener(selfAdaptButtonItemListener);
+        this.centerCardPane.editingComponet.elementCasePane.getGrid().addMouseWheelListener(showValSpinnerMouseWheelListener);
+        this.centerCardPane.editingComponet.elementCasePane.getGrid().addKeyListener(showValSpinnerKeyListener);
     }
 
+    KeyListener showValSpinnerKeyListener = new KeyListener() {
+        @Override
+        public void keyTyped(KeyEvent e) {
+
+        }
+
+        @Override
+        public void keyPressed(KeyEvent e) {
+            if (e.isControlDown()) {
+                isCtrl = true;
+            }
+        }
+
+        @Override
+        public void keyReleased(KeyEvent e) {
+            isCtrl = false;
+        }
+    };
+
+    MouseWheelListener showValSpinnerMouseWheelListener = new MouseWheelListener() {
+        @Override
+        public void mouseWheelMoved(MouseWheelEvent e) {
+            if (isCtrl) {
+                int dir = e.getWheelRotation();
+                int old_resolution = (int) jSliderContainer.getShowVal().getValue();
+                jSliderContainer.getShowVal().setValue(old_resolution - (dir * MIN));
+            }
+        }
+    };
+
     ChangeListener showValSpinnerChangeListener = new ChangeListener() {
         @Override
         public void stateChanged(ChangeEvent e) {
-            double value = (int) ((UIBasicSpinner)e.getSource()).getValue();
+            double value = (int) ((UIBasicSpinner) e.getSource()).getValue();
-            value = value>MAX ? MAX : value;
+            value = value > MAX ? MAX : value;
-            value = value<MIN ? MIN : value;
+            value = value < MIN ? MIN : value;
-            int resolution =  (int) (ScreenResolution.getScreenResolution()*value/HUND);
+            int resolution = (int) (ScreenResolution.getScreenResolution() * value / HUND);
             HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setScale(resolution);
         }
     };
@@ -83,9 +112,9 @@ public class ReportComponentComposite extends JComponent {
     ItemListener selfAdaptButtonItemListener = new ItemListener() {
         @Override
         public void itemStateChanged(ItemEvent e) {
-            if (jSliderContainer.getSelfAdaptButton().isSelected()){
+            if (jSliderContainer.getSelfAdaptButton().isSelected()) {
                 int resolution = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().selfAdaptUpdate();
-                jSliderContainer.getShowVal().setValue(resolution*HUND/ScreenResolution.getScreenResolution());
+                jSliderContainer.getShowVal().setValue(resolution * HUND / ScreenResolution.getScreenResolution());
             }
         }
     };
@@ -104,6 +133,7 @@ public class ReportComponentComposite extends JComponent {
             return;
         }
         centerCardPane.populate(workbook.getTemplateReport(newIndex));
+
         if (parentContainer != null) {
             parentContainer.setDownPane(ReportComponentComposite.this);
         }
@@ -134,7 +164,6 @@ public class ReportComponentComposite extends JComponent {
      * 移除选中状态
      *
      * @date 2015-2-5-上午11:41:44
-	 * 
      */
     public void removeSelection() {
         if (centerCardPane.editingComponet instanceof WorkSheetDesigner) {
@@ -153,6 +182,10 @@ public class ReportComponentComposite extends JComponent {
         return sheetNameTab.getSelectedIndex();
     }
 
+    public JSliderPane getjSliderContainer() {
+        return this.jSliderContainer;
+    }
+
 
     public void setParentContainer(UIModeControlContainer parentContainer) {
         this.parentContainer = parentContainer;
@@ -201,21 +234,11 @@ public class ReportComponentComposite extends JComponent {
         splitpane.setBorder(null);
         splitpane.setDividerSize(3);
         splitpane.setResizeWeight(1);
-        southPane.add(hbarContainer,BorderLayout.NORTH);
+        southPane.add(hbarContainer, BorderLayout.NORTH);
-        southPane.add(splitpane,BorderLayout.CENTER);
+        southPane.add(splitpane, BorderLayout.CENTER);
         return southPane;
     }
 
-    private JComponent createSouthControlPaneWithJSliderPane() {
-        hbarContainer = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        hbarContainer.add(centerCardPane.editingComponet.getHorizontalScrollBar());
-        JSplitPane splitWithJSliderPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, hbarContainer, JSliderPane.getInstance());
-        splitWithJSliderPane.setBorder(null);
-        splitWithJSliderPane.setDividerLocation(0.9);
-        splitWithJSliderPane.setDividerSize(3);
-        splitWithJSliderPane.setResizeWeight(1);
-        return splitWithJSliderPane;
-    }
 
     public void setSelectedIndex(int selectedIndex) {
         sheetNameTab.setSelectedIndex(selectedIndex);

designer/src/com/fr/design/mainframe/ReportHyperlinkGroupPane.java

@@ -46,11 +46,6 @@ public class ReportHyperlinkGroupPane extends HyperlinkGroupPane {
     }
 
     public void populate(ElementCasePane reportPane) {
-//        TemplateElementCase elementCase = ePane.getEditingElementCase();
-//        if (elementCase == null) {
-//            return;
-//        }
-//        ePane.getSelection().populatePropertyPane(ePane);
         final TemplateElementCase report = reportPane.getEditingElementCase();
         NameJavaScriptGroup nameHyperlinks = getNameJSGroup(reportPane, report);
         populate(nameHyperlinks);

designer/src/com/fr/design/mainframe/errorinfo/ErrorInfo.java

@@ -0,0 +1,130 @@
+package com.fr.design.mainframe.errorinfo;
+
+import com.fr.base.FRContext;
+import com.fr.general.IOUtils;
+import com.fr.json.JSONException;
+import com.fr.json.JSONObject;
+import com.fr.stable.EncodeConstants;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StableUtils;
+import com.fr.stable.core.UUID;
+
+import java.io.*;
+import java.text.DateFormat;
+import java.util.Date;
+
+/**
+ * Created by Administrator on 2017/7/24 0024.
+ */
+public class ErrorInfo {
+
+    private String username;
+    private String uuid;
+    private String activekey;
+    private String uploadtime;
+    private String templateid;
+    private String logid;
+    private String log;
+
+    public ErrorInfo(String username, String uuid, String activekey) {
+        this.username = username;
+        this.uuid = uuid;
+        this.activekey = activekey;
+        this.uploadtime = dateToString();
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getActivekey() {
+        return activekey;
+    }
+
+    public void setActivekey(String activekey) {
+        this.activekey = activekey;
+    }
+
+    public String getUploadtime() {
+        return uploadtime;
+    }
+
+    public void setUploadtime(String uploadtime) {
+        this.uploadtime = uploadtime;
+    }
+
+    public String getTemplateid() {
+        return templateid;
+    }
+
+    public void setTemplateid(String templateid) {
+        this.templateid = templateid;
+    }
+
+    public String getLogid() {
+        return logid;
+    }
+
+    public void setLogid(String logid) {
+        this.logid = logid;
+    }
+
+    public String getLog() {
+        return log;
+    }
+
+    public void setLog(String log) {
+        this.log = log;
+    }
+
+    private String dateToString(){
+        DateFormat df = FRContext.getDefaultValues().getDateTimeFormat();
+        return df.format(new Date());
+    }
+
+    /**
+     * 将出错对象存为json字符串, 并放到设计器缓存目录.
+     * 等下一次上传到云中心.
+     */
+    public void saveAsJSON(){
+        JSONObject jo = JSONObject.create();
+        try {
+            jo.put("username", username);
+            jo.put("uuid", uuid);
+            jo.put("activekey", activekey);
+            jo.put("templateid", templateid);
+            jo.put("uploadtime", uploadtime);
+            jo.put("logid", logid);
+            jo.put("log", log);
+        } catch (JSONException ignore) {
+        }
+
+        saveFileToCache(jo);
+    }
+
+    private void saveFileToCache(JSONObject jo) {
+        String content = jo.toString();
+        String fileName = UUID.randomUUID() + ErrorInfoUploader.SUFFIX;
+        File file = new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), ErrorInfoUploader.FOLDER_NAME, fileName));
+        try {
+            StableUtils.makesureFileExist(file);
+            FileOutputStream out = new FileOutputStream(file);
+            InputStream in = new ByteArrayInputStream(content.getBytes(EncodeConstants.ENCODING_UTF_8));
+            IOUtils.copyBinaryTo(in, out);
+            out.close();
+        } catch (IOException ignore) {
+        }
+    }
+}

designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java

@@ -0,0 +1,139 @@
+package com.fr.design.mainframe.errorinfo;
+
+import com.fr.base.FRContext;
+import com.fr.base.io.IOFile;
+import com.fr.base.io.XMLReadHelper;
+import com.fr.design.DesignerEnvManager;
+import com.fr.general.FRLogLevel;
+import com.fr.general.FRLogManager;
+import com.fr.general.LogDuration;
+import com.fr.stable.StringUtils;
+import com.fr.stable.project.ProjectConstants;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.web.core.SessionDealWith;
+import com.fr.web.core.SessionIDInfor;
+import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.Level;
+import org.apache.log4j.spi.LoggingEvent;
+
+import java.io.InputStream;
+
+/**
+ * 收集设计器报错信息的appender.
+ * <p>
+ * Created by Administrator on 2017/7/24 0024.
+ */
+public class ErrorInfoLogAppender extends AppenderSkeleton {
+
+    private static final int ERROR_LEN = 8;
+
+    // 缓存下不变的, 没必要频繁取.
+    private String username;
+    private String uuid;
+    private String activekey;
+
+    public ErrorInfoLogAppender() {
+        this.layout = new org.apache.log4j.PatternLayout("%d{HH:mm:ss} %t %p [%c] %m%n");
+
+        DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
+        this.username = envManager.getBBSName();
+        this.uuid = envManager.getUUID();
+        this.activekey = envManager.getActivationKey();
+    }
+
+    protected void append(LoggingEvent event) {
+        this.subAppend(event);
+    }
+
+    public boolean requiresLayout() {
+        return true;
+    }
+
+    public synchronized void close() {
+        if (this.closed) {
+            return;
+        }
+        this.closed = true;
+
+    }
+
+    public void subAppend(LoggingEvent event) {
+        Level level = event.getLevel();
+        // 只分析上传记录error以上的.
+        if (level.isGreaterOrEqual(FRLogLevel.ERROR)) {
+            String msg = this.layout.format(event);
+            // 这个id并不是一定会有的, 有就记录下, 说明是预览模板出的错.
+            String templateid = readTemplateID();
+            String logid = readLogID(msg);
+            ErrorInfo errorInfo = new ErrorInfo(username, uuid, activekey);
+            errorInfo.setTemplateid(templateid);
+            errorInfo.setLog(msg);
+            errorInfo.setLogid(logid);
+            errorInfo.saveAsJSON();
+        }
+    }
+
+    private String readLogID(String log) {
+        int dotIndex = log.lastIndexOf(":");
+        if (dotIndex != -1) {
+            int end = Math.min(dotIndex + ERROR_LEN, log.length());
+            String logid = log.substring(dotIndex + 1, end).trim();
+            try {
+                Long.parseLong(logid);
+                return logid;
+            } catch (Exception ignore) {
+
+            }
+        }
+
+        return StringUtils.EMPTY;
+    }
+
+    private String readTemplateID() {
+        LogDuration logDuration = FRLogManager.getSession();
+        if (logDuration == null) {
+            return StringUtils.EMPTY;
+        }
+
+        String sessionID = logDuration.getSessionID();
+        SessionIDInfor infor = SessionDealWith.getSessionIDInfor(sessionID);
+        if (infor == null) {
+            return StringUtils.EMPTY;
+        }
+
+        String bookPath = infor.getBookPath();
+        // 这个iofile只读一个templateid, 其他以后有需要再读.
+        IOFile file = new IOFile() {
+            @Override
+            public void readStream(InputStream in) throws Exception {
+                XMLableReader xmlReader = XMLReadHelper.createXMLableReader(in, XMLPrintWriter.XML_ENCODER);
+                xmlReader.readXMLObject(this);
+                xmlReader.close();
+                in.close();
+            }
+
+            @Override
+            public void readXML(XMLableReader reader) {
+                super.readXML(reader);
+                readDesign(reader);
+            }
+
+            @Override
+            protected String openTag() {
+                return StringUtils.EMPTY;
+            }
+
+            @Override
+            protected void mainContent(XMLPrintWriter writer) {
+            }
+        };
+        try {
+            file.readStream(FRContext.getCurrentEnv().readBean(bookPath, ProjectConstants.REPORTLETS_NAME));
+            return file.getTemplateID();
+        } catch (Exception ignore) {
+        }
+
+        return StringUtils.EMPTY;
+    }
+}

designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java

@@ -0,0 +1,98 @@
+package com.fr.design.mainframe.errorinfo;
+
+import com.fr.general.*;
+import com.fr.general.http.HttpClient;
+import com.fr.json.JSONObject;
+import com.fr.stable.CodeUtils;
+import com.fr.stable.EnvChangedListener;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StableUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.HashMap;
+
+/**
+ * Created by Administrator on 2017/7/24 0024.
+ */
+public class ErrorInfoUploader {
+
+    public static final String SUFFIX = ".json";
+    public static final String FOLDER_NAME = "errorInfo";
+
+    private static ErrorInfoUploader collector;
+
+    static {
+        GeneralContext.addEnvChangedListener(new EnvChangedListener() {
+            @Override
+            public void envChanged() {
+                FRLogger.getLogger().addLogAppender(new ErrorInfoLogAppender());
+            }
+        });
+    }
+
+    private ErrorInfoUploader() {
+        FRLogger.getLogger().addLogAppender(new ErrorInfoLogAppender());
+    }
+
+    public static ErrorInfoUploader getInstance() {
+        if (collector == null) {
+            collector = new ErrorInfoUploader();
+        }
+
+        return collector;
+    }
+
+    public void sendErrorInfo(){
+        //读取文件夹里的json, 加入上传队列中.
+        File folder = new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), FOLDER_NAME));
+        if (!folder.exists()) {
+            return;
+        }
+
+        File[] files = folder.listFiles();
+        try {
+            for (File file : files) {
+                String filePath = file.getPath();
+                String suffix = filePath.substring(filePath.lastIndexOf("."));
+
+                if (suffix.endsWith(SUFFIX)) {
+                    Thread.sleep(1000L);
+                    String content = IOUtils.inputStream2String(new FileInputStream(file));
+                    String url = SiteCenter.getInstance().acquireUrlByKind("design.error");
+                    if (sendErroInfo(url, content)) {
+                        file.delete();
+                    }
+                }
+            }
+        } catch (Exception ignore) {
+
+        }
+    }
+
+    private boolean sendErroInfo(String url, String content) {
+        HashMap<String, String> para = new HashMap<>();
+        String date = new SimpleDateFormat("yyyy-MM-dd").format(Calendar.getInstance().getTime());
+        para.put("token", CodeUtils.md5Encode(date, "", "MD5"));
+        para.put("content", content);
+        HttpClient httpClient = new HttpClient(url, para, true);
+        httpClient.asGet();
+
+        if (!httpClient.isServerAlive()) {
+            return false;
+        }
+
+        String res =  httpClient.getResponseText();
+        boolean success;
+        try {
+            success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success");
+        } catch (Exception ex) {
+            success = false;
+        }
+        return success;
+    }
+
+
+}

designer/src/com/fr/design/mainframe/form/FormReportComponentComposite.java

@@ -1,26 +1,27 @@
 package com.fr.design.mainframe.form;
 
+import com.fr.base.DynamicUnitList;
 import com.fr.base.ScreenResolution;
+import com.fr.design.cell.bar.DynamicScrollBar;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.BaseJForm;
+import com.fr.design.mainframe.*;
-import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.JForm;
-import com.fr.design.mainframe.JSliderPane;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
 import com.fr.form.FormElementCaseContainerProvider;
 import com.fr.form.FormElementCaseProvider;
+import com.fr.grid.Grid;
+import com.fr.grid.GridUtils;
+import com.fr.report.ReportHelper;
 import com.fr.report.worksheet.FormElementCase;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
-import java.awt.event.ItemEvent;
+import java.awt.event.*;
-import java.awt.event.ItemListener;
 
 /**
  * 整个FormElementCase编辑区域 包括滚动条、中间的grid或者聚合块、下面的sheetTab
@@ -36,7 +37,7 @@ public class FormReportComponentComposite extends JComponent implements TargetMo
     private FormTabPane sheetNameTab;
     private JPanel hbarContainer;
     private JSliderPane jSliderContainer;
-
+    private boolean isCtrl = false;
 
     public FormReportComponentComposite(BaseJForm jform, FormElementCaseDesigner elementCaseDesign, FormElementCaseContainerProvider ecContainer) {
         this.jForm = jform;
@@ -47,18 +48,51 @@ public class FormReportComponentComposite extends JComponent implements TargetMo
         this.add(createSouthControlPane(), BorderLayout.SOUTH);
         jSliderContainer.getShowVal().addChangeListener(showValSpinnerChangeListener);
         jSliderContainer.getSelfAdaptButton().addItemListener(selfAdaptButtonItemListener);
+        ((JForm)this.jForm).getFormDesign().getArea().addMouseWheelListener(showValSpinnerMouseWheelListener);
+        ((JForm)this.jForm).getFormDesign().getArea().addKeyListener(showValSpinnerKeyListener);
+        this.elementCaseDesigner.elementCasePane.getGrid().addMouseWheelListener(showValSpinnerMouseWheelListener);
+        this.elementCaseDesigner.elementCasePane.getGrid().addKeyListener(showValSpinnerKeyListener);
         elementCaseDesigner.addTargetModifiedListener(this);
     }
 
+    KeyListener showValSpinnerKeyListener = new KeyListener() {
+        @Override
+        public void keyTyped(KeyEvent e) {
+
+        }
+        @Override
+        public void keyPressed(KeyEvent e) {
+            if( e.isControlDown()){
+                isCtrl = true ;
+            }
+        }
+        @Override
+        public void keyReleased(KeyEvent e) {
+            isCtrl = false ;
+        }
+    };
+
+    MouseWheelListener showValSpinnerMouseWheelListener = new MouseWheelListener() {
+        @Override
+        public void mouseWheelMoved(MouseWheelEvent e) {
+            if (isCtrl){
+                int dir = e.getWheelRotation();
+                int old_resolution = (int) jSliderContainer.getShowVal().getValue();
+                jSliderContainer.getShowVal().setValue(old_resolution - (dir * MIN));
+            }
+        }
+    };
+
+
     ChangeListener showValSpinnerChangeListener = new ChangeListener() {
         @Override
         public void stateChanged(ChangeEvent e) {
             double value = (int) ((UIBasicSpinner)e.getSource()).getValue();
-            value = value>MAX ? MAX : value;
+            value = value > MAX ? MAX : value;
-            value = value<MIN ? MIN : value;
+            value = value < MIN ? MIN : value;
             int resolution = (int) (ScreenResolution.getScreenResolution()*value/HUND);
-            JForm jf = (JForm) HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+            setScale(resolution);
-            HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setScale(resolution);
+//            HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setScale(resolution);
         }
     };
 
@@ -66,7 +100,7 @@ public class FormReportComponentComposite extends JComponent implements TargetMo
         @Override
         public void itemStateChanged(ItemEvent e) {
             if (jSliderContainer.getSelfAdaptButton().isSelected()){
-                int resolution = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().selfAdaptUpdate();
+                int resolution = selfAdaptUpdate();
                 jSliderContainer.getShowVal().setValue(resolution*HUND/ScreenResolution.getScreenResolution());
             }
         }
@@ -74,6 +108,52 @@ public class FormReportComponentComposite extends JComponent implements TargetMo
 
     private java.util.List<TargetModifiedListener> targetModifiedList = new java.util.ArrayList<TargetModifiedListener>();
 
+    private void setScale(int resolution){
+        JForm jForm = (JForm) HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+        ElementCasePane elementCasePane = ((FormReportComponentComposite)jForm.getReportComposite()).elementCaseDesigner.getEditingElementCasePane();
+        elementCasePane.setResolution(resolution);
+        elementCasePane.getGrid().getGridMouseAdapter().setResolution(resolution);
+        elementCasePane.getGrid().setResolution(resolution);
+        //更新Grid
+        Grid grid = elementCasePane.getGrid();
+        DynamicUnitList rowHeightList = ReportHelper.getRowHeightList(elementCasePane.getEditingElementCase());
+        DynamicUnitList columnWidthList = ReportHelper.getColumnWidthList(elementCasePane.getEditingElementCase());
+        grid.setVerticalExtent(GridUtils.getExtentValue(0, rowHeightList, grid.getHeight(), resolution));
+        grid.setHorizontalExtent(GridUtils.getExtentValue(0, columnWidthList, grid.getWidth(), resolution));
+        elementCasePane.getGrid().updateUI();
+        //更新Column和Row
+        ((DynamicScrollBar)elementCasePane.getVerticalScrollBar()).setDpi(resolution);
+        ((DynamicScrollBar)elementCasePane.getHorizontalScrollBar()).setDpi(resolution);
+        elementCasePane.getGridColumn().setResolution(resolution);
+        elementCasePane.getGridColumn().updateUI();
+        elementCasePane.getGridRow().setResolution(resolution);
+        elementCasePane.getGridRow().updateUI();
+    }
+
+    private int selfAdaptUpdate(){
+        JForm jForm = (JForm) HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+        if (jForm.resolution == 0){
+            jForm.resolution = ScreenResolution.getScreenResolution();
+        }
+        ElementCasePane elementCasePane = ((FormReportComponentComposite)jForm.getReportComposite()).elementCaseDesigner.getEditingElementCasePane();
+        ElementCasePane reportPane = elementCasePane.getGrid().getElementCasePane();
+        int column = reportPane.getSelection().getSelectedColumns()[0];
+        double columnLength = reportPane.getSelection().getSelectedColumns().length;
+        double columnExtent = reportPane.getGrid().getHorizontalExtent();
+        int row = reportPane.getSelection().getSelectedRows()[0];
+        double rowLength = reportPane.getSelection().getSelectedRows().length;
+        double rowExtent = reportPane.getGrid().getVerticalExtent();
+        if (columnLength == 0||rowLength == 0){
+            return jForm.resolution;
+        }
+        double time =(columnExtent/columnLength)<(rowExtent/rowLength) ? (columnExtent/columnLength) : (rowExtent/rowLength);
+        if (reportPane.isHorizontalScrollBarVisible()) {
+            reportPane.getVerticalScrollBar().setValue(row);
+            reportPane.getHorizontalScrollBar().setValue(column);
+        }
+        return (int) (time * elementCasePane.getGrid().getResolution());
+    }
+
     /**
      *  添加目标改变的监听
      * @param targetModifiedListener     目标改变事件

designer/src/com/fr/design/present/BarCodePane.java

@@ -69,16 +69,6 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
         addlistener();
     }
 
-    public static void main(String[] args){
-        JFrame jf = new JFrame("test");
-        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        JPanel content = (JPanel)jf.getContentPane();
-        content.setLayout(new BorderLayout());
-        content.add(new BarCodePane(),BorderLayout.CENTER);
-        GUICoreUtils.centerWindow(jf);
-        jf.setSize(270, 400);
-        jf.setVisible(true);
-    }
 
     private void initComponents() {
         barCodePreviewPane = new BarCodePreviewPane();

designer/src/com/fr/poly/PolyDesignUI.java

@@ -47,8 +47,6 @@ public class PolyDesignUI extends ComponentUI {
     
     private static final double SCROLL_POINT = 50;
     private static final int SCROLL_DISTANCE = 15;
-    private static final int CREATORWIDTH = 30;
-    private static final int CREATORGEIGHT = 19;
     private static final int TEN = 10;
     private static final int HHUNDRED = 100;
     private PolyDesigner designer;
@@ -111,15 +109,8 @@ public class PolyDesignUI extends ComponentUI {
             BlockCreator creator = addedData.getAddedAt(i);
             // richer:如果当前这个组件正在编辑，那么他是完全被他的编辑器所遮挡的，不需要画出来
 			if (creator == designer.getSelection()) {
-			    if (creator instanceof ECBlockCreator){
+                paintPositionLine(g, creator.getX(time), creator.getY(time),
-			        int x = (int) ((creator.getX()-CREATORWIDTH)*time)+CREATORWIDTH;
+                        (int) (designer.getHorizontalValue()*time), (int) (designer.getVerticalValue()*time));
-			        int y = (int) ((creator.getY()-CREATORGEIGHT)*time)+CREATORGEIGHT;
-                    paintPositionLine(g, x, y, (int) (designer.getHorizontalValue()*time), (int) (designer.getVerticalValue()*time));
-                }else {
-                    int x = (int) (creator.getX()*time);
-                    int y = (int) (creator.getY()*time);
-                    paintPositionLine(g, x, y, (int) (designer.getHorizontalValue()*time), (int) (designer.getVerticalValue()*time));
-                }
                 if (creator.getEditor().isDragging()) {
                     creator.getEditor().paintAbsorptionline(g);
                     //如果与其他块重合了, 需要画出提示禁止重叠

designer/src/com/fr/poly/PolyDesigner.java

@@ -3,21 +3,6 @@
  */
 package com.fr.poly;
 
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseEvent;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.InputMap;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JScrollBar;
-import javax.swing.KeyStroke;
-
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
 import com.fr.base.GraphHelper;
@@ -48,11 +33,7 @@ import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.grid.selection.Selection;
 import com.fr.poly.actions.DeleteBlockAction;
-import com.fr.poly.creator.BlockCreator;
+import com.fr.poly.creator.*;
-import com.fr.poly.creator.BlockEditor;
-import com.fr.poly.creator.ECBlockCreator;
-import com.fr.poly.creator.ECBlockEditor;
-import com.fr.poly.creator.PolyElementCasePane;
 import com.fr.poly.hanlder.DataEditingListener;
 import com.fr.poly.hanlder.PolyDesignerDropTarget;
 import com.fr.poly.model.AddedData;
@@ -62,13 +43,21 @@ import com.fr.report.block.Block;
 import com.fr.report.poly.PolyWorkSheet;
 import com.fr.report.poly.TemplateBlock;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.StringUtils;
 import com.fr.stable.unit.FU;
 import com.fr.stable.unit.OLDPIX;
 import com.fr.stable.unit.UNIT;
 import com.fr.stable.unit.UnitRectangle;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author richer
  * @since 6.5.3 聚合报表的设计块，不包括底部和右边的滚动条以及左边和上边的像素标识条
@@ -86,6 +75,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
     public static enum SelectionType {
         NONE, INNER, BLOCK
     }
+
     public JComponent polyArea;
     private SelectionType selectedtype = SelectionType.NONE;
     private AddingData addingData;
@@ -98,18 +88,22 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
     private transient ArrayList<TemplateBlock> clip_board = new ArrayList<TemplateBlock>();
     // richer:鼠标滚轮每滚动一下，PolyDesignPane的尺寸就改变ROTATIONS这么多
     private static final int ROTATIONS = 50;
+    private static final int MIN = 10;
     private JScrollBar verScrollBar;
     private JScrollBar horScrollBar;
 
     private PolyComponetsBar polyComponetsBar = new PolyComponetsBar();
     private JComponent[] toolBarComponent = null;
-
+    private JPanel ployareaPane;
-    private int resolution = (int) (ScreenResolution.getScreenResolution()* JSliderPane.getInstance().resolutionTimes);
+    private JSliderPane jSliderContainer;
+    private int resolution = (int) (ScreenResolution.getScreenResolution() * JSliderPane.getInstance().resolutionTimes);
     private float time;
+    private boolean isCtrl = false;
 
     public PolyDesigner(PolyWorkSheet report) {
         super(report);
         setDoubleBuffered(true);
+
         // 为了处理键盘事件，需要FormDesigner能够获取焦点
         setFocusable(true);
         setFocusTraversalKeysEnabled(false);
@@ -119,11 +113,13 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
         enableEvents(AWTEvent.KEY_EVENT_MASK | AWTEvent.MOUSE_EVENT_MASK | AWTEvent.MOUSE_MOTION_EVENT_MASK | AWTEvent.MOUSE_WHEEL_EVENT_MASK);
 
         setOpaque(true);
+
         initComponents();
 
         this.initDataListeners();
         this.initPolyBlocks();
 
+
         this.setFocusTraversalKeysEnabled(false);
         new PolyDesignerDropTarget(this);
         toolBarComponent = new JComponent[]{new CutAction(this).createToolBarComponent(), new CopyAction(this).createToolBarComponent(), new PasteAction(this).createToolBarComponent(), new DeleteBlockAction(this).createToolBarComponent()};
@@ -143,8 +139,9 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
     }
 
     private void initComponents() {
+        jSliderContainer = ((JWorkBook) HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()).reportComposite.getjSliderContainer();
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        JPanel ployareaPane = new JPanel(new PolyDesignerLayout());
+        ployareaPane = new JPanel(new PolyDesignerLayout());
         polyArea = new PolyArea(this, resolution);
         ployareaPane.add(PolyDesignerLayout.Center, polyArea);
 
@@ -157,8 +154,28 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
         ployareaPane.add(PolyDesignerLayout.HRuler, new HorizontalRuler(this));
         this.add(ployareaPane, BorderLayout.CENTER);
         this.add(polyComponetsBar, BorderLayout.WEST);
+        this.addKeyListener(showValSpinnerKeyListener);
+    }
+
+    KeyListener showValSpinnerKeyListener = new KeyListener() {
+        @Override
+        public void keyTyped(KeyEvent e) {
+
         }
 
+        @Override
+        public void keyPressed(KeyEvent e) {
+            if (e.isControlDown()) {
+                isCtrl = true;
+            }
+        }
+
+        @Override
+        public void keyReleased(KeyEvent e) {
+            isCtrl = false;
+        }
+    };
+
     private void initPolyBlocks() {
         for (int i = 0, count = this.getTarget().getBlockCount(); i < count; i++) {
             TemplateBlock block = (TemplateBlock) getTarget().getBlock(i);
@@ -177,14 +194,15 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
         return this.resolution;
     }
 
-    public void updateUI(){
+    public void updateUI() {
-        ((PolyArea)this.polyArea).setResolution(resolution);
+        ((PolyArea) this.polyArea).setResolution(resolution);
         polyArea.repaint();
 //        this.polyArea = (JComponent) new PolyArea(this, resolution);
     }
 
     /**
      * 是否含有聚和报表块
+     *
      * @param targetComponent 目标组件
      * @return 是则返回true
      */
@@ -219,8 +237,13 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
 
     }
 
+    public JPanel getPloyAreaPane() {
+        return this.ployareaPane;
+    }
+
     /**
      * 增加组件
+     *
      * @param currentEditor 组件
      */
     public void addEditor(BlockEditor currentEditor) {
@@ -229,6 +252,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
 
     /**
      * 移除组件
+     *
      * @param currentEditor 组件
      */
     public void removeEditor(BlockEditor currentEditor) {
@@ -237,6 +261,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
 
     /**
      * 权限编辑状态
+     *
      * @return 权限编辑面板
      */
     public AuthorityEditPane createAuthorityEditPane() {
@@ -252,7 +277,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
     @Override
     public void paintComponent(Graphics g) {
 
-        this.time = (float)resolution/ScreenResolution.getScreenResolution();
+        this.time = (float) resolution / ScreenResolution.getScreenResolution();
         resetEditorComponentBounds();
         LayoutUtils.layoutRootContainer(this);
         g.setColor(Color.black);
@@ -264,14 +289,15 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
     private void resetEditorComponentBounds() {
         if (selection != null) {
             selection.setResolution(this.resolution);
-            selection.getEditor().setBounds((int) (selection.getEditorBounds().x*time), (int) (selection.getEditorBounds().y*time),
+            selection.getEditor().setBounds((int) (selection.getEditorBounds().x * time), (int) (selection.getEditorBounds().y * time),
-                    (int) (selection.getEditorBounds().width*time), (int) (selection.getEditorBounds().height*time));
+                    (int) (selection.getEditorBounds().width * time), (int) (selection.getEditorBounds().height * time));
             LayoutUtils.layoutRootContainer(this);
         }
     }
 
     /**
      * 增加组件
+     *
      * @param creator 组件
      */
     public void addBlockCreator(BlockCreator creator) {
@@ -358,6 +384,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
 
     /**
      * 选中的是否是报表块
+     *
      * @return 是则返回true
      */
     public boolean isSelectedECBolck() {
@@ -382,7 +409,6 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
     }
 
 
-
     /**
      * @return
      */
@@ -433,6 +459,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
 
     /**
      * 黏贴
+     *
      * @return 黏贴成功返回true
      */
     public boolean paste() {
@@ -492,6 +519,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
 
     /**
      * 删除
+     *
      * @return 删除成功返回true
      */
     public boolean delete() {
@@ -531,6 +559,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
 
     /**
      * 剪切
+     *
      * @return 剪切成功返回true
      */
     public boolean cut() {
@@ -541,6 +570,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
 
     /**
      * 移动
+     *
      * @param x 横坐标
      * @param y 纵坐标
      */
@@ -644,8 +674,14 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
         int id = evt.getID();
         switch (id) {
             case MouseEvent.MOUSE_WHEEL: {
+                if (isCtrl) {
+                    int dir = evt.getWheelRotation();
+                    int old_resolution = (int) jSliderContainer.getShowVal().getValue();
+                    jSliderContainer.getShowVal().setValue(old_resolution - (dir * MIN));
+                } else {
                     int rotations = evt.getWheelRotation();
                     this.getVerticalScrollBar().setValue(this.getVerticalScrollBar().getValue() + rotations * ROTATIONS);
+                }
                 break;
             }
         }
@@ -653,6 +689,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
 
     /**
      * 开始编辑
+     *
      * @param blockName 聚合块名称
      */
     public void startEditing(String blockName) {
@@ -843,7 +880,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
         if (!ComparatorUtils.equals(selectedtype, type) || type == SelectionType.NONE) {
             selectedtype = type;
             JTemplate<?, ?> jt = DesignerContext.getDesignerFrame().getSelectedJTemplate();
-            if(jt != null){
+            if (jt != null) {
                 jt.setComposite();
             }
             DesignerContext.getDesignerFrame().resetToolkitByPlus(DesignerContext.getDesignerFrame().getSelectedJTemplate());
@@ -885,6 +922,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
 
     /**
      * 是否选中聚合块本身
+     *
      * @return 是则返回true
      */
     public boolean isChooseBlock() {
@@ -933,6 +971,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
 
     /**
      * 计算滚动条的值和max
+     *
      * @param oldmax      之前最大值
      * @param max         当前最大值
      * @param newValue    当前value
@@ -949,9 +988,8 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
      * 获取当前聚合报表区域左上角x坐标
      *
      * @return 当前聚合报表区域左上角x坐标
-	 * 
      */
-	public double getAreaLocationX(){
+    public double getAreaLocationX() {
         return polyArea.getLocationOnScreen().getX();
     }
 
@@ -959,9 +997,8 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
      * 获取当前聚合报表区域左上角y坐标
      *
      * @return 当前聚合报表区域左上角y坐标
-	 * 
      */
-	public double getAreaLocationY(){
+    public double getAreaLocationY() {
         return polyArea.getLocationOnScreen().getY();
     }
 
@@ -969,11 +1006,9 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
      * 检测指定块是否与其他的块有重叠区域
      *
      * @param creator 指定的块编辑器
-	 * 
      * @return 是否与其他的块有重叠区域
-	 * 
      */
-	public boolean intersectsAllBlock(BlockCreator creator){
+    public boolean intersectsAllBlock(BlockCreator creator) {
         return intersectsAllBlock(creator.getValue());
     }
 
@@ -981,11 +1016,9 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
      * 检测指定块是否与其他的块有重叠区域
      *
      * @param block 指定的块
-	 * 
      * @return 是否与其他的块有重叠区域
-	 * 
      */
-	public boolean intersectsAllBlock(TemplateBlock block){
+    public boolean intersectsAllBlock(TemplateBlock block) {
         UnitRectangle rec = block.getBounds();
         String blockName = block.getBlockName();
         return intersectsAllBlock(rec, blockName);
@@ -996,22 +1029,20 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
      *
      * @param rec       指定的块区域
      * @param blockName 指定的块名称
-	 * 
      * @return 是否与其他的块有重叠区域
-	 * 
      */
-	public boolean intersectsAllBlock(UnitRectangle rec, String blockName){
+    public boolean intersectsAllBlock(UnitRectangle rec, String blockName) {
         PolyWorkSheet worksheet = this.getTarget();
         int count = worksheet.getBlockCount();
         for (int i = 0; i < count; i++) {
             Block temp_block = worksheet.getBlock(i);
             UnitRectangle temp_rect = temp_block.getBounds();
 
-			if(ComparatorUtils.equals(blockName, temp_block.getBlockName())){
+            if (ComparatorUtils.equals(blockName, temp_block.getBlockName())) {
                 continue;
             }
 
-			if(temp_rect.intersects(rec)){
+            if (temp_rect.intersects(rec)) {
                 return true;
             }
         }

designer/src/com/fr/poly/creator/BlockCreator.java

@@ -89,6 +89,11 @@ public abstract class BlockCreator<T extends TemplateBlock> extends JComponent i
 
 	public abstract BlockEditor getEditor();
 
+	public abstract int getX(float time);
+
+	public abstract int getY(float time);
+
+
 
 	/**
 	 * 检测按钮状态

designer/src/com/fr/poly/creator/ChartBlockCreator.java

@@ -71,6 +71,15 @@ public class ChartBlockCreator extends BlockCreator<PolyChartBlock> {
 		return editor;
 	}
 
+	@Override
+	public int getX(float time) {
+		return (int) (this.getX() * time);
+	}
+
+	@Override
+	public int getY(float time) {
+		return (int) (this.getY() * time);
+	}
 
 
 	/**

designer/src/com/fr/poly/creator/ECBlockCreator.java

@@ -23,6 +23,9 @@ import com.fr.stable.unit.UnitRectangle;
  */
 public class ECBlockCreator extends BlockCreator<PolyECBlock> {
 	private ECBlockEditor editor;
+	private static final int CREATOR_WIDTH = 30;
+	private static final int CREATOR_HEIGHT = 19;
+
 
 	public ECBlockCreator() {
 
@@ -64,6 +67,16 @@ public class ECBlockCreator extends BlockCreator<PolyECBlock> {
 		return editor;
 	}
 
+	@Override
+	public int getX(float time) {
+		return (int) ((this.getX() - CREATOR_WIDTH) * time) + CREATOR_WIDTH;
+	}
+
+	@Override
+	public int getY(float time) {
+		return (int) ((this.getY() - CREATOR_HEIGHT) * time) + CREATOR_HEIGHT;
+	}
+
 	/**
 	 * 检测按钮状态
 	 * 

designer_base/src/com/fr/design/locale/designer.properties

@@ -2005,6 +2005,24 @@ FR-Designer_AlphaFine_NoResult=no results
 FR-Designer_ConnectionFailed=connection failed
 FR-Designer_NoResult=No results
 FR-Designer-AlphaFine_SetShortcuts=
+FR-Designer_Write_Enhance_Preview=Write Enhance PreviewFR-Designer_Double=Double
+FR-Designer_Query=
+FR-Designer_Font=Font
+FR-Designer_Confirm=
+FR-Designer_Parameter=
+FR-Designer-Plugin_Plugin=Plugin
+FR-Designer_Background=Background
+Template=Template
+
+FR-Designer_Parent_Marked_Field=Parent Marked Field
+FR-Designer_Original_Marked_Filed=Original Marked Filed
+FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according parent's marked filed
+FR-Designer_Build_Tree_Accord_Marked_Filed_Length=Build Tree according marked filed's length
+FR-Product_Demo=Demo
+FR-Designer_Tree_Data_Field=Tree Data Field
+FR-Designer_Data_Filter=Data Filter
+Default=Default
+FR-Base-Load_Resource_File=Load resource file
 FR-Designer_Cell_Element=Cell Element
 FR-Designer_Cell_Attributes=Cell Attributes
 FR-Designer_Float_Element=Float Element

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -2005,6 +2005,25 @@ FR-Designer_AlphaFine_EnableAlphaFine=Enable AlphaFine
 FR-Designer_AlphaFine_EnableInternet=Internet
 FR-Designer_NoResult=No results
 FR-Designer-AlphaFine_SetShortcuts=please press two key to set shortcut
+FR-Designer_Write_Enhance_Preview=Write Enhance PreviewFR-Designer_Double=Decimal
+FR-Designer_Query=Query
+FR-Designer_Font=Font
+FR-Designer_Confirm=OK
+FR-Designer_Parameter=Parameter
+FR-Designer-Plugin_Plugin=Plugin
+FR-Designer_Background=BG
+Template=Template
+
+FR-Designer_Original_Marked_Filed=Original Tag Field
+FR-Designer_Build_Tree_Accord_Marked_Filed_Length=Build tree according to tag field's length
+FR-Designer_Can_not_use_FormatBursh=Can't use format painter in multiple selections
+FR-Designer_Tree_Data_Field=Tree Data Field
+FR-Designer_Parent_Marked_Field=Parent Tag Field
+FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according to the parent tag field of the selected data set
+FR-Product_Demo=Demo
+FR-Designer_Data_Filter=Data Filter
+Default=Default
+FR-Base-Load_Resource_File=Load Configuration File
 FR-Designer_Cell_Element=Cell Element
 FR-Designer_Cell_Attributes=Cell Attributes
 FR-Designer_Float_Element=Float Element

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -641,8 +641,8 @@ FR-Server_Embedded_Server_Stop=\u5185\u8535\u30B5\u30FC\u30D0\u30FC-\u4E00\u6642
 FR-Designer-Plugin_Detecting_Update=\u66F4\u65B0\u3092\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u3044\u307E\u3059
 HF-Whether_to_define_the_selected_type=\u9078\u629E\u3055\u308C\u305F\u30BF\u30A4\u30D7\u3092\u5B9A\u7FA9\u3057\u307E\u3059\u304B
 StyleAlignment-Right=\u53F3\u8A70\u3081
-FR-Designer_Alignment-Style=\u30A2\u30E9\u30A4\u30F3\u30E1\u30F3\u30C8
+FR-Designer_Alignment-Style=\u63C3\u3048\u65B9\u6CD5
-PageSetup-Title_Start_Column=\u91CD\u8907\u3059\u308B\u6A19\u984C\u5217
+PageSetup-Title_Start_Column=\u91CD\u8907\u30D8\u30C3\u30C0\u30FC\u5217
 Tree-Mutiple_Selection_Or_Not=\u8907\u6570\u9078\u629E
 FR-Designer-Plugin_Search=\u691C\u7D22
 Choose_Role=\u6A29\u9650\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB
@@ -777,13 +777,13 @@ Cannot-Add_To_This_Area=\u5730\u57DF\u306B\u306F\u8FFD\u52A0\u3067\u304D\u307E\u
 Run=\u904B\u884C
 Set_Submit_Condition=\u6761\u4EF6\u3092\u8A2D\u7F6E\u306B\u63D0\u51FA\u3059\u308B\u3053\u3068\u306B\u3057\u305F
 FR-Base_Value=\u5024
-fileLocked_undeleted=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u304C\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u308B\u3001\u3042\u306A\u305F\u304C\u524A\u9664\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\uFF01
+fileLocked_undeleted=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u304C\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002OK\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3001\u30EA\u30B9\u30C8\u3092\u518D\u8AAD\u307F\u8FBC\u307F\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-Web_Apply=WEB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3
+Web_Apply=WEB\u30A2\u30D7\u30EA
-Refresh_Database=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u5237\u65B0
+Refresh_Database=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u66F4\u65B0
-Set_Row_Title_End=\u91CD\u8907\u3059\u308B\u7D42\u4E86\u884C\u3092\u8A2D\u5B9A
+Set_Row_Title_End=\u91CD\u8907\u30D5\u30C3\u30BF\u30FC\u884C\u8A2D\u5B9A
-FR-Utils-New_Folder=\u30D5\u30A1\u30A4\u30EB\u65B0\u898F\u4F5C\u6210
+FR-Utils-New_Folder=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u30FC\u306E\u4F5C\u6210
-BiasD-From-upper_left_to_lower_right=\u5DE6\u4E0A\u5074\u304B\u3089\u53F3\u4E0B\u5074\u3078\u5E83\u304C\u308B
+BiasD-From-upper_left_to_lower_right=\u5DE6\u4E0A\u5074\u304B\u3089\u53F3\u4E0B\u5074\u3078\u5E83\u3052\u308B
-CapsLock=Caps Lock\u30AD\u30FC\u304C\u30AA\u30F3\u306B\u306A\u3063\u3066\u3044\u308B
+CapsLock=Caps Lock\u304C\u30AA\u30F3\u306B\u306A\u3063\u3066\u3044\u308B
 StyleFormat-Sample=\u4F8B
 RWA-Smart_Add_Cell_Group=\u30A4\u30F3\u30C6\u30EA\u30B8\u30A7\u30F3\u30C8\u6DFB\u52A0\u30EC\u30A4\u30E4\u30FC\u7D44
 MConfig-CancelButton=\u30AD\u30E3\u30F3\u30BB\u30EB
@@ -794,7 +794,7 @@ BackgroundTexture-GreenMarble=\u7DD1\u8272\u306E\u5927\u7406\u77F3
 read_time_out=\u30ED\u30FC\u30C9\u306E\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8
 JavaScript-Commit_to_Database=\u5165\u5EAB\u63D0\u51FA
 DS-Relation_TableData=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u95A2\u9023\u4ED8\u3051
-CellWrite-Page_Before_Row=\u884C\u524D\u306E\u6539\u9801
+CellWrite-Page_Before_Row=\u884C\u524D\u306E\u6539\u30DA\u30FC\u30B8
 FR-Designer-Plugin_Load_Plugins_From_Server=\u30D7\u30E9\u30B0\u30A4\u30F3\u30DE\u30FC\u30B1\u30C3\u30C8\u304B\u3089\u30C7\u30FC\u30BF\u53D6\u5F97\u4E2D
 D-Dispaly_Divide_Result_Set_into_Groups=resultset\u306E\u30B0\u30EB\u30FC\u30D7\u5206\u3051
 Closed=\u9589\u9396\u6E08\u307F
@@ -886,7 +886,7 @@ Device=\u8A2D\u5099
 M_Insert-Cell=\u30BB\u30EB\u8981\u7D20
 Present-Formula_Present=\u516C\u5F0F\u30D5\u30A9\u30EB\u30E0
 FRFont-Superscript=\u4E0A\u4ED8\u304D
-CellWrite-Page_Before_Column=\u5217\u524D\u306E\u6539\u9801
+CellWrite-Page_Before_Column=\u5217\u524D\u306E\u6539\u30DA\u30FC\u30B8
 Golden=\u30B4\u30FC\u30EB\u30C7\u30F3
 Preference-Support_Cell_Editor_Definition=\u30BB\u30EB\u30A8\u30C7\u30A3\u30BF\u30FC\u3092\u30B5\u30DD\u30FC\u30C8\u3059\u308B
 M-Page_Preview=\u30DA\u30FC\u30B8\u5225\u30D7\u30EC\u30D3\u30E5\u30FC
@@ -997,8 +997,8 @@ Hyperlink-Web_link=\u30A6\u30A7\u30D6\u30EA\u30F3\u30AF
 StyleAlignment-between_-90_and_90=-90\u304B\u308990\u307E\u3067\u306E\u7BC4\u56F2\u3067
 FormulaD-Custom_Function=\u30E6\u30FC\u30B6\u5B9A\u7FA9\u95A2\u6570
 FR-Designer_Integer=\u6574\u6570
-PageSetup-Finis_Start_Row=\u91CD\u8907\u3059\u308B\u7D42\u4E86\u884C
+PageSetup-Finis_Start_Row=\u91CD\u8907\u30D5\u30C3\u30BF\u30FC\u884C
-RWA-Remove_Field=\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u30EA\u30E0\u30FC\u30D6
+RWA-Remove_Field=\u30D5\u30A3\u30FC\u30EB\u30C9\u524A\u9664
 Form-Desin_Width=\u30C7\u30B6\u30A4\u30F3\u5E45
 No-tableData=\u623B\u3057\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u304C\u3042\u308A\u307E\u305B\u3093
 Page_Total=\u5408\u8A08
@@ -1317,20 +1317,20 @@ FR-Base_Table=\u8868
 Des-Remove_WorkSheet=\u9078\u629E\u3059\u308B\u5E33\u7968\u306B\u306F\u30C7\u30FC\u30BF\u304C\u3042\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u304C\u3001\u5B8C\u5168\u306B\u524A\u9664\u3059\u308B\u5834\u5408\u3001
 Rotation=\u56DE\u8EE2
 Undefined=\u672A\u5B9A\u7FA9
-Support-Auto_Complete_Shortcut=\u81EA\u52D5\u3067\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30FC\u3092\u88DC\u3046
+Support-Auto_Complete_Shortcut=\u81EA\u52D5\u88DC\u5B8C\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30FC
-Set_Column_Title_End=\u91CD\u8907\u3059\u308B\u7D42\u4E86\u5217\u3092\u8A2D\u5B9A
+Set_Column_Title_End=\u91CD\u8907\u30D5\u30C3\u30BF\u30FC\u5217\u8A2D\u5B9A
-Submit_Url=\u30A2\u30C9\u30EC\u30B9\u63D0\u51FA
+Submit_Url=\u66F8\u304D\u8FBC\u307F\u30A2\u30C9\u30EC\u30B9
-ReportServerP-Are_you_sure_to_delete_the_selected_printer=\u9078\u629E\u3055\u308C\u305F\u30D7\u30EA\u30F3\u30BF\u30FC\u3092\u524A\u9664\u3057\u3066
+ReportServerP-Are_you_sure_to_delete_the_selected_printer=\u9078\u629E\u3055\u308C\u305F\u30D7\u30EA\u30F3\u30BF\u3092\u524A\u9664\u3057\u307E\u3059\u304B
-long_data_can_not_show_fully=\u9577\u3044\u30C7\u30FC\u30BF\u304C\u5341\u5206\u306B\u767A\u63EE\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
+long_data_can_not_show_fully=\u9577\u3044\u30C7\u30FC\u30BF\u306E\u8868\u793A\u306F\u4E0D\u5B8C\u5168
-Utils-Beyond_the_bottom_side_of_Border=\u4E0B\u9818\u57DF\u3092\u30AA\u30FC\u30D0\u30FC
+Utils-Beyond_the_bottom_side_of_Border=\u4E0B\u306E\u5883\u754C\u3092\u8D85\u904E\u3057\u3066\u3044\u307E\u3059\u3002
-FR-Import-Export_PDF=PDF\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8
+FR-Import-Export_PDF=PDF
-Form-CheckBoxGroup=\u30D5\u30EC\u30FC\u30E0\u30BB\u30C3\u30C8\u3092\u8907\u6570\u9078\u629E
+Form-CheckBoxGroup=\u30C1\u30A7\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9\u30B0\u30EB\u30FC\u30D7
-Click-Me=\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u30B5\u30D7\u30E9\u30A4\u30BA\u304C\u3042\u308A\u307E\u3059\u3088\uFF01
+Click-Me=\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u30B5\u30D7\u30E9\u30A4\u30BA\u304C\u3042\u308A\u307E\u3059\u3088!
-Hyperlink-Self=\u540C\u3058Frame(S)
+Hyperlink-Self=\u540C\u3058\u30D5\u30EC\u30FC\u30E0(S)
-Tree-Select_Leaf_Only_Tips=\u30C1\u30A7\u30C3\u30AF\u3057\u306A\u3044\u5834\u5408\u3001\u623B\u308A\u5024\u306F\u5F53\u30CE\u30FC\u30C9\u3060\u3051\u3002
+Tree-Select_Leaf_Only_Tips=(\u30C1\u30A7\u30C3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u5B50\u30CE\u30FC\u30C9\u3092\u542B\u307E\u306A\u3044\u9078\u629E\u306E\u30CE\u30FC\u30C9\u3060\u3051\u3092\u623B\u3059)
-StyleAlignment-Text_Rotation=\u30C6\u30AD\u30B9\u30C8\u65B9\u5411
+StyleAlignment-Text_Rotation=\u6587\u5B57\u5217\u306E\u65B9\u5411
-Format-Error=\u5165\u529B\u3057\u305F\u5024\u306E\u66F8\u5F0F\u304C\u4E0D\u6B63\u78BA\u3067\u3059
+Format-Error=\u5165\u529B\u5024\u306E\u66F8\u5F0F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
-Server-Stop=\u4E00\u6642\u505C\u6B62
+Server-Stop=\u505C\u6B62
 Preference-Setting_Grid=\u30B0\u30EA\u30C3\u30C9\u8A2D\u5B9A
 ReportServerP-Add_Printer=\u30D7\u30EA\u30F3\u30BF\u30FC\u8FFD\u52A0
 FR-Designer-Plugin_Active=\u4F7F\u7528\u958B\u59CB
@@ -1374,10 +1374,10 @@ Formula_Tips=\u5F0F\u306F "\
 FR-Action_Copy=\u30B3\u30D4\u30FC
 Compile_Success=\u7DE8\u96C6\u7FFB\u8A33\u306B\u6210\u529F\u3057\u307E\u3057\u305F
 BackgroundTexture-RecycledPaper=\u518D\u751F\u7D19
-StyleAlignment-Single_Line=\u4E00\u884C\u3067\u8868\u793A
+StyleAlignment-Single_Line=1\u884C\u8868\u793A
-Utils-Move_Down=\u4E0B\u3078\u79FB\u52D5
+Utils-Move_Down=\u4E0B\u3078
-Please_Set_Repeat_First=\u307E\u305A\u91CD\u8907\u3059\u308B\u6A19\u984C\u884C\u3068\u5217\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
+Please_Set_Repeat_First=\u91CD\u8907\u30D8\u30C3\u30C0\u30FC\u884C\u3068\u5217\u3092\u4E8B\u524D\u306B\u5B9A\u7FA9\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-Writer-ShortCuts_Setting=\u5831\u544A\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30FC\u8A2D\u5B9A
+Writer-ShortCuts_Setting=\u66F8\u304D\u8FBC\u307F\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30FC\u8A2D\u5B9A
 Verify-Data_Verify=\u30C7\u30FC\u30BF\u691C\u8A3C
 FR-mobile_analysis_style=\u89E3\u6790\u65B9\u5F0F
 Confirm-Delete-File=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B\uFF1F
@@ -1405,13 +1405,13 @@ LayerData=\u5E95\u5C42\u6570\u636E
 Rename=\u540D\u79F0\u306E\u5909\u66F4
 Widget-Load_By_Async=\u975E\u540C\u671F\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9
 Shape=\u56F3\u5F62
-BindColumn-This_Condition_has_been_existed=\u5F53\u8A72\u6761\u4EF6\u306F\u5B58\u5728\u3057\u3066\u3044\u307E\u3059
+BindColumn-This_Condition_has_been_existed=\u3053\u306E\u6761\u4EF6\u306F\u65E2\u306B\u3042\u308A\u307E\u3059
-NS-exception_readError=\u30A8\u30E9\u30FC\u30B3\u30FC\u30C9\:11300005 \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30D5\u30A1\u30A4\u30EB\u89E3\u6790\u306B\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3057\u305F
+NS-exception_readError=\u30A8\u30E9\u30FC\u30B3\u30FC\u30C9\:1305 \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30D5\u30A1\u30A4\u30EB\u89E3\u6790\u30A8\u30E9\u30FC
-Set_Column_Title_Start=\u91CD\u8907\u3059\u308B\u6A19\u984C\u5217\u3092\u8A2D\u5B9A
+Set_Column_Title_Start=\u91CD\u8907\u30D8\u30C3\u30C0\u30FC\u5217\u8A2D\u5B9A
-Fri=\u91D1
+Fri=\u91D1\u66DC\u65E5
-M_Report-Report_Parameter=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
+M_Report-Report_Parameter=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF
-REPORTLETS=\u8907\u6570\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u30EB\u30FC\u30C8\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306B\u30A2\u30AF\u30BB\u30B9
+REPORTLETS=\u8907\u6570\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u30D1\u30B9\u306E\u30D1\u30E9\u30E1\u30FC\u30BF
-WLayout-Card-ToolTip=\u30AB\u30FC\u30C9\u306E\u30EC\u30A4\u30A2\u30A6\u30C8\u306F\u3001\u30EC\u30A4\u30A2\u30A6\u30C8\u30B3\u30F3\u30C6\u30CA\u5185\u306E\u4ED6\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u6570
+WLayout-Card-ToolTip=\u30AB\u30FC\u30C9\u578B\u30EC\u30A4\u30A2\u30A6\u30C8\u3002\u3053\u306E\u30EC\u30A4\u30A2\u30A6\u30C8\u30B3\u30F3\u30C6\u30CA\u306B\u8907\u6570\u306E\u4ED6\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u8FFD\u52A0\u3067\u304D\u307E\u3059\u3002
 M-Popup_ChartType=\u30B0\u30E9\u30D5\u30BF\u30A4\u30D7
 Please-Wait=\u5C11\u3005\u304A\u5F85\u3061\u304F\u3060\u3055\u3044
 FR-Designer-Form-ToolBar_Widget=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB
@@ -1530,7 +1530,7 @@ M_Insert-Barcode=\u30D0\u30FC\u30B3\u30FC\u30C9
 Bounds=\u30DC\u30FC\u30C0\u30FC
 FR-Designer-Undo_All_Authority_Operations=\u524D\u56DE\u306E\u6A29\u9650\u7DE8\u96C6\u6642\u306E\u5168\u3066\u306E\u30AA\u30DA\u30EC\u30FC\u30B7\u30E7\u30F3\u3092\u64A4\u56DE\u3059
 Datasource-Context=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8
-CellWrite-Page_After_Column=\u5217\u5F8C\u306E\u6539\u9801
+CellWrite-Page_After_Column=\u5217\u5F8C\u306E\u6539\u30DA\u30FC\u30B8
 FR-Designer_Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
 Button-Group-Display-Columns=\u5217\u306E\u6570\u3092\u8868\u793A\u3059\u308B
 Widget-Height=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u9AD8\u3055
@@ -1736,11 +1736,11 @@ No_Editor_Property_Definition=\u5F53\u8A72\u30A8\u30C7\u30A3\u30BF\u306F\u5C5E\u
 Env-Remote_Server=\u30EA\u30E2\u30FC\u30C8\u30B5\u30FC\u30D0\u30FC
 FR-Utils_Background=\u80CC\u666F
 FR-Designer-Plugin_Warning=\u8B66\u544A
-Server-version-info=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u5F8C\u3067\u8A2D\u8A08\u3084\u5143\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u5C5E\u6027\u3092\u5931\u3046\u30EA\u30B9\u30AF\u306B
+Server-version-info=\u958B\u3044\u305F\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u4E0A\u4F4D\u30A8\u30C7\u30A3\u30B7\u30E7\u30F3\u306E\u30C7\u30B6\u30A4\u30CA\u30FC\u3067\u4F5C\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u4E0A\u4F4D\u30A8\u30C7\u30A3\u30B7\u30E7\u30F3\u3067\u4F5C\u6210\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F\u3068\u30A8\u30E9\u30FC\u306E\u767A\u751F\u539F\u56E0\u3068\u306A\u308B\u307B\u304B\u3001\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u6A5F\u80FD\u3084\u5C5E\u6027\u306E\u4E00\u90E8\u3092\u5931\u3046\u6050\u308C\u304C\u3042\u308A\u307E\u3059\u3002\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u4F5C\u6210\u7528\u306E\u30C7\u30B6\u30A4\u30CA\u30FC\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u3001\u914D\u5099\u3055\u308C\u308B\u30A8\u30C7\u30A3\u30B7\u30E7\u30F3\u3088\u308A\u3082\u4E0B\u4F4D\u306E\u30A8\u30C7\u30A3\u30B7\u30E7\u30F3\u3067\u3042\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-CellWrite-Page_After_Row=\u884C\u5F8C\u306E\u6539\u9801
+CellWrite-Page_After_Row=\u884C\u5F8C\u306E\u6539\u30DA\u30FC\u30B8
-HF-Right_Section=\u53F3\u5074\u30BB\u30AF\u30B7\u30E7\u30F3
+HF-Right_Section=\u53F3\u5074
-PageSetup-Title_Start_Row=\u91CD\u8907\u3059\u308B\u6A19\u984C\u884C
+PageSetup-Title_Start_Row=\u91CD\u8907\u30D8\u30C3\u30C0\u30FC\u884C
-From=\u7B2C\u3000\u304B\u3089
+From=From
 Preference-Grid_Line_Color=\u30B0\u30EA\u30C3\u30C9\u7DDA\u306E\u8272
 RowTo=\u884C\u304B\u3089\u7B2C\u307E\u3067
 FR-Designer_ReportColumns-Repeat_Column=\u5217\u9806\u5E8F\u3092\u30B3\u30D4\u30FC
@@ -1819,8 +1819,8 @@ FR-mobile_native_analysis=\u4E00\u6B21\u89E3\u6790
 HighLight=\u30CF\u30A4\u30E9\u30A4\u30C8
 FR-Designer_Dropdown-More-Preview=\u4E0B\u62C9\u83B7\u53D6\u66F4\u591A\u9884\u89C8\u65B9\u5F0F
 local=\u30ED\u30FC\u30AB\u30EB
-FR-Designer_Gradation=\u69CB\u6210
+FR-Designer_Gradation=\u30EC\u30D9\u30EB
-PageSetup-Finis_Start_Column=\u91CD\u8907\u3059\u308B\u7D42\u4E86\u5217
+PageSetup-Finis_Start_Column=\u91CD\u8907\u30D5\u30C3\u30BF\u30FC\u5217
 Env-Invalid_User_and_Password=\u7121\u52B9\u306A\u30E6\u30FC\u30B6\u30FC\u540D\u307E\u305F\u306F\u30D1\u30B9\u30EF\u30FC\u30C9\u3067\u3059
 FR-Designer-Plugin_All_Plugins=\u5168\u3066\u306E\u30D7\u30E9\u30B0\u30A4\u30F3
 FR-Designer_Prepare_Export=\u5C0E\u51FA\u3092\u958B\u59CB\u3057\u3066\u3044\u307E\u3059\u3002\u304A\u5F85\u3061\u304F\u3060\u3055\u3044
@@ -1933,16 +1933,16 @@ Sun=\u65E5
 FR-Designer_ToolBar_Bottom=\u30D5\u30C3\u30BF\u30FC\u30C4\u30FC\u30EB\u30D0\u30FC
 Widget-Width=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u5E45
 Series_Name=\u7CFB\u5217\u540D
-Set_Row_Title_Start=\u91CD\u8907\u3059\u308B\u6A19\u984C\u884C\u3092\u8A2D\u5B9A
+Set_Row_Title_Start=\u91CD\u8907\u30D8\u30C3\u30C0\u30FC\u884C\u8A2D\u5B9A
-HF-Default_Page=\u30C7\u30D5\u30A9\u30EB\u30C8\u30DA\u30FC\u30B8
+HF-Default_Page=\u65E2\u5B9A\u30DA\u30FC\u30B8
-Env_Des=\u30ED\u30B0\u30A4\u30F3\u74B0\u5883\u4E2D\u306E\u5E33\u7968\u5DE5\u7A0B\u306B\u6A29\u9650\u3092\u4ED8\u4E0E\u3059\u308B\u5834\u5408\u3001\u30E6\u30FC\u30B6\u30FC\u540D\u3068\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u8A18\u5165\u306F\u5FC5\u305A
+Env_Des=\u30ED\u30B0\u30A4\u30F3\u74B0\u5883\u4E2D\u306E\u5E33\u7968\u5DE5\u7A0B\u306B\u6A29\u9650\u3092\u4ED8\u4E0E\u3059\u308B\u5834\u5408\u3001\u30E6\u30FC\u30B6\u30FC\u540D\u3068\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u8A18\u5165\u306F\u5FC5\u305A\u5BFE\u5FDC\u3059\u308B\u30ED\u30B0\u30A4\u30F3\u74B0\u5883\u306E\u30E6\u30FC\u30B6\u30FC\u3068\u30D1\u30B9\u30EF\u30FC\u30C9\u3067\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093\u3002
-Widget-User_Defined=\u30D7\u30EC\u5B9A\u7FA9
+Widget-User_Defined=\u4E8B\u524D\u5B9A\u7FA9
-Url_location=\u7D76\u5BFE\u30EB\u30FC\u30C8
+Url_location=\u7D76\u5BFE\u30D1\u30B9
-Disk_File=\u30CF\u30FC\u30C9\u30C7\u30A3\u30B9\u30AF\u30D5\u30A1\u30A4\u30EB
+Disk_File=\u30D5\u30A1\u30A4\u30EB
-Inside=\u5185\u90E8
+Inside=\u5185\u5074
-FR-Designer_filedChosen=
+FR-Designer_filedChosen=\u4F9D\u5B58\u30D5\u30A3\u30FC\u30EB\u30C9
-ServerM-Predefined_Styles=\u30D7\u30EC\u5B9A\u7FA9\u30B9\u30BF\u30A4\u30EB
+ServerM-Predefined_Styles=\u4E8B\u524D\u5B9A\u7FA9\u30B9\u30BF\u30A4\u30EB
-is_need_word_adjust=\u884C\u306E\u9AD8\u3055\u3092\u56FA\u5B9A\u305B\u305A\u5C0E\u51FA
+is_need_word_adjust=\u884C\u306E\u9AD8\u3055\u3092\u56FA\u5B9A\u3057\u306A\u3044
 Background-Null=\u80CC\u666F\u306A\u3057
 PageSetup-Vertically=\u5782\u76F4\u4E2D\u592E\u63C3\u3048
 FR-Designer_Root=\u30EB\u30FC\u30C8\u30CE\u30FC\u30C9
@@ -1976,11 +1976,36 @@ ColumnSpan=\u5217\u7BC4\u56F2
 StyleAlignment-Bottom=\u4E0B\u8A70\u3081
 Read_failure=\u8AAD\u307F\u306B\u969C\u5BB3\u304C\u767A\u751F\u3059\u308B\u3068\u3001\u30BD\u30FC\u30B9\u00B7\u30D5\u30A1\u30A4\u30EB\u304C\u7834\u640D\u3057\u3066\u3044\u308B
 Verify-Verify=\u30C7\u30FC\u30BF\u691C\u8A3C
-FR-Designer-Widget-Style_Title_Format=\u6A19\u984C\u66F8\u5F0F
+FR-Designer-Widget-Style_Title_Format=\u30BF\u30A4\u30C8\u30EB\u66F8\u5F0F
-FR-Designer_Edit_String_To_Formula=\u30AD\u30E3\u30E9\u30AF\u30BF\u30FC\u6587\u5B57\u5217\u3092\u7DE8\u96C6\u3057\u3066\u516C\u5F0F\u3068\u3059\u308B\u304B\u5426\u304B
+FR-Designer_Edit_String_To_Formula=\u6587\u5B57\u5217\u3092\u6570\u5F0F\u306B\u7DE8\u96C6\u3059\u308B\u304B
 FR-Base_UnSignIn=\ \u672A\u30ED\u30B0\u30A4\u30F3
-Every=\u6BCF
+Every=\u6BCE
-CellWrite-Preview_Cell_Content=\u30BB\u30EB\u306E\u5185\u5BB9\u3092\u30D7\u30EC\u30D3\u30E5\u30FC\u3059\u308B
+CellWrite-Preview_Cell_Content=\u30BB\u30EB\u5185\u5BB9
+FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9
+FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9
+FR-Designer_Permissions=\u6A29\u9650
+FR-Designer_Form_Button=\u30DC\u30BF\u30F3
+FR-Designer_WF_Name=\u540D
+FR-Designer_Role=\u5F79\u5272
+FR-Designer_Double=\u5C0F\u6570
+FR-Designer_Query=\u30AF\u30A8\u30EA
+FR-Designer_Font=\u30D5\u30A9\u30F3\u30C8
+FR-Designer_Confirm=OK
+FR-Designer_Parameter=\u30D1\u30E9\u30E1\u30FC\u30BF
+FR-Designer-Plugin_Plugin=\u30D7\u30E9\u30B0\u30A4\u30F3
+FR-Designer_Background=\u80CC\u666F
+Template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
+FR-Designer_Original_Marked_Filed=\u521D\u671F\u30DE\u30FC\u30AF\u30D5\u30A3\u30FC\u30EB\u30C9
+FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u30DE\u30FC\u30AF\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u9577\u3055\u3088\u308A\u30C4\u30EA\u30FC\u3092\u69CB\u7BC9\u3059\u308B
+FR-Designer_Tree_Data_Field=\u30C4\u30EA\u30FC\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9
+FR-Designer_Parent_Marked_Field=\u89AA\u30DE\u30FC\u30AF\u30D5\u30A3\u30FC\u30EB\u30C9
+FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u89AA\u30DE\u30FC\u30AF\u30D5\u30A3\u30FC\u30EB\u30C9\u3088\u308A\u30C4\u30EA\u30FC\u3092\u69CB\u7BC9\u3059\u308B
+FR-Product_Demo=\u88FD\u54C1\u30C7\u30E2
+FR-Designer_Data_Filter=\u30C7\u30FC\u30BF\u30D5\u30A3\u30EB\u30BF
+FR-Designer_Can_not_use_FormatBursh=\u9023\u7D9A\u3057\u306A\u3044\u8907\u6570\u9818\u57DF\u3067\u306F\u66F8\u5F0F\u30B3\u30D4\u30FC\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+Default=\u65E2\u5B9A
+FR-Base-Load_Resource_File=\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9
+
 FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9
 FR-Designer_Cell_Element=\u30BB\u30EB\u8981\u7D20
 FR-Designer_Cell_Attributes=\u30BB\u30EB\u5C5E\u6027

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -1982,6 +1982,30 @@ FR-Base_UnSignIn=\uC544\uC9C1 \uB4F1\uB85D
 Every=\uAC01
 CellWrite-Preview_Cell_Content=\uC140\uB0B4\uC6A9\uBBF8\uB9AC\uBCF4\uAE30
 FormulaD-Data_Fields=\uB370\uC774\uD130\uD56D\uBAA9
+FormulaD-Data_Fields=\uB370\uC774\uD130\uD56D\uBAA9
+FR-Designer_Permissions=
+FR-Designer_Form_Button=
+FR-Designer_WF_Name=
+FR-Designer_Role=
+FR-Designer_Double=\uC18C\uC218
+FR-Designer_Query=\uCC3E\uC544\uBCF4\uAE30
+FR-Designer_Font=\uAE00\uAF34
+FR-Designer_Confirm=\uD655\uC778
+FR-Designer_Parameter=\uB9E4\uAC1C\uBCC0\uC218
+FR-Designer-Plugin_Plugin=\uD50C\uB7EC\uADF8\uC778
+FR-Designer_Background=\uBC30\uACBD
+Template=\uD15C\uD50C\uB9BF
+
+FR-Designer_Original_Marked_Filed=\uCD08\uAE30\uD0DC\uADF8\uD544\uB4DC
+FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uD0DC\uADF8\uD544\uB4DC\uAE38\uC774\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
+FR-Designer_Tree_Data_Field=\uD2B8\uB9AC\uB370\uC774\uD130\uD544\uB4DC
+FR-Designer_Parent_Marked_Field=\uBD80\uBAA8\uD0DC\uADF8\uD544\uB4DC
+FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uBD80\uBAA8\uD0DC\uADF8\uD544\uB4DC\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
+FR-Product_Demo=\uC81C\uD488\uC2DC\uC5F0
+FR-Designer_Data_Filter=\uB370\uC774\uD130\uC120\uBCC4
+Default=\uAE30\uBCF8
+FR-Base-Load_Resource_File=\uB85C\uB529\uAD6C\uC131\uD30C\uC77C
+FormulaD-Data_Fields=\uB370\uC774\uD130\uD56D\uBAA9
 FR-Designer_Cell_Element=\uC140\uC694\uC18C
 FR-Designer_Cell_Attributes=\uC140\uC18D\uC131
 FR-Designer_Float_Element=\uD638\uBC84\uC694\uC18C

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -2003,6 +2003,26 @@ FR-Designer_AlphaFine_NoResult=\u6682\u65E0\u76F8\u5173\u5185\u5BB9
 FR-Designer_ConnectionFailed=\u94FE\u63A5\u5931\u8D25
 FR-Designer_NoResult=\u6682\u4E0D\u652F\u6301\u663E\u793A
 FR-Designer-AlphaFine_SetShortcuts=\u8BF7\u76F4\u63A5\u5728\u952E\u76D8\u4E0A\u6309\u4E24\u4E2A\u7EC4\u5408\u952E
+FR-Designer_Write_Enhance_Preview=\u65B0\u586B\u62A5\u9884\u89C8
+FR-Designer_Double=\u5C0F\u6570
+FR-Designer_Query=\u67E5\u8BE2
+FR-Designer_Font=\u5B57\u4F53
+FR-Designer_Confirm=\u786E\u8BA4
+FR-Designer_Parameter=\u53C2\u6570
+FR-Designer-Plugin_Plugin=\u63D2\u4EF6
+FR-Designer_Background=\u80CC\u666F
+Template=\u6A21\u7248
+
+FR-Designer_Original_Marked_Filed=\u539F\u59CB\u6807\u8BB0\u5B57\u6BB5
+FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u6807\u8BB0\u5B57\u6BB5\u7684\u957F\u5EA6\u6784\u5EFA\u6811
+FR-Designer_Tree_Data_Field=\u6811\u6570\u636E\u5B57\u6BB5
+FR-Designer_Parent_Marked_Field=\u7236\u6807\u8BB0\u5B57\u6BB5
+FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u7236\u6807\u8BB0\u5B57\u6BB5\u6784\u5EFA\u6811
+FR-Product_Demo=\u4EA7\u54C1\u6F14\u793A
+FR-Designer_Data_Filter=\u6570\u636E\u7B5B\u9009
+Default=\u9ED8\u8BA4
+FR-Base-Load_Resource_File=\u52A0\u8F7D\u914D\u7F6E\u6587\u4EF6
+
 FR-Designer_Cell_Element=\u5355\u5143\u683C\u5143\u7D20
 FR-Designer_Cell_Attributes=\u5355\u5143\u683C\u5C5E\u6027
 FR-Designer_Float_Element=\u60AC\u6D6E\u5143\u7D20

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -2004,6 +2004,27 @@ FR-Designer_AlphaFine_NoResult=\u66AB\u7121\u76F8\u95DC\u5167\u5BB9
 FR-Designer_ConnectionFailed=\u93C8\u63A5\u5931\u6557
 FR-Designer_NoResult=\u66AB\u4E0D\u652F\u6301\u986F\u793A
 FR-Designer-AlphaFine_SetShortcuts=\u8ACB\u76F4\u63A5\u5728\u9375\u76E4\u4E0A\u6309\u5169\u500B\u7D44\u5408\u9375
+FR-Designer_Write_Enhance_Preview=\u65B0\u586B\u5831\u9810\u89BD
+FR-Designer_Double=\u5C0F\u6578
+FR-Designer_Query=\u67E5\u8A62
+FR-Designer_Font=\u5B57\u9AD4
+FR-Designer_Confirm=\u78BA\u8A8D
+FR-Designer_Parameter=\u53C3\u6578
+FR-Designer-Plugin_Plugin=\u63D2\u4EF6
+FR-Designer_Background=\u586B\u6EFF\u8272\u5F69
+Template=\u7BC4\u672C
+
+FR-Designer_Original_Marked_Filed=\u539F\u59CB\u6A19\u8A18\u6B04\u4F4D
+FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u6A19\u8A18\u6B04\u4F4D\u7684\u9577\u5EA6\u69CB\u5EFA\u6A39\u72C0
+FR-Designer_Can_not_use_FormatBursh=\u7121\u6CD5\u4F7F\u7528\u8907\u88FD\u683C\u5F0F
+FR-Designer_Tree_Data_Field=\u6A39\u72C0\u8CC7\u6599\u6B04\u4F4D
+FR-Designer_Parent_Marked_Field=\u7236\u6A19\u8A18\u6B04\u4F4D
+FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u7236\u6A19\u8A18\u6B04\u4F4D\u69CB\u5EFA\u6A39
+FR-Product_Demo=\u529F\u80FD\u5C55\u793A
+FR-Designer_Data_Filter=\u8CC7\u6599\u7BE9\u9078
+Default=\u9810\u8A2D
+FR-Base-Load_Resource_File=\u52A0\u8F09\u914D\u7F6E\u6A94\u6848
+
 FR-Designer_Cell_Element=\u5132\u5B58\u683C\u5143\u7D20
 FR-Designer_Cell_Attributes=\u5132\u5B58\u683C\u5C6C\u6027
 FR-Designer_Float_Element=\u61F8\u6D6E\u5143\u7D20

designer_base/src/com/fr/design/mainframe/JFormSliderPane.java

@@ -0,0 +1,370 @@
+package com.fr.design.mainframe;
+
+import com.fr.base.BaseUtils;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UIRadioButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.islider.UISlider;
+import com.fr.design.gui.ispinner.UIBasicSpinner;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.Inter;
+
+import javax.swing.*;
+import javax.swing.border.MatteBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.math.BigDecimal;
+
+/**
+ * Created by MoMeak on 2017/7/13.
+ */
+public class JFormSliderPane extends JPanel {
+
+    private static final double ONEPOINTEIGHT = 1.8;
+    private static final int SIX = 6;
+    private static final int TEN = 10;
+    private static final int ONE_EIGHT = 18;
+    private static final int FONT_SIZE = 14;
+    private static final int SPINNER_WIDTH = 45;
+    private static final int SPINNER_HEIGHT = 20;
+    private static final int HALF_HUNDRED = 50;
+    private static final int HUNDRED = 100;
+    private static final int TWO_HUNDRED = 200;
+    private static final int THREE_HUNDRED = 300;
+    private static final int FOUR_HUNDRED = 400;
+    private static final int DIALOG_WIDTH = 150;
+    private static final int DIALOG_HEIGHT = 240;
+    private static final int SHOWVALBUTTON_WIDTH = 70;
+    private static final int SHOWVALBUTTON_HEIGHTH = 25;
+    public int showValue = 100;
+    public double resolutionTimes = 1.0;
+    private static JFormSliderPane THIS;
+    private UITextField showVal;
+    private JSpinner showValSpinner;
+    private UISlider slider;
+    private int times;
+    private int sliderValue;
+    private UIButton downButton;
+    private UIButton upButton;
+    private UIButton showValButton;
+    private UIRadioButton twoHundredButton;
+    private UIRadioButton oneHundredButton;
+    private UIRadioButton SevenFiveButton;
+    private UIRadioButton fiveTenButton;
+    private UIRadioButton twoFiveButton;
+    private UIRadioButton selfAdaptButton;
+    private UIRadioButton customButton;
+    //拖动条处理和button、直接输入不一样
+    private boolean isButtonOrIsTxt = true;
+    private FormPopupPane dialog;
+    private int upButtonX;
+    private JPanel dialogContentPanel;
+
+
+    public JFormSliderPane() {
+        this.setLayout(new BorderLayout());
+        slider = new UISlider(0, HUNDRED, HALF_HUNDRED);
+        slider.setUI(new JSliderPaneUI(slider));
+        slider.addChangeListener(listener);
+
+        showValSpinner = new UIBasicSpinner(new SpinnerNumberModel(HUNDRED, TEN, FOUR_HUNDRED, 1));
+        showValSpinner.setEnabled(true);
+        showValSpinner.addChangeListener(showValSpinnerChangeListener);
+        showValSpinner.setPreferredSize(new Dimension(SPINNER_WIDTH, SPINNER_HEIGHT));
+        //MoMeak：控制只能输入10-400，但是用起来感觉不舒服，先注释掉吧
+//        JSpinner.NumberEditor editor = new JSpinner.NumberEditor(showValSpinner, "0");
+//        showValSpinner.setEditor(editor);
+//        JFormattedTextField textField = ((JSpinner.NumberEditor) showValSpinner.getEditor()).getTextField();
+//        textField.setEditable(true);
+//        DefaultFormatterFactory factory = (DefaultFormatterFactory) textField .getFormatterFactory();
+//        NumberFormatter formatter = (NumberFormatter) factory.getDefaultFormatter();
+//        formatter.setAllowsInvalid(false);
+        downButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/moveDown.png"));
+        upButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/moveUp.png"));
+        downButton.setActionCommand("less");
+        upButton.setActionCommand("more");
+        downButton.addActionListener(buttonActionListener);
+        upButton.addActionListener(buttonActionListener);
+
+        showValButton = new UIButton(showValSpinner.getValue() + "%");
+        showValButton.setBorderPainted(false);
+        showValButton.setPreferredSize(new Dimension(SHOWVALBUTTON_WIDTH, SHOWVALBUTTON_HEIGHTH));
+        showValButton.addActionListener(showValButtonActionListener);
+
+        initUIRadioButton();
+        initPane();
+        JPanel panel = new JPanel(new FlowLayout(1, 1, 0));
+        panel.add(downButton);
+        panel.add(slider);
+        panel.add(upButton);
+        panel.add(showValButton);
+        this.add(panel, BorderLayout.NORTH);
+        this.setBounds(0, 0, THREE_HUNDRED, ONE_EIGHT);
+    }
+
+    public static final JFormSliderPane getInstance() {
+//        if (THIS == null) {
+//            THIS = new JFormSliderPane();
+//        }
+        THIS = new JFormSliderPane();
+        return THIS;
+    }
+
+    private void initUIRadioButton() {
+        twoHundredButton = new UIRadioButton("200%");
+        oneHundredButton = new UIRadioButton("100%");
+        SevenFiveButton = new UIRadioButton("75%");
+        fiveTenButton = new UIRadioButton("50%");
+        twoFiveButton = new UIRadioButton("25%");
+//        selfAdaptButton = new UIRadioButton(Inter.getLocText("FR-Designer_Scale_selfAdaptButton"));
+        customButton = new UIRadioButton(Inter.getLocText("FR-Designer_Scale_customButton"));
+        twoHundredButton.addItemListener(radioButtonItemListener);
+        oneHundredButton.addItemListener(radioButtonItemListener);
+        SevenFiveButton.addItemListener(radioButtonItemListener);
+        fiveTenButton.addItemListener(radioButtonItemListener);
+        twoFiveButton.addItemListener(radioButtonItemListener);
+        //TODO
+//        selfAdaptButton.addItemListener();
+
+        ButtonGroup bg = new ButtonGroup();// 初始化按钮组
+        bg.add(twoHundredButton);// 加入按钮组
+        bg.add(oneHundredButton);
+        bg.add(SevenFiveButton);
+        bg.add(fiveTenButton);
+        bg.add(twoFiveButton);
+//        bg.add(selfAdaptButton);
+        bg.add(customButton);
+        customButton.setSelected(true);
+    }
+
+    private void initPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] columnSize = {p, f};
+        double[] rowSize = {p, p, p, p, p, p, p};
+        Component[][] components = new Component[][]{
+                new Component[]{twoHundredButton, null},
+                new Component[]{oneHundredButton, null},
+                new Component[]{SevenFiveButton, null},
+                new Component[]{fiveTenButton, null},
+                new Component[]{twoFiveButton, null},
+//                new Component[]{selfAdaptButton,null},
+                new Component[]{customButton, createSpinnerPanel()}
+        };
+        dialogContentPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+    }
+
+    private JPanel createSpinnerPanel() {
+        JPanel spinnerPanel = new JPanel(new FlowLayout());
+        spinnerPanel.add(showValSpinner);
+        UILabel percent = new UILabel("%");
+        percent.setFont(new Font("Dialog", Font.PLAIN, FONT_SIZE));
+        spinnerPanel.add(percent);
+        return spinnerPanel;
+    }
+
+    ActionListener showValButtonActionListener = new ActionListener() {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            popupDialog();
+        }
+    };
+
+    ChangeListener showValSpinnerChangeListener = new ChangeListener() {
+        @Override
+        public void stateChanged(ChangeEvent e) {
+            int val = (int) ((UIBasicSpinner) e.getSource()).getValue();
+            isButtonOrIsTxt = true;
+            resolutionTimes = divide(showValue, 100, 2);
+            if (val > FOUR_HUNDRED) {
+                showValSpinner.setValue(FOUR_HUNDRED);
+                val = FOUR_HUNDRED;
+            }
+            if (val < TEN) {
+                showValSpinner.setValue(TEN);
+                val = TEN;
+            }
+            refreshSlider(val);
+            refreshBottun(val);
+        }
+    };
+
+
+    //定义一个监听器，用于监听所有滑动条
+    ChangeListener listener = new ChangeListener() {
+        public void stateChanged(ChangeEvent event) {
+            //取出滑动条的值，并在文本中显示出来
+            if (!isButtonOrIsTxt) {
+                customButton.setSelected(true);
+                EventQueue.invokeLater(new Runnable() {
+                    public void run() {
+                        sliderValue = slider.getValue();
+                        getTimes(sliderValue);
+                        showValue = times;
+                        showValSpinner.setValue(times);
+                    }
+                });
+            } else {
+                isButtonOrIsTxt = false;
+            }
+        }
+    };
+
+    ItemListener radioButtonItemListener = new ItemListener() {
+        @Override
+        public void itemStateChanged(ItemEvent e) {
+            JRadioButton temp = (JRadioButton) e.getSource();
+            if (temp.isSelected()) {
+                showValSpinner.setValue(Integer.valueOf(temp.getText().substring(0, temp.getText().indexOf("%"))));
+            }
+        }
+    };
+
+    private void refreshSlider(int val) {
+        showValue = val;
+        if (showValue > HUNDRED) {
+            slider.setValue((int) (showValue + TWO_HUNDRED) / SIX);
+        } else if (showValue < HUNDRED) {
+            slider.setValue((int) ((showValue - TEN) / ONEPOINTEIGHT));
+        } else if (showValue == HUNDRED) {
+            slider.setValue(HALF_HUNDRED);
+        }
+    }
+
+
+    private void refreshBottun(int val) {
+        showValButton.setText(val + "%");
+    }
+
+    public double getResolutionTimes() {
+        return this.resolutionTimes;
+    }
+
+    public int getshowValue() {
+        return this.showValue;
+    }
+
+    public static double divide(double v1, double v2, int scale) {
+        BigDecimal b1 = new BigDecimal(Double.toString(v1));
+        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        return b1.divide(b2, scale).doubleValue();
+    }
+
+    ActionListener buttonActionListener = new ActionListener() {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            showValue = (int) showValSpinner.getValue();
+            isButtonOrIsTxt = true;
+            if (e.getActionCommand().equals("less")) {
+                int newDownVal = showValue - TEN;
+                if (newDownVal >= TEN) {
+                    showValue = newDownVal;
+                    showValSpinner.setValue(newDownVal);
+                } else {
+                    showValue = newDownVal;
+                    showValSpinner.setValue(TEN);
+                }
+            }
+            if (e.getActionCommand().equals("more")) {
+                int newUpVal = showValue + TEN;
+                if (newUpVal <= FOUR_HUNDRED) {
+                    showValue = newUpVal;
+                    showValSpinner.setValue(newUpVal);
+                } else {
+                    showValue = newUpVal;
+                    showValSpinner.setValue(FOUR_HUNDRED);
+                }
+            }
+            isButtonOrIsTxt = true;
+            customButton.setSelected(true);
+        }
+    };
+
+
+    private void getTimes(int value) {
+        if (value == HALF_HUNDRED) {
+            times = HUNDRED;
+        } else if (value < HALF_HUNDRED) {
+            times = (int) Math.round(ONEPOINTEIGHT * value + TEN);
+        } else {
+            times = (int) (SIX * value - TWO_HUNDRED);
+        }
+    }
+
+
+    public JSpinner getShowVal() {
+        return this.showValSpinner;
+    }
+
+    public UIRadioButton getSelfAdaptButton() {
+        return this.selfAdaptButton;
+    }
+
+    private void popupDialog() {
+        Point btnCoords = upButton.getLocationOnScreen();
+        if (dialog == null) {
+            dialog = new FormPopupPane(upButton, dialogContentPanel);
+            if (upButtonX == 0) {
+                upButtonX = btnCoords.x;
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
+            }
+        } else {
+            if (upButtonX == 0) {
+                upButtonX = btnCoords.x;
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
+            } else {
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        JFrame jf = new JFrame("test");
+        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        JPanel content = (JPanel) jf.getContentPane();
+        content.setLayout(new BorderLayout());
+        content.add(JFormSliderPane.getInstance(), BorderLayout.CENTER);
+        GUICoreUtils.centerWindow(jf);
+        jf.setSize(400, 80);
+        jf.setVisible(true);
+
+    }
+}
+
+
+class FormPopupPane extends JPopupMenu {
+    private JComponent contentPane;
+    private static final int UPLABEL_HEIGHT = 25;
+    private static final int DIALOG_WIDTH = 150;
+    private static final int DIALOG_HEIGHT = 220;
+    private static final int UPLABEL_WIDTH = 300;
+    private JComponent centerPane;
+    private UILabel upLabel;
+
+    FormPopupPane(UIButton b, JPanel dialogContentPanel) {
+        contentPane = new JPanel(new BorderLayout());
+        centerPane = new JPanel(new BorderLayout());
+        upLabel = new UILabel(" " + Inter.getLocText("FR-Designer_Scale_EnlargeOrReduce"));
+        upLabel.setOpaque(true);
+        upLabel.setPreferredSize(new Dimension(UPLABEL_WIDTH, UPLABEL_HEIGHT));
+        upLabel.setBackground(Color.LIGHT_GRAY);
+        upLabel.setBorder(new MatteBorder(0, 0, 1, 0, Color.gray));
+        centerPane.add(dialogContentPanel, BorderLayout.NORTH);
+        contentPane.add(upLabel, BorderLayout.NORTH);
+        contentPane.add(centerPane, BorderLayout.CENTER);
+//        contentPane.setBorder(new MatteBorder(1,1,1,1,Color.darkGray));
+        this.add(contentPane, BorderLayout.CENTER);
+        this.setPreferredSize(new Dimension(DIALOG_WIDTH, DIALOG_HEIGHT));
+        this.setOpaque(false);
+    }
+
+
+}

designer_base/src/com/fr/design/mainframe/JSliderPane.java

@@ -1,7 +1,6 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
-import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
@@ -19,7 +18,10 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.plaf.basic.BasicSliderUI;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 import java.math.BigDecimal;
 
 /**
@@ -30,21 +32,19 @@ public class JSliderPane extends JPanel {
     private static final double ONEPOINTEIGHT = 1.8;
     private static final int SIX = 6;
     private static final int TEN = 10;
-    private static final int ONEEIGHT = 18;
+    private static final int ONE_EIGHT = 18;
-    private static final int FONTSIZE = 14;
+    private static final int FONT_SIZE = 14;
-    private static final int SPINNERWIDTH= 45;
+    private static final int SPINNER_WIDTH = 45;
-    private static final int SPINNERHEIGHT = 20;
+    private static final int SPINNER_HEIGHT = 20;
-    private static final int TWOFIVE = 25;
+    private static final int HALF_HUNDRED = 50;
-    private static final int FOURTEN = 40;
-    private static final int HALFHUNDRED = 50;
     private static final int HUNDRED = 100;
-    private static final int TWOHUNDRED = 200;
+    private static final int TWO_HUNDRED = 200;
-    private static final int THREEHUNDRED = 300;
+    private static final int THREE_HUNDRED = 300;
-    private static final int FOURHUNDRED = 400;
+    private static final int FOUR_HUNDRED = 400;
-    private static final int DIALOGWIDTH = 150;
+    private static final int DIALOG_WIDTH = 150;
-    private static final int DIALOGHEIGHT = 240;
+    private static final int DIALOG_HEIGHT = 240;
-    private static final int SHOWVALBUTTONWIDTH = 70;
+    private static final int SHOWVALBUTTON_WIDTH = 70;
-    private static final int SHOWVALBUTTONHEIGHTH = 25;
+    private static final int SHOWVALBUTTON_HEIGHTH = 25;
     public int showValue = 100;
     public double resolutionTimes = 1.0;
     private static JSliderPane THIS;
@@ -72,14 +72,14 @@ public class JSliderPane extends JPanel {
 
     public JSliderPane() {
         this.setLayout(new BorderLayout());
-        slider = new UISlider(0,HUNDRED,HALFHUNDRED);
+        slider = new UISlider(0, HUNDRED, HALF_HUNDRED);
         slider.setUI(new JSliderPaneUI(slider));
         slider.addChangeListener(listener);
 
-        showValSpinner = new UIBasicSpinner(new SpinnerNumberModel(HUNDRED, TEN, FOURHUNDRED, 1));
+        showValSpinner = new UIBasicSpinner(new SpinnerNumberModel(HUNDRED, TEN, FOUR_HUNDRED, 1));
         showValSpinner.setEnabled(true);
         showValSpinner.addChangeListener(showValSpinnerChangeListener);
-        showValSpinner.setPreferredSize(new Dimension(SPINNERWIDTH, SPINNERHEIGHT));
+        showValSpinner.setPreferredSize(new Dimension(SPINNER_WIDTH, SPINNER_HEIGHT));
         //MoMeak：控制只能输入10-400，但是用起来感觉不舒服，先注释掉吧
 //        JSpinner.NumberEditor editor = new JSpinner.NumberEditor(showValSpinner, "0");
 //        showValSpinner.setEditor(editor);
@@ -95,20 +95,19 @@ public class JSliderPane extends JPanel {
         downButton.addActionListener(buttonActionListener);
         upButton.addActionListener(buttonActionListener);
 
-        showValButton = new UIButton(showValSpinner.getValue()+"%");
+        showValButton = new UIButton(showValSpinner.getValue() + "%");
         showValButton.setBorderPainted(false);
-        showValButton.setPreferredSize(new Dimension(SHOWVALBUTTONWIDTH,SHOWVALBUTTONHEIGHTH));
+        showValButton.setPreferredSize(new Dimension(SHOWVALBUTTON_WIDTH, SHOWVALBUTTON_HEIGHTH));
         showValButton.addActionListener(showValButtonActionListener);
-
         initUIRadioButton();
         initPane();
-        JPanel panel = new JPanel(new FlowLayout(1,1,0));
+        JPanel panel = new JPanel(new FlowLayout(1, 1, 0));
         panel.add(downButton);
         panel.add(slider);
         panel.add(upButton);
         panel.add(showValButton);
-        this.add(panel,BorderLayout.NORTH);
+        this.add(panel, BorderLayout.NORTH);
-        this.setBounds(0,0,THREEHUNDRED,ONEEIGHT);
+        this.setBounds(0, 0, THREE_HUNDRED, ONE_EIGHT);
     }
 
     public static final JSliderPane getInstance() {
@@ -119,7 +118,7 @@ public class JSliderPane extends JPanel {
         return THIS;
     }
 
-    private void initUIRadioButton(){
+    private void initUIRadioButton() {
         twoHundredButton = new UIRadioButton("200%");
         oneHundredButton = new UIRadioButton("100%");
         SevenFiveButton = new UIRadioButton("75%");
@@ -135,7 +134,7 @@ public class JSliderPane extends JPanel {
         //TODO
 //        selfAdaptButton.addItemListener();
 
-        ButtonGroup bg=new ButtonGroup();// 初始化按钮组
+        ButtonGroup bg = new ButtonGroup();// 初始化按钮组
         bg.add(twoHundredButton);// 加入按钮组
         bg.add(oneHundredButton);
         bg.add(SevenFiveButton);
@@ -146,28 +145,28 @@ public class JSliderPane extends JPanel {
         customButton.setSelected(true);
     }
 
-    private void initPane(){
+    private void initPane() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = { p, f };
+        double[] columnSize = {p, f};
-        double[] rowSize = { p,p,p,p,p,p,p};
+        double[] rowSize = {p, p, p, p, p, p, p};
         Component[][] components = new Component[][]{
-                new Component[]{twoHundredButton,null},
+                new Component[]{twoHundredButton, null},
-                new Component[]{oneHundredButton,null},
+                new Component[]{oneHundredButton, null},
-                new Component[]{SevenFiveButton,null},
+                new Component[]{SevenFiveButton, null},
-                new Component[]{fiveTenButton,null},
+                new Component[]{fiveTenButton, null},
-                new Component[]{twoFiveButton,null},
+                new Component[]{twoFiveButton, null},
-                new Component[]{selfAdaptButton,null},
+                new Component[]{selfAdaptButton, null},
-                new Component[]{customButton,createSpinnerPanel()}
+                new Component[]{customButton, createSpinnerPanel()}
         };
-        dialogContentPanel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
+        dialogContentPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
     }
 
-    private JPanel createSpinnerPanel(){
+    private JPanel createSpinnerPanel() {
         JPanel spinnerPanel = new JPanel(new FlowLayout());
         spinnerPanel.add(showValSpinner);
         UILabel percent = new UILabel("%");
-        percent.setFont(new Font("Dialog", Font.PLAIN, FONTSIZE));
+        percent.setFont(new Font("Dialog", Font.PLAIN, FONT_SIZE));
         spinnerPanel.add(percent);
         return spinnerPanel;
     }
@@ -182,9 +181,17 @@ public class JSliderPane extends JPanel {
     ChangeListener showValSpinnerChangeListener = new ChangeListener() {
         @Override
         public void stateChanged(ChangeEvent e) {
-            int val = (int) ((UIBasicSpinner)e.getSource()).getValue();
+            int val = (int) ((UIBasicSpinner) e.getSource()).getValue();
             isButtonOrIsTxt = true;
-            resolutionTimes = divide(showValue,100,2);
+            resolutionTimes = divide(showValue, 100, 2);
+            if (val > FOUR_HUNDRED) {
+                showValSpinner.setValue(FOUR_HUNDRED);
+                val = FOUR_HUNDRED;
+            }
+            if (val < TEN) {
+                showValSpinner.setValue(TEN);
+                val = TEN;
+            }
             refreshSlider(val);
             refreshBottun(val);
         }
@@ -192,11 +199,10 @@ public class JSliderPane extends JPanel {
 
 
     //定义一个监听器，用于监听所有滑动条
-    ChangeListener listener = new ChangeListener()
+    ChangeListener listener = new ChangeListener() {
-    {
+        public void stateChanged(ChangeEvent event) {
-        public void stateChanged( ChangeEvent event) {
             //取出滑动条的值，并在文本中显示出来
-            if (!isButtonOrIsTxt){
+            if (!isButtonOrIsTxt) {
                 customButton.setSelected(true);
                 EventQueue.invokeLater(new Runnable() {
                     public void run() {
@@ -206,7 +212,7 @@ public class JSliderPane extends JPanel {
                         showValSpinner.setValue(times);
                     }
                 });
-            }else {
+            } else {
                 isButtonOrIsTxt = false;
             }
         }
@@ -215,41 +221,41 @@ public class JSliderPane extends JPanel {
     ItemListener radioButtonItemListener = new ItemListener() {
         @Override
         public void itemStateChanged(ItemEvent e) {
-            JRadioButton temp=(JRadioButton)e.getSource();
+            JRadioButton temp = (JRadioButton) e.getSource();
-            if(temp.isSelected()){
+            if (temp.isSelected()) {
                 showValSpinner.setValue(Integer.valueOf(temp.getText().substring(0, temp.getText().indexOf("%"))));
             }
         }
     };
 
-    private void refreshSlider(int val){
+    private void refreshSlider(int val) {
         showValue = val;
-        if (showValue >HUNDRED){
+        if (showValue > HUNDRED) {
-            slider.setValue((int)(showValue+TWOHUNDRED)/SIX);
+            slider.setValue((int) (showValue + TWO_HUNDRED) / SIX);
-        }else if (showValue <HUNDRED){
+        } else if (showValue < HUNDRED) {
-            slider.setValue((int)((showValue-TEN)/ONEPOINTEIGHT));
+            slider.setValue((int) ((showValue - TEN) / ONEPOINTEIGHT));
-        }else if (showValue == HUNDRED){
+        } else if (showValue == HUNDRED) {
-            slider.setValue(HALFHUNDRED);
+            slider.setValue(HALF_HUNDRED);
         }
     }
 
 
-    private void refreshBottun(int val){
+    private void refreshBottun(int val) {
-        showValButton.setText(val+"%");
+        showValButton.setText(val + "%");
     }
 
-    public double getResolutionTimes(){
+    public double getResolutionTimes() {
         return this.resolutionTimes;
     }
 
-    public int getshowValue(){
+    public int getshowValue() {
         return this.showValue;
     }
 
-    public static double divide(double v1, double v2,int scale) {
+    public static double divide(double v1, double v2, int scale) {
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
-        return b1.divide(b2,scale).doubleValue();
+        return b1.divide(b2, scale).doubleValue();
     }
 
     ActionListener buttonActionListener = new ActionListener() {
@@ -257,24 +263,24 @@ public class JSliderPane extends JPanel {
         public void actionPerformed(ActionEvent e) {
             showValue = (int) showValSpinner.getValue();
             isButtonOrIsTxt = true;
-            if(e.getActionCommand().equals("less")){
+            if (e.getActionCommand().equals("less")) {
                 int newDownVal = showValue - TEN;
-                if (newDownVal >= TEN ){
+                if (newDownVal >= TEN) {
                     showValue = newDownVal;
                     showValSpinner.setValue(newDownVal);
-                }else {
+                } else {
                     showValue = newDownVal;
                     showValSpinner.setValue(TEN);
                 }
             }
-            if(e.getActionCommand().equals("more")){
+            if (e.getActionCommand().equals("more")) {
                 int newUpVal = showValue + TEN;
-                if (newUpVal <= FOURHUNDRED ){
+                if (newUpVal <= FOUR_HUNDRED) {
                     showValue = newUpVal;
                     showValSpinner.setValue(newUpVal);
-                }else {
+                } else {
                     showValue = newUpVal;
-                    showValSpinner.setValue(FOURHUNDRED);
+                    showValSpinner.setValue(FOUR_HUNDRED);
                 }
             }
             isButtonOrIsTxt = true;
@@ -283,54 +289,52 @@ public class JSliderPane extends JPanel {
     };
 
 
-
+    private void getTimes(int value) {
-    private void getTimes(int value){
+        if (value == HALF_HUNDRED) {
-        if (value == HALFHUNDRED){
+            times = HUNDRED;
-            times=HUNDRED;
+        } else if (value < HALF_HUNDRED) {
-        }else if (value < HALFHUNDRED){
+            times = (int) Math.round(ONEPOINTEIGHT * value + TEN);
-            times = (int) Math.round(ONEPOINTEIGHT*value + TEN);
+        } else {
-        }else {
+            times = (int) (SIX * value - TWO_HUNDRED);
-            times = (int) (SIX*value - TWOHUNDRED);
         }
     }
 
 
-    public JSpinner getShowVal(){
+    public JSpinner getShowVal() {
         return this.showValSpinner;
     }
 
-    public UIRadioButton getSelfAdaptButton(){
+    public UIRadioButton getSelfAdaptButton() {
         return this.selfAdaptButton;
     }
 
-    private void popupDialog(){
+    private void popupDialog() {
         Point btnCoords = upButton.getLocationOnScreen();
-        if (dialog == null){
+        if (dialog == null) {
-            dialog = new PopupPane(upButton,dialogContentPanel);
+            dialog = new PopupPane(upButton, dialogContentPanel);
             if (upButtonX == 0) {
                 upButtonX = btnCoords.x;
-                GUICoreUtils.showPopupMenu(dialog, upButton,  - DIALOGWIDTH + upButton.getWidth() + SHOWVALBUTTONWIDTH , -DIALOGHEIGHT);
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
             }
-        }else {
+        } else {
             if (upButtonX == 0) {
                 upButtonX = btnCoords.x;
-                GUICoreUtils.showPopupMenu(dialog, upButton,  - DIALOGWIDTH + upButton.getWidth() +SHOWVALBUTTONWIDTH, -DIALOGHEIGHT);
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
             } else {
-                GUICoreUtils.showPopupMenu(dialog, upButton,  - DIALOGWIDTH + upButton.getWidth() +SHOWVALBUTTONWIDTH, -DIALOGHEIGHT);
+                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
             }
         }
     }
 
-    public static void main(String[] args)
+    public static void main(String[] args) {
-    {
+        JFrame jf = new JFrame("test");
-//        JFrame jf = new JFrame("test");
+        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-//        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        JPanel content = (JPanel) jf.getContentPane();
-//        JPanel content = (JPanel)jf.getContentPane();
+        content.setLayout(new BorderLayout());
-//        content.setLayout(new BorderLayout());
+        content.add(JSliderPane.getInstance(), BorderLayout.CENTER);
-//        content.add(JSliderPane.getInstance(),BorderLayout.CENTER);
+        GUICoreUtils.centerWindow(jf);
-//        GUICoreUtils.centerWindow(jf);
+        jf.setSize(400, 80);
-//        jf.setSize(400, 80);
+        jf.setVisible(true);
-//        jf.setVisible(true);
 
     }
 }
@@ -355,11 +359,10 @@ class JSliderPaneUI extends BasicSliderUI {
     public Dimension getThumbSize() {
         Dimension size = new Dimension();
 
-        if ( slider.getOrientation() == JSlider.VERTICAL ) {
+        if (slider.getOrientation() == JSlider.VERTICAL) {
             size.width = VERTICAL_WIDTH;
             size.height = VERTICAL_HEIGHT;
-        }
+        } else {
-        else {
             size.width = VERTICAL_WIDTH;
             size.height = VERTICAL_HEIGHT;
         }
@@ -373,14 +376,13 @@ class JSliderPaneUI extends BasicSliderUI {
         int h = knobBounds.height;
 
         g.translate(knobBounds.x, knobBounds.y);
-        if ( slider.isEnabled() ) {
+        if (slider.isEnabled()) {
             g.setColor(slider.getBackground());
-        }
+        } else {
-        else {
             g.setColor(slider.getBackground().darker());
         }
         g.setColor(Color.darkGray);
-        g.fillRect(0, 1, w-SIX, h+1);
+        g.fillRect(0, 1, w - SIX, h + 1);
     }
 
     /** */
@@ -395,8 +397,8 @@ class JSliderPaneUI extends BasicSliderUI {
             cy = (trackBounds.height / 2);
             cw = trackBounds.width;
             g.setColor(Color.lightGray);
-            g.drawLine(0, cy, cw+FIVE, cy);
+            g.drawLine(0, cy, cw + FIVE, cy);
-            g.drawLine(FIVE+cw/2, cy-FOUR, FIVE+cw/2, cy+FOUR);
+            g.drawLine(FIVE + cw / 2, cy - FOUR, FIVE + cw / 2, cy + FOUR);
         } else {
             super.paintTrack(g);
         }
@@ -406,30 +408,29 @@ class JSliderPaneUI extends BasicSliderUI {
 
 class PopupPane extends JPopupMenu {
     private JComponent contentPane;
-    private static final int UPLABELHEIGHT = 25;
+    private static final int UPLABEL_HEIGHT = 25;
-    private static final int HALFHUNDRED = 50;
+    private static final int DIALOG_WIDTH = 150;
-    private static final int DIALOGWIDTH = 150;
+    private static final int DIALOG_HEIGHT = 240;
-    private static final int DIALOGHEIGHT = 240;
+    private static final int UPLABEL_WIDTH = 300;
-    private static final int UPLABELWIDTH = 300;
     private JComponent centerPane;
     private UILabel upLabel;
-    PopupPane(UIButton b,JPanel dialogContentPanel) {
+
+    PopupPane(UIButton b, JPanel dialogContentPanel) {
         contentPane = new JPanel(new BorderLayout());
         centerPane = new JPanel(new BorderLayout());
         upLabel = new UILabel(" " + Inter.getLocText("FR-Designer_Scale_EnlargeOrReduce"));
         upLabel.setOpaque(true);
-        upLabel.setPreferredSize(new Dimension(UPLABELWIDTH,UPLABELHEIGHT));
+        upLabel.setPreferredSize(new Dimension(UPLABEL_WIDTH, UPLABEL_HEIGHT));
         upLabel.setBackground(Color.LIGHT_GRAY);
-        upLabel.setBorder(new MatteBorder(0,0,1,0,Color.gray));
+        upLabel.setBorder(new MatteBorder(0, 0, 1, 0, Color.gray));
-        centerPane.add(dialogContentPanel,BorderLayout.NORTH);
+        centerPane.add(dialogContentPanel, BorderLayout.NORTH);
-        contentPane.add(upLabel,BorderLayout.NORTH);
+        contentPane.add(upLabel, BorderLayout.NORTH);
-        contentPane.add(centerPane,BorderLayout.CENTER);
+        contentPane.add(centerPane, BorderLayout.CENTER);
 //        contentPane.setBorder(new MatteBorder(1,1,1,1,Color.darkGray));
         this.add(contentPane, BorderLayout.CENTER);
-        this.setPreferredSize(new Dimension(DIALOGWIDTH, DIALOGHEIGHT));
+        this.setPreferredSize(new Dimension(DIALOG_WIDTH, DIALOG_HEIGHT));
         this.setOpaque(false);
     }
 
 
-
 }

designer_base/src/com/fr/design/mainframe/JTemplate.java

@@ -143,11 +143,13 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         return undoState;
     }
 
+    /**
+     * set/get 模板屏幕分辨率
+     */
     public abstract void setJTemplateResolution(int resolution);
 
     public abstract int getJTemplateResolution();
 
-    ;
 
     /**
      * 初始化权限细粒度撤销状态
@@ -218,10 +220,16 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      */
     public abstract void removeParameterPaneSelection();
 
+    /**
+     * 缩放参数
+     */
     public abstract void setScale(int resolution);
 
     public abstract int getScale();
 
+    /**
+     * 缩放参数自适应
+     */
     public abstract int selfAdaptUpdate();
 
     protected abstract DesignModelAdapter<T, ?> createDesignModel();

designer_base/src/com/fr/design/mainframe/loghandler/LogHandlerBar.java

@@ -1,23 +1,16 @@
 package com.fr.design.mainframe.loghandler;
 
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Insets;
-import java.awt.ItemSelectable;
-import java.awt.LayoutManager;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.Timer;
-
 import com.fr.base.BaseUtils;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.general.Inter;
+import com.fr.stable.script.Atom;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class LogHandlerBar extends JPanel implements ItemSelectable {
 
@@ -33,8 +26,6 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 	private int SERVERNUM = 0;
 
 	private boolean isWithSerious;
-	private int i;
-	private Timer timer;
 
 	public LogHandlerBar() {
 		this(null);
@@ -48,17 +39,17 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 		clear.setMargin(null);
 		clear.setOpaque(false);
 		clear.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		clear.setToolTipText(Inter.getLocText("Clear_All"));
+		clear.setToolTipText(Inter.getLocText("FR-Designer_Clear_All"));
 		selectedall = new UIButton(BaseUtils.readIcon("com/fr/design/images/log/selectedall.png"));
 		selectedall.setMargin(null);
 		selectedall.setOpaque(false);
 		selectedall.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		selectedall.setToolTipText(Inter.getLocText("Select_All"));
+		selectedall.setToolTipText(Inter.getLocText("FR-Designer_Select_All"));
 		set = new UIButton(BaseUtils.readIcon("com/fr/design/images/log/setting.png"));
 		set.setMargin(null);
 		set.setOpaque(false);
 		set.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		set.setToolTipText(Inter.getLocText("Set"));
+		set.setToolTipText(Inter.getLocText("FR-Designer_Set"));
 
 		this.add(clear);
 		this.add(selectedall);
@@ -94,29 +85,14 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 		timerPaint();
 	}
 
-	public synchronized void timerPaint() {
+
-		isWithSerious = true;
+	private AtomicBoolean painting = new AtomicBoolean(false);
-		timer = new Timer(500, null);
+
-		ActionListener taskAction = new ActionListener() {
+	public  void timerPaint() {
-			public void actionPerformed(ActionEvent e) {
+		if(!painting.get()) {
-				if (i < 5) {
+			painting.set(true);
-					isWithSerious = i % 2 == 0 ? true : false;
 			repaint();
-				} else if (i == 5) {
+			painting.set(false);
-					if (timer == null)
-						return;
-					timer.stop();
-					timer = null;
-					i = 0;
-					isWithSerious = true;
-					return;
-				}
-				i++;
-			}
-		};
-		if (timer != null) {
-			timer.addActionListener(taskAction);
-			timer.start();
 		}
 	}
 
@@ -197,11 +173,16 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 			Insets insets = target.getInsets();
 			int top = insets.top;
 			int right = target.getWidth() - insets.right;
-			clear.setBounds(right - 130, top + 4, clear.getPreferredSize().width, clear.getPreferredSize().height);
+			clear.setBounds(right - CLEAR_OFFSET, top + TOP_OFFSET, clear.getPreferredSize().width, clear.getPreferredSize().height);
-			selectedall.setBounds(right - 100, top + 4, selectedall.getPreferredSize().width, selectedall.getPreferredSize().height);
+			selectedall.setBounds(right - SELECT_OFFSET, top + TOP_OFFSET, selectedall.getPreferredSize().width, selectedall.getPreferredSize().height);
-			set.setBounds(right - 70, top + 4, set.getPreferredSize().width, set.getPreferredSize().height);
+			set.setBounds(right - SET_OFFSET, top + TOP_OFFSET, set.getPreferredSize().width, set.getPreferredSize().height);
 
 		}
+
+		private static final  int CLEAR_OFFSET = 130;
+		private static final  int TOP_OFFSET = 4;
+		private static final  int SELECT_OFFSET = 100;
+		private static final  int SET_OFFSET = 70;
 	}
 
 }

designer_base/src/com/fr/design/preview/WriteEnhancePreview.java

@@ -0,0 +1,40 @@
+package com.fr.design.preview;
+
+import com.fr.base.io.IOFile;
+import com.fr.design.fun.impl.AbstractPreviewProvider;
+import com.fr.general.Inter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by loy on 2017/7/7.
+ */
+public class WriteEnhancePreview extends AbstractPreviewProvider {
+    @Override
+    public String nameForPopupItem() {
+        return Inter.getLocText("FR-Designer_Write_Enhance_Preview");
+    }
+
+    @Override
+    public String iconPathForPopupItem() {
+        return "com/fr/design/images/buttonicon/writes.png";
+    }
+
+    @Override
+    public String iconPathForLarge() {
+        return "com/fr/design/images/buttonicon/writeb24.png";
+    }
+
+    @Override
+    public int previewTypeCode() {
+        return IOFile.WRITE_PREVIEW_TYPE;
+    }
+
+    @Override
+    public Map<String, Object> parametersForPreview() {
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("op", "write_ex");
+        return map;
+    }
+}

designer_base/src/com/fr/start/BaseDesigner.java

@@ -17,13 +17,15 @@ import com.fr.design.fun.impl.GlobalListenerProviderManager;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.TemplatePane;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
-import com.fr.design.module.DesignModule;
 import com.fr.design.utils.DesignUtils;
 import com.fr.env.SignIn;
 import com.fr.file.FILE;
 import com.fr.file.FILEFactory;
 import com.fr.file.FileFILE;
-import com.fr.general.*;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.FRLogger;
+import com.fr.general.Inter;
+import com.fr.general.ModuleContext;
 import com.fr.plugin.PluginCollector;
 import com.fr.plugin.manage.PluginManager;
 import com.fr.stable.*;
@@ -66,9 +68,6 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         //下面这两句的位置不能随便调换，因为会影响语言切换的问题
         initLanguage();
 
-        // 先加载设计器的国际化文件
-        Inter.loadLocaleFile(GeneralContext.getLocale(), DesignModule.LOCALE_FILE_PATH);
-
         SplashWindow splashWindow = new SplashWindow(createSplashPane());
         if (args != null) {
             for (String arg : args) {

designer_chart/src/com/fr/design/chart/report/GisMapTableDataContentPane.java

@@ -74,6 +74,12 @@ public class GisMapTableDataContentPane extends FurtherBasicBeanPane<GisMapTable
 
         addressType = new UIButtonGroup<String>(new String[]{Inter.getLocText("Chart-Gis_Address"), Inter.getLocText("Chart-Gis_LatLng")});
         lnglatOrder = new UIButtonGroup<String>(new String[]{Inter.getLocText("Chart-Lng_First"),Inter.getLocText("Chart-Lat_First")});
+		addressType.addChangeListener(new ChangeListener() {
+			@Override
+			public void stateChanged(ChangeEvent e) {
+				orderPane.setVisible(addressType.getSelectedIndex() == 1);
+			}
+		});
         addressBox = new UIComboBox();
 		addressNameBox = new UIComboBox();
 		double p = TableLayout.PREFERRED;

designer_chart/src/com/fr/design/mainframe/chart/ChartsConfigPane.java

@@ -14,11 +14,11 @@ public abstract class ChartsConfigPane <T extends Charts> extends AbstractChartA
 
     public final static String CHART_STYLE_TITLE = Inter.getLocText("Chart-Style_Name");
 
-    public abstract Class<? extends Charts> accptType();
+    public abstract Class<? extends Charts> acceptType();
 
     @Override
     public void populate(ChartCollection collection) {
-        if (StableUtils.classInstanceOf(collection.getSelectedChart().getClass(),accptType())) {
+        if (StableUtils.classInstanceOf(collection.getSelectedChart().getClass(), acceptType())) {
             populate(collection, (T)collection.getSelectedChart());
         }
     }
@@ -27,7 +27,7 @@ public abstract class ChartsConfigPane <T extends Charts> extends AbstractChartA
 
     @Override
     public void update(ChartCollection collection) {
-        if (StableUtils.classInstanceOf(collection.getSelectedChart().getClass(),accptType())) {
+        if (StableUtils.classInstanceOf(collection.getSelectedChart().getClass(), acceptType())) {
             update(collection, (T)collection.getSelectedChart());
         }
     }

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java

@@ -24,7 +24,7 @@ import java.awt.*;
 public class MeterPlotReportDataContentPane extends AbstractReportDataContentPane {
 	
 	private static final String CATENAME = Inter.getLocText(new String[]{"ChartF-Meter", "StyleFormat-Category", "WF-Name"});
-	private static final String NVALUE = Inter.getLocText("Needle Value");
+	private static final String NVALUE = Inter.getLocText("Chart-Pointer_Value");
 	
 	private TinyFormulaPane singCatePane;
 	private TinyFormulaPane singValuePane;
@@ -59,7 +59,7 @@ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPan
 		double[] cs = {p};
 		components = new Component[][]{
 				new Component[]{new JSeparator()},
-				new Component[]{new BoldFontTextLabel(Inter.getLocText("Data_Filter"))},
+				new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Designer_Data_Filter"))},
 				new Component[]{filterPane = new ChartDataFilterPane(new MeterPlot(), parent)},
 		};
 		JPanel pane = TableLayoutHelper.createTableLayoutPane(components, rowSize, cs);

designer_form/src/com/fr/design/mainframe/FormArea.java

@@ -9,11 +9,7 @@ import java.awt.Insets;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
+import java.awt.event.*;
-import java.awt.event.ActionListener;
-import java.awt.event.FocusAdapter;
-import java.awt.event.FocusEvent;
-import java.awt.event.MouseEvent;
 
 import javax.swing.JComponent;
 import javax.swing.JPanel;
@@ -71,6 +67,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
 	private double START_VALUE = DEFAULT_SLIDER;
 	private int resolution = ScreenResolution.getScreenResolution();
 	private double screenValue;
+	private boolean isCtrl = false;
 
 	public FormScrollBar getHorScrollBar() {
 		return horScrollBar;
@@ -105,8 +102,39 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
 			addFormRuler();
 		}
 		this.setFocusTraversalKeysEnabled(false);
+		this.designer.addMouseWheelListener(showValSpinnerMouseWheelListener);
+		this.designer.addKeyListener(showValSpinnerKeyListener);
 	}
 
+
+	KeyListener showValSpinnerKeyListener = new KeyListener() {
+		@Override
+		public void keyTyped(KeyEvent e) {
+
+		}
+		@Override
+		public void keyPressed(KeyEvent e) {
+			if( e.isControlDown()){
+				isCtrl = true ;
+			}
+		}
+		@Override
+		public void keyReleased(KeyEvent e) {
+			isCtrl = false ;
+		}
+	};
+
+	MouseWheelListener showValSpinnerMouseWheelListener = new MouseWheelListener() {
+		@Override
+		public void mouseWheelMoved(MouseWheelEvent e) {
+			if (isCtrl){
+				int dir = e.getWheelRotation();
+				int old_resolution = (int) slidePane.getShowVal().getValue();
+				slidePane.getShowVal().setValue(old_resolution - (dir * SHOWVALMIN));
+			}
+		}
+	};
+
 	/**
 	 * 增加表单的页面大小控制界面，包括手动修改和滑块拖动
 	 */

designer_form/src/com/fr/design/mainframe/JForm.java

@@ -1,13 +1,10 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.DynamicUnitList;
-import com.fr.base.ScreenResolution;
 import com.fr.design.DesignState;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.actions.file.WebPreviewUtils;
 import com.fr.design.cell.FloatElementsProvider;
-import com.fr.design.cell.bar.DynamicScrollBar;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.beans.actions.CopyAction;
 import com.fr.design.designer.beans.actions.CutAction;
@@ -29,8 +26,6 @@ import com.fr.design.mainframe.actions.FormMobileAttrAction;
 import com.fr.design.mainframe.actions.TemplateParameterAction;
 import com.fr.design.mainframe.form.FormECCompositeProvider;
 import com.fr.design.mainframe.form.FormECDesignerProvider;
-import com.fr.design.mainframe.form.FormElementCasePaneDelegate;
-import com.fr.design.mainframe.form.FormReportComponentComposite;
 import com.fr.design.mainframe.templateinfo.JFormProcessInfo;
 import com.fr.design.mainframe.templateinfo.TemplateProcessInfo;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
@@ -52,9 +47,6 @@ import com.fr.form.ui.container.WLayout;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
-import com.fr.grid.Grid;
-import com.fr.grid.GridUtils;
-import com.fr.report.ReportHelper;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.bridge.StableFactory;
@@ -112,6 +104,10 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
         return processInfo;
     }
 
+    public FormECCompositeProvider getReportComposite(){
+        return this.reportComposite;
+    }
+
     @Override
     public void setJTemplateResolution(int resolution) {
 
@@ -264,25 +260,6 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
 
     @Override
     public void setScale(int resolution) {
-        this.resolution = resolution;
-        ElementCasePane elementCasePane = ((FormReportComponentComposite)reportComposite).elementCaseDesigner.getEditingElementCasePane();
-        elementCasePane.setResolution(resolution);
-        elementCasePane.getGrid().getGridMouseAdapter().setResolution(resolution);
-        elementCasePane.getGrid().setResolution(resolution);
-        //更新Grid
-        Grid grid = elementCasePane.getGrid();
-        DynamicUnitList rowHeightList = ReportHelper.getRowHeightList(elementCasePane.getEditingElementCase());
-        DynamicUnitList columnWidthList = ReportHelper.getColumnWidthList(elementCasePane.getEditingElementCase());
-        grid.setVerticalExtent(GridUtils.getExtentValue(0, rowHeightList, grid.getHeight(), resolution));
-        grid.setHorizontalExtent(GridUtils.getExtentValue(0, columnWidthList, grid.getWidth(), resolution));
-        elementCasePane.getGrid().updateUI();
-        //更新Column和Row
-        ((DynamicScrollBar)elementCasePane.getVerticalScrollBar()).setDpi(resolution);
-        ((DynamicScrollBar)elementCasePane.getHorizontalScrollBar()).setDpi(resolution);
-        elementCasePane.getGridColumn().setResolution(resolution);
-        elementCasePane.getGridColumn().updateUI();
-        elementCasePane.getGridRow().setResolution(resolution);
-        elementCasePane.getGridRow().updateUI();
     }
 
     @Override
@@ -292,26 +269,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
 
     @Override
     public int selfAdaptUpdate() {
-        if (resolution == 0){
+        return 0;
-            resolution = ScreenResolution.getScreenResolution();
-        }
-        ElementCasePane elementCasePane = ((FormReportComponentComposite)reportComposite).elementCaseDesigner.getEditingElementCasePane();
-        ElementCasePane reportPane = elementCasePane.getGrid().getElementCasePane();
-        int column = reportPane.getSelection().getSelectedColumns()[0];
-        double columnLength = reportPane.getSelection().getSelectedColumns().length;
-        double columnExtent = reportPane.getGrid().getHorizontalExtent();
-        int row = reportPane.getSelection().getSelectedRows()[0];
-        double rowLength = reportPane.getSelection().getSelectedRows().length;
-        double rowExtent = reportPane.getGrid().getVerticalExtent();
-        if (columnLength == 0||rowLength == 0){
-            return resolution;
-        }
-        double time =(columnExtent/columnLength)<(rowExtent/rowLength) ? (columnExtent/columnLength) : (rowExtent/rowLength);
-        if (reportPane.isHorizontalScrollBarVisible()) {
-            reportPane.getVerticalScrollBar().setValue(row);
-            reportPane.getHorizontalScrollBar().setValue(column);
-        }
-        return (int) (time * elementCasePane.getGrid().getResolution());
     }
 
     /**