openautomation-svn — Mailinglist that shows all subversion commits

[Openautomation-svn] SF.net SVN: openautomation:[405] wiregate/tools/knxquery/knxquery.pl

[<e....@us...>]

Revision: 405
          http://openautomation.svn.sourceforge.net/openautomation/?rev=405&view=rev
Author:   e.max
Date:     2011-08-13 18:12:44 +0000 (Sat, 13 Aug 2011)

Log Message:
-----------
Id property gesetzt

Property Changed:
----------------
    wiregate/tools/knxquery/knxquery.pl


Property changes on: wiregate/tools/knxquery/knxquery.pl
___________________________________________________________________
Added: svn::keywords
   + Id


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[404] wiregate

[<e....@us...>]

Revision: 404
          http://openautomation.svn.sourceforge.net/openautomation/?rev=404&view=rev
Author:   e.max
Date:     2011-08-13 18:11:14 +0000 (Sat, 13 Aug 2011)

Log Message:
-----------
knxquery.pl, a Wiregate kny querying tool, first version

Added Paths:
-----------
    wiregate/tools/
    wiregate/tools/knxquery/
    wiregate/tools/knxquery/gpl.txt
    wiregate/tools/knxquery/knxquery.pl

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

Added: wiregate/tools/knxquery/knxquery.pl
===================================================================
--- wiregate/tools/knxquery/knxquery.pl	                        (rev 0)
+++ wiregate/tools/knxquery/knxquery.pl	2011-08-13 18:11:14 UTC (rev 404)
@@ -0,0 +1,417 @@
+#!/usr/bin/perl -w
+# $Id$
+# 
+# knx bus value query script
+#
+# Copyright (C) 2011 Edgar <emax> Hermanns, <emax at berlios punkt de>
+# All Rights Reserved
+#
+# This work is derived from the wiregated.pl script by Michael Markstaller
+# Parts of the script Copyright Michael Markstaller and others 
+#
+# 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 2 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, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+
+use strict;
+use Getopt::Long;
+use Config::Std { def_sep => '=', read_config => 'my_read_cfg' };
+use Switch;
+use EIBConnection;
+
+# use Data::Dumper;
+
+my $debug=0;
+my %eibgaconf;
+my $eib_url = "local:/tmp/eib";
+
+my ($dump_arg, $read_arg, $ga_arg, $age_arg, $dpt_arg, $help);
+
+sub usage
+{
+    system "perldoc $0";
+    print "\n@_\n" if ( @_ );
+    exit;
+} # usage
+
+sub dumpGa
+{
+    # koennte man mit dem Dumper machen ... 
+    #    print Dumper(%eibgaconf), "\n";
+    # ... soll aber schoener aussehen:
+
+    my ($dptid, $dptsubid, $dptname, $gaName) = ('','','');
+
+    &printGaInfo($_) foreach (sort keys %eibgaconf);
+} # dumpGa
+
+sub printGaInfo
+{
+    my $ga = shift || die "\n\n fehlender GA-paramater in printGaInfo()\n\n";
+
+    # koennte man mit dem Dumper machen ... 
+    #    print Dumper(%eibgaconf), "\n";
+    # ... soll aber schoener aussehen:
+
+    my ($dptid, $dptsubid, $dptname, $gaName) = ('','','');
+
+    if (!exists $eibgaconf{$ga})
+    {
+	$gaName = "!!! GA ist nicht konfiguriert !!!\n";
+	$dptid = $dptname = $dptsubid = '?' ;		
+    }
+    else
+    {	
+	$dptid    = $eibgaconf{$ga}{DPTId};
+	$dptsubid = $eibgaconf{$ga}{DPTSubId};
+	$dptname  = $eibgaconf{$ga}{DPT_SubTypeName};
+	$gaName   = $eibgaconf{$ga}{name};
+    }
+    printf "%-15s%-9s%-16s%-25s%s\n",
+    "GA[$ga]",
+    "DPTId[$dptid]",
+    "DPTSubID[$dptsubid]",
+    "DPTName[$dptname]",
+    "$gaName";
+} # printGaInfo
+
+
+# sub addr2str {
+#     my $a = $_[0];
+#     my $b = $_[1] || 0;  # 1 if local (group) address, else physical address
+#     my $str ;
+#     if ($b == 1) { # logical address used
+#         $str = sprintf "%d/%d/%d", ($a >> 11) & 0xf, ($a >> 8) & 0x7, $a & 0xff;
+#     }
+#     else { # physical address used
+#         $str = sprintf "%d.%d.%d", $a >> 12, ($a >> 8) & 0xf, $a & 0xff;
+#     }
+#     return $str;
+# }
+
+# str2addr: Convert an EIB address string in the form "1/2/3" or "1.2.3" to an integer
+sub str2addr {
+    my $str = $_[0];
+    if ($str =~ /(\d+)\/(\d+)\/(\d+)/) { # logical address
+        return ($1 << 11) | ($2 << 8) | $3;
+    } elsif ($str =~ /(\d+)\.(\d+)\.(\d+)/) { # physical address
+        return ($1 << 12) | ($2 << 8) | $3;
+    } else {
+    	#bad
+    	return;
+    }
+} # str2addr
+
+sub decode_dpt9 {
+    my @data = @_;
+#     print "\n";
+#     print "D: $_\n" foreach (@data);
+    my $res;
+
+    unless ($#data == 2) {
+    	($data[1],$data[2]) = split(' ',$data[0]);
+    	$data[1] = hex $data[1];
+    	$data[2] = hex $data[2];
+        unless (defined $data[2]) {
+            return;
+        }
+    }
+    my $sign = $data[1] & 0x80;
+    my $exp = ($data[1] & 0x78) >> 3;
+    my $mant = (($data[1] & 0x7) << 8) | $data[2];
+
+    $mant = -(~($mant - 1) & 0x7ff) if $sign != 0;
+    $res = (1 << $exp) * 0.01 * $mant;
+    return $res;
+} # decode_dpt9 
+
+sub decode_dpt4 { #1byte char
+    return sprintf("%c", hex(shift));
+}
+
+sub decode_dpt5 { #1byte unsigned percent
+    return sprintf("%.1f", hex(shift) * 100 / 255);
+}
+
+sub decode_dpt510 { #1byte unsigned UChar
+    return hex(shift);
+}
+
+sub decode_dpt6 { #1byte signed 
+    my $val = hex(shift);
+    return $val > 127 ? $val-256 : $val;
+}
+
+sub decode_dpt7 { #2byte unsigned 
+    my @val = split(" ",shift);
+    return (hex($val[0])<<8) + hex($val[1]);
+}
+
+sub decode_dpt8 { #2byte signed 
+    my @val = split(" ",shift);
+    my $val2 = (hex($val[0])<<8) + hex($val[1]);
+    return $val2 > 32767 ? $val2-65536 : $val2;
+}
+
+sub decode_dpt10 { #3byte time
+    my @val = split(" ",shift);
+    my @wd = qw(Null Mo Di Mi Do Fr Sa So);
+    $val[0] = hex($val[0]);
+    $val[1] = hex($val[1]);
+    $val[2] = hex($val[2]);
+    unless ($val[2]) { return; }
+    my $day = ($val[0] & 0xE0) >> 5;
+    my $hour    = $val[0] & 0x1F;
+    my $minute  = $val[1];
+    my $second  = $val[2];
+    return sprintf("%s %02i:%02i:%02i",$wd[$day],$hour,$minute,$second);
+}
+
+sub decode_dpt11 { #3byte date
+    my @val = split(" ",shift);
+    my @wd = qw(Null Mo Di Mi Do Fr Sa So);
+    $val[0] = hex($val[0]);
+    $val[1] = hex($val[1]);
+    $val[2] = hex($val[2]);
+    unless ($val[2]) { return; }
+    my $mday    = $val[0] & 0x1F;
+    my $mon     = $val[1] & 0x0F;
+    my $year    = $val[2] & 0x7F;
+    $year = $year < 90 ? $year+2000 : $year+1900; # 1990 - 2089
+    return sprintf("%04i-%02i-%02i",$year,$mon,$mday);
+}
+
+sub decode_dpt12 { #4byte unsigned 
+    my @val = split(" ",shift);
+    return (hex($val[0])<<24) + (hex($val[1])<<16) + (hex($val[2])<<8) + hex($val[3]);
+}
+
+sub decode_dpt13 { #4byte signed 
+    my @val = split(" ",shift);
+    my $val2 = (hex($val[0])<<24) + (hex($val[1])<<16) + (hex($val[2])<<8) + hex($val[3]);
+    return $val2 >  2147483647 ? $val2-4294967296 : $val2;
+}
+
+sub decode_dpt14 { #4byte float
+    #Perls unpack for float is somehow strange broken
+    my @val = split(" ",shift);
+    my $val2 = (hex($val[0])<<24) + (hex($val[1])<<16) + (hex($val[2])<<8) + hex($val[3]);
+    my $sign = ($val2 & 0x80000000) ? -1 : 1;
+    my $expo = (($val2 & 0x7F800000) >> 23) - 127;
+    my $mant = ($val2 & 0x007FFFFF | 0x00800000);
+    my $num = $sign * (2 ** $expo) * ( $mant / (1 << 23));
+    return sprintf("%.4f",$num);
+}
+
+sub decode_dpt16 { # 14byte char
+    my @val = split(" ",shift);
+    my $chars;
+    for (my $i=0;$i<14;$i++) {
+        $chars .= sprintf("%c", hex($val[$i]));
+    }
+    return sprintf("%s",$chars);
+}
+
+sub encode_dpt5 {
+    my $value = shift;
+    $value = 100 if ($value > 100);
+    $value = 0 if ($value < 0);;
+    my $byte = sprintf ("%.0f", $value * 255 / 100);
+    return($byte);
+}
+
+sub decode_dpt {
+    my $dst = shift;
+    my $data = shift;
+    my $dpt = shift;
+    my $value;
+    my $dptid = $eibgaconf{$dst}{'DPTSubId'} || $dpt || 0;
+    ($debug) and print STDERR "DBG:decode_dpt, dptid[$dptid], data[$data]\n";
+    $data  =~ s/\s+$//g;
+    switch ($dptid) {
+        case /^10/      { $value = decode_dpt10($data) }
+        case /^11/      { $value = decode_dpt11($data) }
+        case /^12/      { $value = decode_dpt12($data) }
+        case /^13/      { $value = decode_dpt13($data) }
+        case /^14/      { $value = decode_dpt14($data) }
+        case /^16/      { $value = decode_dpt16($data) }
+        case /^\d\d/    { return; } # other DPT XX 15 are unhandled
+        case /^1/       { $value = int($data) }
+        case /^2/       { $value = int($data) } # somehow wrong 2bit
+        case /^3/       { $value = int($data) } # somehow wrong 4bit
+        case /^4/       { $value = decode_dpt4($data) } 
+        case [5,5.001]  { $value = decode_dpt5($data) }
+        case [5.004,5.005,5.010] { $value = decode_dpt510($data) }
+        case /^6/ { $value = decode_dpt6($data) }
+        case /^7/ { $value = decode_dpt7($data) }
+        case /^8/ { $value = decode_dpt8($data) }
+        case /^9/ { $value = decode_dpt9($data) }
+        else   { return; } # nothing
+    }
+    return $value;
+}
+
+sub knx_read {
+    my $dst = $_[0];
+    my $age = $_[1] || 0; # read hot unless defined
+    my $dpt = $_[2];
+
+#    ($debug) and print "1[$dst], 2[$age], 3[$dpt]\n";
+
+    my $src=EIBConnection::EIBAddr();
+    my $buf=EIBConnection::EIBBuffer();
+    my $hexbytes;
+    my $leibcon = EIBConnection->EIBSocketURL($eib_url) or return("Error: $!");
+    my $res=$leibcon->EIB_Cache_Read_Sync(str2addr($dst), $src, $buf, $age);
+    if (!defined $res) { return; } # ("ReadError: $!");
+    $leibcon->EIBClose();
+    # $$src contains source PA
+    
+    my @data = unpack ("C" . bytes::length($$buf), $$buf);
+    if ($res == 2) { # 6bit only
+        return sprintf("%02X", ($data[1] & 0x3F));
+    } else {
+        for (my $i=2; $i<= $res-1; $i++) {
+            $hexbytes = $hexbytes . sprintf("%02X ", ($data[$i]));
+        }
+        return decode_dpt($dst,$hexbytes,$dpt);
+    } 
+}
+
+# ------------- main
+
+usage() if ( ! GetOptions  ('help|h|?' => \$help, 
+			    'd|dump'   => \$dump_arg,
+			    'r|read'   => \$read_arg,
+                            'ga|g=s'   => \$ga_arg,
+                            'age|a=i'  => \$age_arg,
+                            'dpt|t=s'  => \$dpt_arg
+	     )
+	     or defined $help );
+
+if (-e '/etc/wiregate/eibga.conf') 
+{ 
+    my_read_cfg '/etc/wiregate/eibga.conf' => %eibgaconf;
+} 
+else 
+{
+    print "WARNUNG: unable to read config[/etc/wiregate/eibga.conf]\n";
+}
+
+
+if ($dump_arg)
+{   
+    if ($ga_arg) {
+	printGaInfo($ga_arg);
+    } else {
+	dumpGa($ga_arg);
+    }
+
+    exit;
+}
+
+if ($read_arg)
+{
+    if (!defined $ga_arg)
+    {
+	print "FEHLER: Fuer READ bitte die Gruppenadresse angeben (EINGABETASTE druecken ...).";
+	getc(STDIN);
+	exit;
+    }
+
+    if (!defined $dpt_arg && !exists $eibgaconf{$ga_arg})
+    {
+	print "FEHLER: Unbekannte Gruppenadresse, bitte Datentyp angegeben (EINGABETASTE druecken ...).";
+	getc(STDIN);
+	exit;
+    }
+
+    (!$age_arg) and $age_arg = 1;
+
+    my $res = knx_read($ga_arg, $age_arg, $dpt_arg);
+    if ($res)
+    {
+	print "GELESEN:ga[$ga_arg], res[$res]\n";
+    }
+    else
+    {
+	print "FEHLER: READ ga[$ga_arg]\n";
+    }
+    exit;
+}
+
+die "\n\nFEHLER: weder --read noch --dump angegeben\n\n";
+
+=pod
+
+=head1 NAME
+
+B<knxquery.pl> -- Einen Wert vom KNX-Bus lesen
+
+=head1 UEBERSICHT
+
+B<knxquery.pl> -h 
+
+B<knxquery.pl> -r -g GA [-a AGE] [-t DPT]
+
+B<knxquery.pl> -d [-g GA]
+
+ 
+=head1 BESCHREIBUNG
+
+B<knxquery.pl> liest einen Wert vom  KNX-Bus und gibt diesen auf stdout aus.
+
+=head1 OPTIONEN
+
+=over
+
+=item B<-h | --help>  Anzeige dieser Hilfe.
+
+=item B<-r | --read>  Liest einen Wert vom KNX-Bus. Die Gruppenandresse B<GA> 
+muss angegeben werden. Wenn die Gruppenadresse nicht in der Konfiguration 
+hinterlegt ist, muss ausserdem der datentyp B<DPT> angegeben werden.
+
+=item B<-d | --dump>  Gibt Informationen zu einer oder zu allen Gruppenadressen
+aus.  Wird eine B<GA> angegeben, werden Informationen nur zu dieser Adresse
+ausgegeben. Wird keine Gruppenadresse angegeben, werden Informationen zu allen
+konfigurierten Adressen ausgegeben. 
+
+=item B<-g | --ga> Angabe der Gruppenadresse B<GA> deren Wert zu lesen ist  
+oder zu der Informationen ausgegeben werden sollen. Die Adresse muss im 
+Format B<H/M/U>, angegeben werden, wobei B<H> die Hauptgruppe, B<M> die 
+Mittelgruppe und B<U> die Untergruppe ist.
+
+=item B<-a | --age> Maximales Cache-Alter B<AGE> des zu lesenden Wertes in Sekunden. 
+Unterlassungswert ist 1 Sekunde.
+
+=item B<-t | --dpt>   Angabe des Datentyps B<DPT>. Dieser Wert muss nur 
+angegeben werden, wenn die Gruppenadresse nicht in der Konfiguration 
+erfasst ist. Es reicht der Haupttyp, also z.B. B<1, 2, 3> ... usw.
+
+=back
+
+=head1 VORAUSSETZUNGEN
+
+Das Script wurde f\xFCr das B<Wiregate> Gateway geschrieben, und erwartet eine 
+diesem Gateway entsprechende Konfiguration. Der Rechner muss an einen KNX-Bus
+angeschlossen sein, und Zugriff auf diesen Bus haben, z.B. per EIB-TPUART. 
+
+=head1 MITWIRKENDE
+
+Teile des Scripts sind Copyright Michael Markstaller 
+
+=head1 COPYRIGHT
+
+Copyright (c) 2011 Edgar <emax> Hermanns, <emax at berlios punkt de>
+
+=cut


Property changes on: wiregate/tools/knxquery/knxquery.pl
___________________________________________________________________
Added: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[403] wiregate/plugin/generic/Dreambox-Text

[<sw...@us...>]

Revision: 403
          http://openautomation.svn.sourceforge.net/openautomation/?rev=403&view=rev
Author:   swiss1
Date:     2011-08-12 21:30:30 +0000 (Fri, 12 Aug 2011)

Log Message:
-----------
Ein BUG wurde behoben, damit das Plugin nun auf jedem Wiregate funktionieren sollte. Version 0.2 BETA

Modified Paths:
--------------
    wiregate/plugin/generic/Dreambox-Text

Modified: wiregate/plugin/generic/Dreambox-Text
===================================================================
--- wiregate/plugin/generic/Dreambox-Text	2011-08-11 17:36:44 UTC (rev 402)
+++ wiregate/plugin/generic/Dreambox-Text	2011-08-12 21:30:30 UTC (rev 403)
@@ -1,43 +1,44 @@
-# Plugin zum versenden von Textmeldungen an die Dreambox
-# Version 0.1 13.03.2011
-# Copyright: swiss (http://knx-user-forum.de/members/swiss.html)
-# License: GPL (v2)
-# Aufbau möglichst so, dass man unterhalb der Einstellungen nichts verändern muss!
-
-
-####################
-###Einstellungen:###
-####################
-
-
-my $aufrufende_ga = '1/1/1';
-my $dreambox_ip = '192.168.1.11';
-my $text = 'Zeile1&Zeile2&Zeile3&usw...'; #Für mehrere Zeilen einfach zwischen den Zeilen ein & einfügen
-
-my $timeout = 10; #Zeit in sekunden in der die Meldung angezeigt wird
-my $type = 2; #Meldungstyp: 1=Info, 2=Neutral, 3=Fehler
-
-
-######################
-##ENDE Einstellungen##
-######################
-
-
-# Eigenen Aufruf-Zyklus auf 1T setzen
-$plugin_info{$plugname.'_cycle'} = 86400; 
-# Zyklischer Aufruf nach restart und alle 86400 sek., dient dem anmelden an die Gruppenadresse, einmalig (0) würde in diesem Fall auch genügen
-
-
-
-if ($msg{'apci'} eq "A_GroupValue_Write" and $msg{'dst'} eq $aufrufende_ga) {
-
-while($text =~ /&/) {
-$text =~ s/&/%20%5Cn/;
-}
-
-get( "http://".$dreambox_ip."/web/message?text=".$text."&type=".$type."&timeout=".$timeout );
-} else { # zyklischer Aufruf
-   # Plugin an Gruppenadresse "anmelden", hierdurch wird das Plugin im folgenden bei jedem eintreffen eines Telegramms auf die GA aufgerufen und der obere Teil dieser if-Schleife durchlaufen
-   $plugin_subscribe{$aufrufende_ga}{$plugname} = 1;
-}
-
+# Plugin zum versenden von Textmeldungen an die Dreambox
+# Version 0.2 12.08.2011
+# Copyright: swiss (http://knx-user-forum.de/members/swiss.html)
+# License: GPL (v2)
+# Aufbau möglichst so, dass man unterhalb der Einstellungen nichts verändern muss!
+
+
+####################
+###Einstellungen:###
+####################
+
+
+my $aufrufende_ga = '1/1/1';
+my $dreambox_ip = '192.168.1.11';
+my $text = 'Zeile1&Zeile2&Zeile3&usw...'; #Für mehrere Zeilen einfach zwischen den Zeilen ein & einfügen
+
+my $timeout = 10; #Zeit in sekunden in der die Meldung angezeigt wird
+my $type = 2; #Meldungstyp: 1=Info, 2=Neutral, 3=Fehler
+
+
+######################
+##ENDE Einstellungen##
+######################
+
+use LWP::Simple;
+
+# Eigenen Aufruf-Zyklus auf 1T setzen
+$plugin_info{$plugname.'_cycle'} = 86400; 
+# Zyklischer Aufruf nach restart und alle 86400 sek., dient dem anmelden an die Gruppenadresse, einmalig (0) würde in diesem Fall auch genügen
+
+
+
+if ($msg{'apci'} eq "A_GroupValue_Write" and $msg{'dst'} eq $aufrufende_ga) {
+
+while($text =~ /&/) {
+$text =~ s/&/%20%5Cn/;
+}
+
+get( "http://".$dreambox_ip."/web/message?text=".$text."&type=".$type."&timeout=".$timeout );
+} else { # zyklischer Aufruf
+   # Plugin an Gruppenadresse "anmelden", hierdurch wird das Plugin im folgenden bei jedem eintreffen eines Telegramms auf die GA aufgerufen und der obere Teil dieser if-Schleife durchlaufen
+   $plugin_subscribe{$aufrufende_ga}{$plugname} = 1;
+}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[402] CometVisu/trunk/visu/lib/templateengine.js

[<ma...@us...>]

Revision: 402
          http://openautomation.svn.sourceforge.net/openautomation/?rev=402&view=rev
Author:   makki1
Date:     2011-08-11 17:36:44 +0000 (Thu, 11 Aug 2011)

Log Message:
-----------
revert relative path to cgi-bin

Modified Paths:
--------------
    CometVisu/trunk/visu/lib/templateengine.js

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2011-08-10 19:46:59 UTC (rev 401)
+++ CometVisu/trunk/visu/lib/templateengine.js	2011-08-11 17:36:44 UTC (rev 402)
@@ -25,7 +25,7 @@
 var main_scroll;
 var old_scroll = '';
 
-visu = new CometVisu('../cgi-bin/');//{};
+visu = new CometVisu('/cgi-bin/');//{};
 visu.update = function( json ) // overload the handler
 {
   for( key in json )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[401] CometVisu/trunk/visu/transforms/ transform_knx.js

[<ma...@us...>]

Revision: 401
          http://openautomation.svn.sourceforge.net/openautomation/?rev=401&view=rev
Author:   makki1
Date:     2011-08-10 19:46:59 +0000 (Wed, 10 Aug 2011)

Log Message:
-----------
Add DPT16 to transform_knx - grrrmpf, dont trash DPT14 - copy&paste :o

Modified Paths:
--------------
    CometVisu/trunk/visu/transforms/transform_knx.js

Modified: CometVisu/trunk/visu/transforms/transform_knx.js
===================================================================
--- CometVisu/trunk/visu/transforms/transform_knx.js	2011-08-10 19:39:08 UTC (rev 400)
+++ CometVisu/trunk/visu/transforms/transform_knx.js	2011-08-10 19:46:59 UTC (rev 401)
@@ -268,7 +268,7 @@
     }
   },
   '14': {
-    link  : '16.001',
+    link  : '14.001',
     name  : '4 byte float',
     lname : {
       'de': '4 Byte Gleitkommazahl'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[400] CometVisu/trunk/visu/transforms/ transform_knx.js

[<ma...@us...>]

Revision: 400
          http://openautomation.svn.sourceforge.net/openautomation/?rev=400&view=rev
Author:   makki1
Date:     2011-08-10 19:39:08 +0000 (Wed, 10 Aug 2011)

Log Message:
-----------
Add DPT16 to transform_knx - forgot to remove debugging

Modified Paths:
--------------
    CometVisu/trunk/visu/transforms/transform_knx.js

Modified: CometVisu/trunk/visu/transforms/transform_knx.js
===================================================================
--- CometVisu/trunk/visu/transforms/transform_knx.js	2011-08-10 19:38:27 UTC (rev 399)
+++ CometVisu/trunk/visu/transforms/transform_knx.js	2011-08-10 19:39:08 UTC (rev 400)
@@ -281,7 +281,6 @@
       'de': '14 Byte Text ISO-8859-1'
     },
     decode: function( hex ){
-    	console.log('16-val: ' + hex);
       var val="";        
       var chars;
       for (var i=0;i<28;i=i+2) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[399] CometVisu/trunk/visu/transforms/ transform_knx.js

[<ma...@us...>]

Revision: 399
          http://openautomation.svn.sourceforge.net/openautomation/?rev=399&view=rev
Author:   makki1
Date:     2011-08-10 19:38:27 +0000 (Wed, 10 Aug 2011)

Log Message:
-----------
Add DPT16 to transform_knx (UTF8 vs 8859-1 maybe not yet perfect but ASCII works)

Modified Paths:
--------------
    CometVisu/trunk/visu/transforms/transform_knx.js

Modified: CometVisu/trunk/visu/transforms/transform_knx.js
===================================================================
--- CometVisu/trunk/visu/transforms/transform_knx.js	2011-08-09 19:07:58 UTC (rev 398)
+++ CometVisu/trunk/visu/transforms/transform_knx.js	2011-08-10 19:38:27 UTC (rev 399)
@@ -268,13 +268,47 @@
     }
   },
   '14': {
-    link  : '14.001',
+    link  : '16.001',
     name  : '4 byte float',
     lname : {
       'de': '4 Byte Gleitkommazahl'
     },
     unit  : '-'
   },
+  '16.001' : {
+    name  : 'DPT_String_8859_1',
+    lname : {
+      'de': '14 Byte Text ISO-8859-1'
+    },
+    decode: function( hex ){
+    	console.log('16-val: ' + hex);
+      var val="";        
+      var chars;
+      for (var i=0;i<28;i=i+2) {
+          chars=parseInt(hex.substr(i,2),16);
+          if (chars>0) {
+            val+=String.fromCharCode(chars);
+          }
+      }
+      return val;
+    }
+  },
+  '16.000': {
+    link  : '16.001',
+    name  : 'DPT_String_ASCII',
+    lname : {
+      'de': '14 Byte Text ASCII'
+    },
+    unit  : '-'
+  },
+  '16': {
+    link  : '16.001',
+    name  : 'DPT_String_ASCII',
+    lname : {
+      'de': '14 Byte Text ASCII'
+    },
+    unit  : '-'
+  },
   '20.102': {
     name  : 'DPT_HVACMode',
     lname : {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[398] CometVisu/trunk/visu/lib

[<ma...@us...>]

Revision: 398
          http://openautomation.svn.sourceforge.net/openautomation/?rev=398&view=rev
Author:   makki1
Date:     2011-08-09 19:07:58 +0000 (Tue, 09 Aug 2011)

Log Message:
-----------
Quirk to workaround a cache-issue with some Android/Webkit and make relative path to cgi-bin - be reverse-proxy friendlier

Modified Paths:
--------------
    CometVisu/trunk/visu/lib/cometvisu-client.js
    CometVisu/trunk/visu/lib/templateengine.js

Modified: CometVisu/trunk/visu/lib/cometvisu-client.js
===================================================================
--- CometVisu/trunk/visu/lib/cometvisu-client.js	2011-08-09 17:59:51 UTC (rev 397)
+++ CometVisu/trunk/visu/lib/cometvisu-client.js	2011-08-09 19:07:58 UTC (rev 398)
@@ -151,7 +151,12 @@
    */
   this.write = function( address, value )
   {
-    var request = 'a=' + address + '&v=' + value;
+    /**
+     * ts is a quirk to fix wrong caching on some Android-tablets/Webkit;
+     * could maybe selective based on UserAgent but isn't that costly on writes
+     */
+    var ts = new Date().getTime();
+    var request = 'a=' + address + '&v=' + value + '&ts=' + ts;
     $.ajax( {url:this.urlPrefix + 'w',dataType: 'json',context:this,data:request} );
   }
   
@@ -185,3 +190,4 @@
 };
 
 CometVisu.prototype.update = function( json ) {}
+

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2011-08-09 17:59:51 UTC (rev 397)
+++ CometVisu/trunk/visu/lib/templateengine.js	2011-08-09 19:07:58 UTC (rev 398)
@@ -25,7 +25,7 @@
 var main_scroll;
 var old_scroll = '';
 
-visu = new CometVisu('/cgi-bin/');//{};
+visu = new CometVisu('../cgi-bin/');//{};
 visu.update = function( json ) // overload the handler
 {
   for( key in json )
@@ -382,4 +382,4 @@
     if( src.indexOf('?') < 0 ) src += '?';
     $(this).data('interval', setInterval( function(){refreshAction(target, src);}, refresh ) );
   }
-}
\ No newline at end of file
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[397] wiregate/plugin/generic/rrd_graph.pl

[<ma...@us...>]

Revision: 397
          http://openautomation.svn.sourceforge.net/openautomation/?rev=397&view=rev
Author:   makki1
Date:     2011-08-09 17:59:51 +0000 (Tue, 09 Aug 2011)

Log Message:
-----------
Create RRD Graphs plugin

Added Paths:
-----------
    wiregate/plugin/generic/rrd_graph.pl

Added: wiregate/plugin/generic/rrd_graph.pl
===================================================================
--- wiregate/plugin/generic/rrd_graph.pl	                        (rev 0)
+++ wiregate/plugin/generic/rrd_graph.pl	2011-08-09 17:59:51 UTC (rev 397)
@@ -0,0 +1,65 @@
+# Demo-Plugin Grafiken in RRD speichern
+
+# Eigenen Aufruf-Zyklus auf 300 Sekunden (Default globales RRD-Intervall) setzen
+$plugin_info{$plugname.'_cycle'} = $wg_config{''}{'rrd_interval'};
+
+update_rrd("WZ_temp","",knx_read("3/1/36",0,9));
+update_rrd("Kueche_temp","",knx_read("3/1/46",0,9));
+update_rrd("Schlafen_temp","",knx_read("3/2/56",0,9));
+update_rrd("Ankleide_temp","",knx_read("3/2/66",0,9));
+update_rrd("Zisterne","",knx_read("5/5/101",0,9));
+
+update_rrd("S300TH_temp","",knx_read("14/4/6",0,9));
+update_rrd("S300TH_hum","",knx_read("14/4/7",0,5));
+
+
+return;
+# PI-Regler
+update_rrd("WC-Stell_HS","",knx_read("3/1/55",0,5));
+update_rrd("WC-Stell_PI-Plugin","",knx_read("14/5/53",0,5));
+update_rrd("SZ-Stell_PI-Plugin","",knx_read("14/5/63",0,5));
+update_rrd("SZ-Stell_HS","",knx_read("3/2/55",0,5));
+
+# Luftfeuchte Bad
+
+# Einen Wert der Luftfeuchte von der Gruppenadresse 5/2/79 in einem rrd speichern
+# Luftfeuchte_Bad_knx5-2-79 ist ein beliebiger Text; keine Umlaute oder Sonderzeichen (/\: etc)
+# und einmalig!
+# Dann wird die Funktion knx_read mit der Gruppenadresse aufgerufen, diese liefert 
+# jedoch nur den rohen "Byte-Wert" vom Bus bzw. aus dem cache (max. Alter 300s, 
+# sonst wird ein Lesetelegramm abgesetzt und die Antwort abgewartet)
+# Dieser Bytewert (0-255) wird dann von der Funktion decode_dpt5 in 0-100(%) 
+# umgewandelt.
+update_rrd("Luftfeuchte_Bad_knx5-2-79","",knx_read("5/2/79",300,9));
+
+# Luftfeuchte Duschbad: Man kann genauso schreiben:
+my $wert = knx_read("5/2/19",300,9);
+update_rrd("Luftfeuchte_Duschbad_knx5-2-19","",$wert);
+
+# Beispiel fuer Temperaturwert (DPT9/EIS5)
+update_rrd("Temp_Kueche_knx3-1-46","",knx_read("3/1/46",300,9));
+
+# Abgerufen koennen die Grafiken durch Modifikation der Grafik-URL eines vorhandenen 
+# 1-Wire Sensors werden: z.B. 28.0D22CB010000_temp.rrd im letzten Beispiel durch
+# Temp_Kueche_knx3-1-46.rrd ersetzen. Gross/Kleinschreibung beachten!
+
+
+#     DPT 1 (1 bit) = EIS 1/7 (move=DPT 1.8, step=DPT 1.7)
+#     DPT 2 (1 bit controlled) = EIS 8 
+#     DPT 3 (3 bit controlled) = EIS 2 
+#     DPT 4 (Character) = EIS 13
+#     DPT 5 (8 bit unsigned value) = EIS 6 (DPT 5.1) oder EIS 14.001 (DPT 5.10)
+#     DPT 6 (8 bit signed value) = EIS 14.000
+#     DPT 7 (2 byte unsigned value) = EIS 10.000
+#     DPT 8 (2 byte signed value) = EIS 10.001
+#     DPT 9 (2 byte float value) = EIS 5
+#     DPT 10 (Time) = EIS 3
+#     DPT 11 (Date) = EIS 4
+#     DPT 12 (4 byte unsigned value) = EIS 11.000
+#     DPT 13 (4 byte signed value) = EIS 11.001
+#     DPT 14 (4 byte float value) = EIS 9
+#     DPT 15 (Entrance access) = EIS 12
+#     DPT 16 (Character string) = EIS 15
+
+#return "RRDs wurden aktualisiert";
+return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[396] wiregate/plugin/generic/emx_uhr.pl

[<e....@us...>]

Revision: 396
          http://openautomation.svn.sourceforge.net/openautomation/?rev=396&view=rev
Author:   e.max
Date:     2011-08-07 08:59:37 +0000 (Sun, 07 Aug 2011)

Log Message:
-----------
svn property Id gesetzt

Modified Paths:
--------------
    wiregate/plugin/generic/emx_uhr.pl

Modified: wiregate/plugin/generic/emx_uhr.pl
===================================================================
--- wiregate/plugin/generic/emx_uhr.pl	2011-08-07 08:55:30 UTC (rev 395)
+++ wiregate/plugin/generic/emx_uhr.pl	2011-08-07 08:59:37 UTC (rev 396)
@@ -1,7 +1,9 @@
 # Plugin zum Zeitabhaengigen Schalten von GA's (Schaltuhr)
 # License: GPL (v2)
 # version von emax
+#
 # $Id$
+#
 # Copyright: Edgar (emax) Hermanns, emax at berlios Punkt de
 #--------------------------------------------------------------------
 #  CHANGE LOG:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[395] wiregate/plugin/generic/emx_uhr.pl

[<e....@us...>]

Revision: 395
          http://openautomation.svn.sourceforge.net/openautomation/?rev=395&view=rev
Author:   e.max
Date:     2011-08-07 08:55:30 +0000 (Sun, 07 Aug 2011)

Log Message:
-----------
umlaute durch ae/ue/oe ersetzt (utf-8 problem)

Modified Paths:
--------------
    wiregate/plugin/generic/emx_uhr.pl

Property Changed:
----------------
    wiregate/plugin/generic/emx_uhr.pl

Modified: wiregate/plugin/generic/emx_uhr.pl
===================================================================
--- wiregate/plugin/generic/emx_uhr.pl	2011-08-06 12:32:32 UTC (rev 394)
+++ wiregate/plugin/generic/emx_uhr.pl	2011-08-07 08:55:30 UTC (rev 395)
@@ -1,12 +1,20 @@
-# Plugin zum Zeitabhängigen Schalten von GA's (Schaltuhr)
+# Plugin zum Zeitabhaengigen Schalten von GA's (Schaltuhr)
 # License: GPL (v2)
 # version von emax
-# Version 1, 8.7.2011
+# $Id$
 # Copyright: Edgar (emax) Hermanns, emax at berlios Punkt de
+#--------------------------------------------------------------------
+#  CHANGE LOG:
+#  ##  who  yyyymmdd   bug#  description
+#  --  ---  --------  -----  ----------------------------------------
+#   .  ...  ........  .....  vorlage 
+#   1  edh  20110807  -----  wg. utf-8 Zirkus Umlaute in ae/ue/oe geaendert
+#   0  edh  20110708  -----  erste Version
+ 
 
-####################
-###Einstellungen:###
-####################
+#---------------
+# Einstellungen:
+#---------------
 
 my @Zeiten = 
     ( 
@@ -16,39 +24,39 @@
       { Name=>'AussenlichtAus', Aktiv=>'1', Std=>'7',   Min=> '0',  MTag=>undef, Mon=>undef, WTag=>'2,4,6', Wert=>'0', DPT=>'1', GA=>'1/2/40' }
     );
 
-######################
-##ENDE Einstellungen##
-######################
+#-------------------  
+# ENDE Einstellungen  
+#-------------------  
 
 use POSIX;
 
-############################################################
+#--------------------------------------------------------------------
 # Eigenen Aufruf-Zyklus setzen
 # Das script verarbeitet keine Sekunden, weshalb die kleinste 
-# Granulaität ohne zusätzlioche Statusverarbeitung eine Minute ist. 
-############################################################
+# Granulaitaet ohne zusaetzlioche Statusverarbeitung eine Minute ist. 
+#--------------------------------------------------------------------
 my $cycleTime = 60;
 
-############################################################
-# definiert die Sekunde, ab der neu synchronisiert wird    #
-############################################################
+#--------------------------------------------------------------------
+# definiert die Sekunde, ab der neu synchronisiert wird
+#--------------------------------------------------------------------
 my $slotEnd = 10; 
 
-############################################################
+#--------------------------------------------------------------------
 # Die Versionsnummer ist Teil des plugin_info hashes und dient
 # dazu, dass das script definierte Anfangskonditionen findet 
-# auch ohne alles neu starten zu müssen. Die Nummer 
-# einfach nach einer Änderung des scripts um eins erhöhen.
-############################################################
+# auch ohne alles neu starten zu muessen. Die Nummer 
+# einfach nach einer AEnderung des scripts um eins erhoehen.
+#--------------------------------------------------------------------
 my $version = 1;
 
-###################################################################
-# Auswertung von Bereichs und Listenvergleichen                   #
-# Prüft, ob ein Wert zu einer Liste oder in einen Bereich passt   #
-###################################################################
+#--------------------------------------------------------------------
+# Auswertung von Bereichs und Listenvergleichen 
+# Prueft, ob ein Wert zu einer Liste oder in einen Bereich passt
+#--------------------------------------------------------------------
 sub matches
 {
-    my ($value, $def) = @_;  # Zu prüfender Wert, Bereichsdefinition
+    my ($value, $def) = @_;  # Zu pruefender Wert, Bereichsdefinition
     (!$def) and return 1;
     foreach (split(/,/, $def))
     {        
@@ -59,9 +67,9 @@
     return 0;
 }
 
-##########
-# main() #
-##########
+#====================================================================
+# main()
+#====================================================================
 
 # kontrollierte Startkonditionen setzen
 if (!defined $plugin_info{$plugname.$version.'firstRun'}) 
@@ -75,19 +83,19 @@
 my ($curSec,$curMin,$curStu,$curMTag,$curMon,$curJahr,$curWTag,$curJTag,$isdst) = localtime(time);
 $curJahr += 1900;
 
-#######################################################################
-# Es ist sinnvoll, dafür zu sorgen, dass die Startzeit dieses Plugins 
-# mit der Zeit nicht "abdriftet", da sonst über lange Laufzeiten ein 
-# Minutenüberlauf entstehen könnte, und so Ereignisse verloren gingen.
-# Aus diesem Grund prüft das script, ob es innerhalb der ersten 10 Sekunden 
-# einer Minute läuft, Wenn das nicht der Fall ist, wird so lange eine 
-# verkürzte Zykluszeit verwendet, bis die Ausführung wieder im vorgesehenen 
-# Zeitraum abläuft.
+#--------------------------------------------------------------------  
+# Es ist sinnvoll, dafuer zu sorgen, dass die Startzeit dieses Plugins 
+# mit der Zeit nicht "abdriftet", da sonst ueber lange Laufzeiten ein 
+# Minutenueberlauf entstehen koennte, und so Ereignisse verloren gingen.
+# Aus diesem Grund prueft das script, ob es innerhalb der ersten 10 Sekunden 
+# einer Minute laeuft, Wenn das nicht der Fall ist, wird so lange eine 
+# verkuerzte Zykluszeit verwendet, bis die Ausfuehrung wieder im vorgesehenen 
+# Zeitraum ablaeuft.
 #
-# Bei der Erstausführung des Plugins nimmt dieses erst nach Erreichen 
+# Bei der Erstausfuehrung des Plugins nimmt dieses erst nach Erreichen 
 # des vorgesehenen Zeitfensters die eigentliche Arbeit auf, weil der 
-# Abstand zwischen zwei sonst zu klein werden könnte.
-#######################################################################
+# Abstand zwischen zwei sonst zu klein werden koennte.
+#--------------------------------------------------------------------
 
 if ($curSec >= $slotEnd)
 {
@@ -97,11 +105,11 @@
             $plugin_info{$plugname.'_cycle'} = 1;
     }
     
-    # bei Erstausführung auf Zeitfenster warten
+    # bei Erstausfuehrung auf Zeitfenster warten
     ($plugin_info{$plugname.$version.'firstRun'} == 1) and return;
 }
 
-# prüfen, ob in dieser Minute bereits ausgeführt
+# pruefen, ob in dieser Minute bereits ausgefuehrt
 (defined $plugin_info{$plugname.$version.'lastMinute'} && $plugin_info{$plugname.$version.'lastMinute'} == $curMin) and return;
 
 foreach my $Zeit (@Zeiten) 


Property changes on: wiregate/plugin/generic/emx_uhr.pl
___________________________________________________________________
Added: svn::keywords
   + Id


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[394] wiregate/plugin/generic/chumby_weckzeit.pl

[<sw...@us...>]

Revision: 394
          http://openautomation.svn.sourceforge.net/openautomation/?rev=394&view=rev
Author:   swiss1
Date:     2011-08-06 12:32:32 +0000 (Sat, 06 Aug 2011)

Log Message:
-----------
Eine wetere Textausgabe f?\195?\188r "wann" wurde hinzugef?\195?\188gt, Ein BUG wurde behoben. Version 0.4 BETA

Modified Paths:
--------------
    wiregate/plugin/generic/chumby_weckzeit.pl

Modified: wiregate/plugin/generic/chumby_weckzeit.pl
===================================================================
--- wiregate/plugin/generic/chumby_weckzeit.pl	2011-08-06 11:23:45 UTC (rev 393)
+++ wiregate/plugin/generic/chumby_weckzeit.pl	2011-08-06 12:32:32 UTC (rev 394)
@@ -1,5 +1,5 @@
 # Plugin zum auslesen der Weckzeit aus dem Chumby
-# Version 0.3 BETA 06.08.2011
+# Version 0.4 BETA 06.08.2011
 # Copyright: swiss (http://knx-user-forum.de/members/swiss.html)
 # License: GPL (v2)
 # Aufbau m\xF6glichst so, dass man unterhalb der Einstellungen nichts ver\xE4ndern muss!
@@ -12,11 +12,22 @@
 
 my $chumby_ip = "192.168.1.7"; #Hier die IP-Adresse des Chumby eintragen.
 
+#
+#Hier die beschreibung der Parameter:
+#Nichtben\xF6tigte Parameter einfach auf '' setzen. z.B. text_ga => ''
+#
+#
+# $weckzeit{ '' } Hier muss der genaue Name der Weckzeit aus dem Chumby eingetragen werden
+# text_zeit_ga => '10/1/0' Hier kann man eine GA eintragen um die Weckzeit als 14Byte-text an den BUS zu senden.
+# text_wann_ga => '10/1/1' Hier kann man eine GA eintragen um die g\xFCltigkeit der Weckzeit (wann) als 14Byte-Text an den BUS zu senden.
+# ga_aktiv => '10/1/1' ier kann man eine GA eintragen um den Status (inaktiv/aktiv) als 1Bit (0/1) an den BUS zu senden
+#
 
+
 #Pro Weckzeit die auf den BUS gesendet werden soll, muss ein entsprechender Eintrag angelegt werden. z.B $weckzeit_ga{ 'test' } = { text_ga => '10/2/0', ga_aktiv => '10/2/1', ga_alarm => '10/2/2', };
-$weckzeit{ '' } = { text_ga => '10/1/0', ga_aktiv => '10/1/1', };
-$weckzeit{ 'test' } = { text_ga => '10/2/0', ga_aktiv => '10/2/1', };
-$weckzeit{ 'test_1' } = { text_ga => '', ga_aktiv => '10/3/1', };
+$weckzeit{ '' } = { text_zeit_ga => '10/1/0', text_wann_ga => '10/1/1', ga_aktiv => '10/1/2', };
+$weckzeit{ 'test' } = { text_zeit_ga => '10/2/0', text_wann_ga => '10/2/1', ga_aktiv => '10/2/2', };
+$weckzeit{ 'test_1' } = { text_zeit_ga => '10/3/0', text_wann_ga => '10/3/1', ga_aktiv => '10/3/2', };
 
 
 ######################
@@ -27,9 +38,22 @@
 # Zyklischer Aufruf nach restart und alle 30 sek.
 
 use XML::Simple;
+use LWP::Simple;
 use Encode qw(encode decode);
 # use open ":utf8";
 
+my %uebersetzungstabelle = ("daily" => "T\xE4glich",
+		     "weekend" => "Wochenends",
+		     "weekday" => "Mo - Fr",
+		     "sunday" => "Sonntags",
+		     "monday" => "Montags",
+		     "tuesday" => "Dienstags",
+		     "wednesday" => "Mittwochs",
+		     "thursday" => "Donnerstags",
+		     "friday" => "Freitags",
+		     "saturday" => "Sammstags",);
+
+
 my $command = "ping -c 2 -w 2 ".$chumby_ip;
 my $status = `$command`;
 if($status =~ /bytes from/) {
@@ -40,13 +64,18 @@
 	
 	while ((my $key) = each %{$alarms}) {
 		if (exists $weckzeit{$key}){
-			if ($weckzeit{$key}{text_ga} ne ''){
+			if ($weckzeit{$key}{text_zeit_ga} ne ''){
 				my $zeitdez = $alarms->{$key}->{time} / 60;
 				my $minuten = $alarms->{$key}->{time} % 60;
 				my $stunde = int $zeitdez;
 				my $zeit = $stunde . ":" . $minuten;
-				knx_write($weckzeit{$key}{text_ga},$zeit,16);
+				
+				knx_write($weckzeit{$key}{text_zeit_ga},$zeit,16);
 			}
+			if ($weckzeit{$key}{text_wann_ga} ne ''){
+				my $text_wann = $uebersetzungstabelle{$alarms->{$key}->{when}} . " um ";
+				knx_write($weckzeit{$key}{text_wann_ga},$text_wann,16);
+			}
 			if ($weckzeit{$key}{ga_aktiv} ne ''){
 				knx_write($weckzeit{$key}{ga_aktiv},$alarms->{$key}->{enabled},1.001);
 			}
@@ -56,5 +85,3 @@
 }elsif($status =~ /0 received/) {
 	return "Ein Fehler ist beim Testen der IP $chumby_ip aufgetreten";
 }
-
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[393] wiregate/plugin/generic/chumby_weckzeit.pl

[<sw...@us...>]

Revision: 393
          http://openautomation.svn.sourceforge.net/openautomation/?rev=393&view=rev
Author:   swiss1
Date:     2011-08-06 11:23:45 +0000 (Sat, 06 Aug 2011)

Log Message:
-----------
Plugin f?\195?\188r zuk?\195?\188nftige Erweiterungen angepasst. ein paar kleine BUG's behoben. Versoin 0.3 BETA

Modified Paths:
--------------
    wiregate/plugin/generic/chumby_weckzeit.pl

Modified: wiregate/plugin/generic/chumby_weckzeit.pl
===================================================================
--- wiregate/plugin/generic/chumby_weckzeit.pl	2011-08-06 09:28:01 UTC (rev 392)
+++ wiregate/plugin/generic/chumby_weckzeit.pl	2011-08-06 11:23:45 UTC (rev 393)
@@ -1,5 +1,5 @@
 # Plugin zum auslesen der Weckzeit aus dem Chumby
-# Version 0.2 BETA 06.08.2011
+# Version 0.3 BETA 06.08.2011
 # Copyright: swiss (http://knx-user-forum.de/members/swiss.html)
 # License: GPL (v2)
 # Aufbau m\xF6glichst so, dass man unterhalb der Einstellungen nichts ver\xE4ndern muss!
@@ -8,18 +8,15 @@
 ####################
 ###Einstellungen:###
 ####################
+my %weckzeit;
 
 my $chumby_ip = "192.168.1.7"; #Hier die IP-Adresse des Chumby eintragen.
 
 
-#Pro Weckzeit die als TEXT auf den BUS gesendet werden soll, muss ein entsprechender Eintrag angelegt werden. z.B ('test_1'    => '10/1/2',)
-my %weckzeit_ga = ( 
-    ''   => '10/1/0', #Hier den genauen Namen der Weckzeit und die GA eintragen (14Byte-Text)
-    'test'    => '10/1/1',
-    'test_1'    => '10/1/2',
-    'test_2'     => '10/1/3',
-    
-    );
+#Pro Weckzeit die auf den BUS gesendet werden soll, muss ein entsprechender Eintrag angelegt werden. z.B $weckzeit_ga{ 'test' } = { text_ga => '10/2/0', ga_aktiv => '10/2/1', ga_alarm => '10/2/2', };
+$weckzeit{ '' } = { text_ga => '10/1/0', ga_aktiv => '10/1/1', };
+$weckzeit{ 'test' } = { text_ga => '10/2/0', ga_aktiv => '10/2/1', };
+$weckzeit{ 'test_1' } = { text_ga => '', ga_aktiv => '10/3/1', };
 
 
 ######################
@@ -42,13 +39,22 @@
 	my $alarms = XMLin($xml)->{alarm};
 	
 	while ((my $key) = each %{$alarms}) {
-		my $zeitdez = $alarms->{$key}->{time} / 60;
-		my $minuten = $alarms->{$key}->{time} % 60;
-		my $stunde = int $zeitdez;
-		my $zeit = $stunde . ":" . $minuten;
-		knx_write($weckzeit_ga{$key},$zeit,16);
+		if (exists $weckzeit{$key}){
+			if ($weckzeit{$key}{text_ga} ne ''){
+				my $zeitdez = $alarms->{$key}->{time} / 60;
+				my $minuten = $alarms->{$key}->{time} % 60;
+				my $stunde = int $zeitdez;
+				my $zeit = $stunde . ":" . $minuten;
+				knx_write($weckzeit{$key}{text_ga},$zeit,16);
+			}
+			if ($weckzeit{$key}{ga_aktiv} ne ''){
+				knx_write($weckzeit{$key}{ga_aktiv},$alarms->{$key}->{enabled},1.001);
+			}
+		}
 	}
 	return "Status OK";
 }elsif($status =~ /0 received/) {
 	return "Ein Fehler ist beim Testen der IP $chumby_ip aufgetreten";
-}
\ No newline at end of file
+}
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[392] wiregate/plugin/generic/chumby_weckzeit.pl

[<sw...@us...>]

Revision: 392
          http://openautomation.svn.sourceforge.net/openautomation/?rev=392&view=rev
Author:   swiss1
Date:     2011-08-06 09:28:01 +0000 (Sat, 06 Aug 2011)

Log Message:
-----------
Plugin um die Weckzeiten des Chumby als 14Byte-Text an den BUS zu senden. Version 0.2 BETA

Added Paths:
-----------
    wiregate/plugin/generic/chumby_weckzeit.pl

Added: wiregate/plugin/generic/chumby_weckzeit.pl
===================================================================
--- wiregate/plugin/generic/chumby_weckzeit.pl	                        (rev 0)
+++ wiregate/plugin/generic/chumby_weckzeit.pl	2011-08-06 09:28:01 UTC (rev 392)
@@ -0,0 +1,54 @@
+# Plugin zum auslesen der Weckzeit aus dem Chumby
+# Version 0.2 BETA 06.08.2011
+# Copyright: swiss (http://knx-user-forum.de/members/swiss.html)
+# License: GPL (v2)
+# Aufbau m\xF6glichst so, dass man unterhalb der Einstellungen nichts ver\xE4ndern muss!
+
+
+####################
+###Einstellungen:###
+####################
+
+my $chumby_ip = "192.168.1.7"; #Hier die IP-Adresse des Chumby eintragen.
+
+
+#Pro Weckzeit die als TEXT auf den BUS gesendet werden soll, muss ein entsprechender Eintrag angelegt werden. z.B ('test_1'    => '10/1/2',)
+my %weckzeit_ga = ( 
+    ''   => '10/1/0', #Hier den genauen Namen der Weckzeit und die GA eintragen (14Byte-Text)
+    'test'    => '10/1/1',
+    'test_1'    => '10/1/2',
+    'test_2'     => '10/1/3',
+    
+    );
+
+
+######################
+##ENDE Einstellungen##
+######################
+
+$plugin_info{$plugname.'_cycle'} = 30; 
+# Zyklischer Aufruf nach restart und alle 30 sek.
+
+use XML::Simple;
+use Encode qw(encode decode);
+# use open ":utf8";
+
+my $command = "ping -c 2 -w 2 ".$chumby_ip;
+my $status = `$command`;
+if($status =~ /bytes from/) {
+	my $url = "http://$chumby_ip/cgi-bin/custom/alarms.pl?page=download";
+	my $xml = encode("utf8",get($url));
+	die "Fehler beim aufrufen der URL: $url. Bitte mit Anleitung \xFCberpr\xFCfen." unless defined $xml;
+	my $alarms = XMLin($xml)->{alarm};
+	
+	while ((my $key) = each %{$alarms}) {
+		my $zeitdez = $alarms->{$key}->{time} / 60;
+		my $minuten = $alarms->{$key}->{time} % 60;
+		my $stunde = int $zeitdez;
+		my $zeit = $stunde . ":" . $minuten;
+		knx_write($weckzeit_ga{$key},$zeit,16);
+	}
+	return "Status OK";
+}elsif($status =~ /0 received/) {
+	return "Ein Fehler ist beim Testen der IP $chumby_ip aufgetreten";
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[391] CometVisu/trunk/visu/designs/discreet_slim /basic.css

[<j-...@us...>]

Revision: 391
          http://openautomation.svn.sourceforge.net/openautomation/?rev=391&view=rev
Author:   j-n-k
Date:     2011-07-24 18:34:37 +0000 (Sun, 24 Jul 2011)

Log Message:
-----------
Fix Bug #3376682

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/discreet_slim/basic.css

Modified: CometVisu/trunk/visu/designs/discreet_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_slim/basic.css	2011-07-18 20:45:49 UTC (rev 390)
+++ CometVisu/trunk/visu/designs/discreet_slim/basic.css	2011-07-24 18:34:37 UTC (rev 391)
@@ -88,6 +88,11 @@
   background-color: #101010;
 }
 
+.widget .widget
+{
+  width:98%;
+}
+
 .text > div,
 .link > a {
   float:left;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[390] wiregate/plugin/generic/ Watchdog-SMTP-eMail

[<ma...@us...>]

Revision: 390
          http://openautomation.svn.sourceforge.net/openautomation/?rev=390&view=rev
Author:   makki1
Date:     2011-07-18 20:45:49 +0000 (Mon, 18 Jul 2011)

Log Message:
-----------
Plugin-Watchdog with eMail (SMTP)

Added Paths:
-----------
    wiregate/plugin/generic/Watchdog-SMTP-eMail

Added: wiregate/plugin/generic/Watchdog-SMTP-eMail
===================================================================
--- wiregate/plugin/generic/Watchdog-SMTP-eMail	                        (rev 0)
+++ wiregate/plugin/generic/Watchdog-SMTP-eMail	2011-07-18 20:45:49 UTC (rev 390)
@@ -0,0 +1,42 @@
+# Demo-Plugin zum prüfen auf Timeout-Fehler und eMail-Versand
+use Net::SMTP;
+
+my $Empfaenger = 'me...@ke...';
+my $Absender = 'WireGate <wir...@el...>';
+my $Betreff = "Plugin-Alarm!";
+my $mailserver='mail-out.elabnet.de'; # SMTP-Relay: das muss natuerlich angepasst werden!
+# Das kann tricky sein mit GMX&co..
+# Fix-me: besser waere den lokale Exim-Mailserver zu verwenden
+# Dieser muesste jedoch erst mit einem entspr. Relay konfiguriert werden
+
+$plugin_info{$plugname.'_cycle'} = 300;
+
+my $ret;
+foreach (@plugins) {
+my $plugname2 = basename($_);
+if ($plugin_info{$plugname2.'_timeout_err'} >= $plugin_max_errors) {
+      $ret .= "Alarm: Plugin $plugname2 hat $plugin_info{$plugname2.'_timeout_err'} Timeout-Fehler (Max: $plugin_max_errors)";
+      # Alert
+      if (!$plugin_info{$plugname2.'_timeout_alarm'}) {
+            # sende Warn-eMail
+            my $smtp = Net::SMTP->new($mailserver, Timeout => 5);
+            $smtp->mail($Absender);
+            $smtp->to($Empfaenger); 
+            $smtp->data();
+            $smtp->datasend("To: $Empfaenger\n"); # Empfänger (Header)
+            $smtp->datasend("Subject: $Betreff\n"); # Betreff
+            $smtp->datasend("\n");
+            $smtp->datasend("$ret\n");
+            $smtp->dataend();
+            $smtp->quit;
+        }
+        $plugin_info{$plugname2.'_timeout_alarm'} = 1;
+    } else {
+      # Reset Merker
+      $plugin_info{$plugname2.'_timeout_alarm'} = 0;
+    }
+    #$ret .= "$plugname2 Timeouts: $plugin_info{$plugname2.'_timeout_err'}";
+}
+
+return $ret;
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[389] CometVisu/trunk/visu/designs/alaska

[<pan...@us...>]

Revision: 389
          http://openautomation.svn.sourceforge.net/openautomation/?rev=389&view=rev
Author:   panzaeron
Date:     2011-07-18 12:34:52 +0000 (Mon, 18 Jul 2011)

Log Message:
-----------
Font bei Alaska ge?\195?\164ndert (New Cicle) - Notwendig, weil die Rechte nicht klar waren

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/alaska/basic.css
    CometVisu/trunk/visu/designs/alaska_slim/basic.css

Added Paths:
-----------
    CometVisu/trunk/visu/designs/alaska/fonts/License&ExtrasNewCicle.pdf
    CometVisu/trunk/visu/designs/alaska/fonts/new_cicle_fina.ttf
    CometVisu/trunk/visu/designs/alaska/fonts/new_cicle_gordita.ttf
    CometVisu/trunk/visu/designs/alaska/fonts/new_cicle_semi.ttf
    CometVisu/trunk/visu/designs/alaska_slim/fonts/License&ExtrasNewCicle.pdf
    CometVisu/trunk/visu/designs/alaska_slim/fonts/new_cicle_fina.ttf
    CometVisu/trunk/visu/designs/alaska_slim/fonts/new_cicle_gordita.ttf
    CometVisu/trunk/visu/designs/alaska_slim/fonts/new_cicle_semi.ttf

Removed Paths:
-------------
    CometVisu/trunk/visu/designs/alaska/fonts/AUTHORS
    CometVisu/trunk/visu/designs/alaska/fonts/COPYING
    CometVisu/trunk/visu/designs/alaska/fonts/ChangeLog
    CometVisu/trunk/visu/designs/alaska/fonts/License.txt
    CometVisu/trunk/visu/designs/alaska/fonts/README
    CometVisu/trunk/visu/designs/alaska/fonts/TODO
    CometVisu/trunk/visu/designs/alaska/fonts/alaska_black_nocaps.ttf
    CometVisu/trunk/visu/designs/alaska/fonts/alaska_light_nocaps.ttf
    CometVisu/trunk/visu/designs/alaska_slim/fonts/AUTHORS
    CometVisu/trunk/visu/designs/alaska_slim/fonts/COPYING
    CometVisu/trunk/visu/designs/alaska_slim/fonts/ChangeLog
    CometVisu/trunk/visu/designs/alaska_slim/fonts/License.txt
    CometVisu/trunk/visu/designs/alaska_slim/fonts/README
    CometVisu/trunk/visu/designs/alaska_slim/fonts/TODO
    CometVisu/trunk/visu/designs/alaska_slim/fonts/alaska_black_nocaps.ttf
    CometVisu/trunk/visu/designs/alaska_slim/fonts/alaska_light_nocaps.ttf

Modified: CometVisu/trunk/visu/designs/alaska/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/basic.css	2011-07-14 21:07:44 UTC (rev 388)
+++ CometVisu/trunk/visu/designs/alaska/basic.css	2011-07-18 12:34:52 UTC (rev 389)
@@ -1,10 +1,10 @@
 @import "colors.css";
-@font-face { font-family: Liberation; src:url(fonts/alaska_light_nocaps.ttf); }
-@font-face { font-family: Liberation; font-weight: bold; src:url(fonts/alaska_black_nocaps.ttf); }
+@font-face { font-family: new_cicle; src:url(fonts/new_cicle_fina.ttf); }
+@font-face { font-family: new_cicle; font-weight: bold; src:url(fonts/new_cicle_gordita.ttf); }
 
 body 
 { 
-  font-family: Liberation;
+  font-family: new_cicle,sans-serif;
   font-size: 5.5mm;
   overflow: hidden;
   margin:0;

Deleted: CometVisu/trunk/visu/designs/alaska/fonts/AUTHORS
===================================================================
--- CometVisu/trunk/visu/designs/alaska/fonts/AUTHORS	2011-07-14 21:07:44 UTC (rev 388)
+++ CometVisu/trunk/visu/designs/alaska/fonts/AUTHORS	2011-07-18 12:34:52 UTC (rev 389)
@@ -1,23 +0,0 @@
-AUTHORS
-
-Current Contributors (sorted alphabetically):
-
-  - Caius 'kaio' Chance <caius.chance at gmail.com>
-      Project Owner
-      Red Hat, Inc.
-
-  - Denis Jacquerye <moyogo at gmail.com>
-      Project Contributor
-
-  - Herbert Duerr <duerr at sun.com>
-      Narrow Fonts Contributor
-      Oracle, Inc.
-
-Previous Contributors
-
-  - Steve Matteson
-      Original Designer (support period expired)
-      Ascender, Inc.
-
-  - Mark Webbink <mwebbink AT redhat.com>
-      Release coordinator, Red Hat Inc.

Deleted: CometVisu/trunk/visu/designs/alaska/fonts/COPYING
===================================================================
--- CometVisu/trunk/visu/designs/alaska/fonts/COPYING	2011-07-14 21:07:44 UTC (rev 388)
+++ CometVisu/trunk/visu/designs/alaska/fonts/COPYING	2011-07-18 12:34:52 UTC (rev 389)
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  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
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  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.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE 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.
-
-		     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
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the 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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision 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, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This 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.

Deleted: CometVisu/trunk/visu/designs/alaska/fonts/ChangeLog
===================================================================
--- CometVisu/trunk/visu/designs/alaska/fonts/ChangeLog	2011-07-14 21:07:44 UTC (rev 388)
+++ CometVisu/trunk/visu/designs/alaska/fonts/ChangeLog	2011-07-18 12:34:52 UTC (rev 389)
@@ -1,224 +0,0 @@
-* Wed Jul 21 2010 Pravin Satpute <psa...@re...>
-- Update for New Release 1.06
-- Added New Family Narrow (Contribution from Herbert Duerr <her...@or...>)
-- updated version of fonts
-
-* Mon 10 May 2010 Caius 'kaio' Chance <me at kaio.net>
-- Fixed Romanian glyphs, U+021A, 021B, 0218, 0219, 0162, 0163, 015E, 015F,
-  2010, 2011. (rhbz#440992)
-- Fixed height of arrows U+2190, 2192, 2194. (Issue #2)
-
-* Thu 06 May 2010 Caius 'kaio' Chance <me at kaio.net>
-- Cleaned up points and auto-instructed hinting of 'u', 'v', 'w', 'y'.
-(rhbz#463036)
-- Created the first project icon. (Issue #5)
-
-* Wed May 05 2010 Caius 'kaio' Chance <k at kaio.net>
-- Incorrect cent sign glyph (U+00A2) in Sans and Mono
-style in Liberation fonts. (rhbz#474522)
-
-* Wed 28 Apr 2010 Caius 'kaio' Chance <me at kaio.net>
-- rhbz#510174: Corrected version number of all SFD files.
-- Corrected license exceptions to GPLv2.
-- Updated README file.
-
-* Tue 27 Apr 2010 Caius 'kaio' Chance <me at kaio.net>
-- Renamed Narrow Fonts.
-- Updated list of contributors.
-- Released version 1.05.3.
-
-* Thu 22 Apr 2010 Herbert Duerr <duerr at sun.com>
-- Contributed Liberation Sans Narrow Fonts.
-
-* Fri 12 Mar 2010 Caius 'kaio' Chance <me at kaio.me>
-- Migrated to Google Code.
-- Updated AUTHORS.
-- Upgraded license to GPLv3+exceptions.
-
-* Sun 27 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
-- Fixed ttf pack preparation error.
-
-* Tue 21 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
-- Fixed 'wrongly encoded glyphs after U+10000' (rhbz#525498),
-  provided by Denis Jacquerye <moyogo at gmail.com>.
-
-* Tue 21 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
-- Fixed fontforge script sfd2ttf.pe.
-- Include traditional kern table for Sans and Serif.
-
-* Tue 14 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
-- Generated TTFs with tradition kern table, with fontforge ver 20090408.
-- Added make target alias dist-src as dist-sfd.
-
-* Mon 13 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
-- Updated for generation of traditional kern table via scripts.
-
-* Mon 06 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
-- Reconverted SFDs from original TTFs with traditional kern table.
-- Updated "clean" target in Makefile.
-
-* Tue 30 Jun 2009 Caius 'kaio' Chance <me at kaio.me>
-- Reconverted SFDs from original TTFs with traditional kern table.
-- Updated "clean" target in Makefile.
-
-* Tue 30 Jun 2009 Caius 'kaio' Chance <me at kaio.me>
-- Generated cleaner SFD from original TTFs.
-- Include Makefile in sources tarball.
-
-* Wed 24 Jun 2009 Caius 'kaio' Chance <me at kaio.me>
-- Makefile: pack SFD files as source tarball.
-- Makefile: pack TTF files as ttf packs.
-- Tidy up repository.
-- Updated documents.
-
-* Mon 12 Jan 2009 Caius Chance <cchance at redhat.com>
-- Fixed copyright holder name typo for Sans Regular font (rhbz#479521).
-
-* Tue 09 Dec 2008 Caius Chance <cchance at redhat.com>
-- Changed cent sign glyph (U+00A2) to be coressed in Sans and Mono
-  (rhbz#474522).
-
-* Wed 03 Dec 2008 Caius Chance <cchance at redhat.com>
-- Started 1.04.93.devel.
-- Fixed blurriness of U+03BC for Sans Regular font (rhbz#473481).
-- Fixed src tarball mis-inclusion of dist files in Makefile.
-
-* Fri 28 Nov 2008 Caius Chance <cchance at redhat.com>
-- Corrected version number in Makefile.
-- Fixed make target of source tarball.
-- Uploaded 1.04.92 source tarball to release area.
-
-* Wed 15 Oct 2008 Caius Chance <cchance at redhat.com>
-- Fixed blurred 'u' and 'W' for Sans Bold font (rhbz#463036).
-- Released as version 1.04.92
-
-* Wed 17 Sep 2008 Caius Chance <cchance at redhat.com>
-- Fixed missing hinting instructions for all Mono fonts (rhbz#460090).
-- Fixed missing hinting instructions for all Sans fonts (rhbz#460090).
-- Fixed missing hinting instructions for all Serif fonts (rhbz#460090).
-- Released as version 1.04.91
-
-* Tue 09 Sep 2008 Caius Chance <cchance at redhat.com>
-- Backed up all released files in ./dist directory.
-
-* Fri 05 Sep 2008 Caius Chance <cchance at redhat.com>
-- Fixed incorrect glyph points and missing hinting instructions for:
-  Mono Bold Italic (up to U+2012) (rhbz#460090).
-
-* Mon 25 Aug 2008 Caius Chance <cchance at redhat.com>
-- Fixed incorrect glyph points and missing hinting instructions for:
-  U+0079, U+03BC, U+0431, U+2010..2012, U+1114117 (rhbz#458592).
-- Released as version 1.04.90.
-
-* Thu 13 Jul 2008 Caius Chance <cchance at redhat.com>
-- Released as version 1.04.
-
-* Thu 12 Jun 2008 Caius Chance <cchance at redhat.com>
-- Released as version 1.04.beta2 (1.03.99).
-- Added ZIP package building for non-tar users.
-- rhbz#440992:
-  - Created Romanian "T/t/S/s with comma below" (U+0218..021B) on all fonts.
-  - Fixed "T/s with cedilla below" (U+0162/0163) on all fonts.
-  - Created "Hyphen" and "Non-Breaking Hyphen" (U+2010..2011) on all fonts.
-
-* Wed 11 Jun 2008 Caius Chance <cchance at redhat.com>
-- Added last Version 1.03 from original manufacturer.
-- Renamed directory 'archive' to 'sandbox'.
-- Added directory description in hosting home directory.
-- Created ZIP packages for Version 1.03 and 1.04.beta.
-
-* Tue 04 Jun 2008 Caius Chance <cchance at redhat.com>
-- rhbz#440992:
-  - Created "Hyphen" and "Non-Breaking Hyphen" (U+2010..2011) on Sans Regular.
-
-* Mon 03 Jun 2008 Caius Chance <cchance at redhat.com>
-- rhbz#440992:
-  - Created Romanian "T/t/S/s with comma below" (U+0218..021B) on Sans Regular. 
-  - Fixed "T/s with cedilla below" (U+0162/0163) on Sans Regular.
-
-* Fri 30 May 2008 Caius Chance <cchance at redhat.com>
-- Release Version 1.04.beta (liberation-fonts-1_04_beta).
-
-* Thu 29 May 2008 Caius Chance <cchance at redhat.com>
-- Correct SFD version numbers in "TTF Info" categor for correct version 
-  number during export to TTFs.
-
-* Wed 28 May 2008 Caius Chance <cchance at redhat.com>
-- Reencoded with "Glyph Order" by FontForge.
-- Corrected font name for all Regular fonts.
-- Generated TTFs (experimantal, in "archive") with old stle kern and dummy 
-  DSIG table.
-- Updated README in 1.04b TTFs (experimental, in "archive").
-
-* Tue 27 May 2008 Caius Chance <cchance at redhat.com>
-- Fixed Unicode name mis-mapping of Sans and Serif TTF files.
-- Regenerate SFD files from Unicode name mis-mapping fixed Sans and Serif TTF 
-  files.
-
-* Mon 26 May 2008 Caius Chance <cchance at redhat.com>
-- Fixed Unicode name mis-mapping of Mono TTF files.
-- Regenerate SFD files from Unicode name mis-mapping fixed Mono TTF files.
-==========
-- Applied following patches submitted by Nicolas Spalinger
-  <nicolas_spalinger sil org>:
-  - We-need-versioned-tarballs.
-  - Add-ignore-file-so-the-VCS-does-not-track-the-folder.
-  - Adjust-path-for-various-Makefile-targets-subfolders.
-  - Fix-versionning-mismatch-in-the-binary-font-metadata.
-  - Add-some-description-and-extra-lines-to-the-build-ta.
-  - Reword-and-restructure-maintainers-recommendations.
-  - Some-rewording-of-the-readme-file.
-==========
-	
-* Thu May 22 2008 Caius Chance <cchance at redhat.com>
-- Added latest (1.03) TTF files from Ascender. (in 'archive')
-
-* Fri May 16 2008 Caius Chance <cchance at redhat.com>
-- Change source tree as 'trunk', 'tags', 'branches'.
-==========
-- Applied following patches submitted by Nicolas Spalinger
-  <nicolas_spalinger sil org>:
-  - Add-more-information-about-the-upstream-designer.
-  - Minor-typo-and-layout-fixes.
-  - Adjust-fontforge-path-with-env-as-a-source-build.
-==========
-
-* Wed May 14 2008 Caius Chance <cchance at redhat.com>
-- Renamed target 'ttf' to 'build'.
-- Removed 'Re-Package' chapter from README and refine contents.
-- Changed AUTHORS contents.
-- Created maintainer documentation MAINTAINER.
-
-* Tue May 06 2008 Caius Chance <cchance at redhat.com>
-- Refined clean target.
-- Removed TTFs from git.
-
-* Fri May 02 2008 Caius Chance <cchance at redhat.com>
-- Imported into fedorahosted.org repository and be hosted.
-    https://fedorahosted.org/liberation-fonts/
-- Modified source root directory name definition in Makefile.
-- Created 'dist' target for binary TTF tarball and 'src' for source tarball.
-- Corrected Regular fonts filenames.
-- Added TTF -> SFD make target.
-
-* Thu May 01 2008 Caius Chance <cchance at redhat.com>
-- Converted previous TTF files into SFD files to be open source.
-- Created fontforge SFD -> TTF scripts.
-- Created Makefile.
-- Added documentations: AUTHORS, ChangeLog, README.
-
-* Thu Apr 10 2008 Caius Chance <cchance at redhat.com>
-- Fixed exchanged and incomplete glyphs (from Ascender).
-- Repacked source tarball.
-- Released version 1.03.
-
-* Tue Mar 25 2008 Caius Chance <cchance at redhat.com>
-- Fixed alignment mismatch of dot accents (from Ascender).
-- Released version 1.02.
-
-* Mon Jan 14 2008 Caius Chance <cchance at redhat.com>
-- Updated new source tarball from Ascender.
-- Released version 1.0.
-
-* Thu Jun 14 2007 Caius Chance <cchance at redhat.com>
-- Updated new source tarball from Ascender.

Added: CometVisu/trunk/visu/designs/alaska/fonts/License&ExtrasNewCicle.pdf
===================================================================
(Binary files differ)


Property changes on: CometVisu/trunk/visu/designs/alaska/fonts/License&ExtrasNewCicle.pdf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: CometVisu/trunk/visu/designs/alaska/fonts/License.txt
===================================================================
--- CometVisu/trunk/visu/designs/alaska/fonts/License.txt	2011-07-14 21:07:44 UTC (rev 388)
+++ CometVisu/trunk/visu/designs/alaska/fonts/License.txt	2011-07-18 12:34:52 UTC (rev 389)
@@ -1,19 +0,0 @@
-LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY
-LIBERATION FONT SOFTWARE
-
-This agreement governs the use of the Software and any updates to the Software, regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant to the GNU General Public License v.2 with the exceptions set forth below and such other terms as are set forth in this End User License Agreement.
-
- 1. The Software and License Exception. LIBERATION font software  (the "Software") consists of TrueType-OpenType formatted font software for rendering LIBERATION typefaces in sans-serif, serif, and monospaced character styles. You are licensed to use, modify, copy, and distribute the Software pursuant to the GNU General Public License v.2 with the following exceptions:  
-
-  (a) As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.
-
-  (b) As a further exception, any distribution of the object code of the Software in a physical product must provide you the right to access and modify the source code for the Software and to reinstall that modified version of the Software in object code form on the same physical product on which you received it.
-
- 2. Intellectual Property Rights. The Software and each of its components, including the source code, documentation, appearance, structure and organization are owned by Red Hat and others and are protected under copyright and other laws. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with the aforementioned, subject to the applicable license. The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other countries. This agreement does not permit Client to distribute modified versions of the Software using Red Hat's trademarks. If Client makes a redistribution of a modified version of the Software, then Client must modify the files names to remove any reference to the Red Hat trademarks and must not use the Red Hat trademarks in any way to reference or promote the modified Software. 
-
- 3. Limited Warranty. To the maximum extent permitted under applicable law, the Software is provided and licensed "as is" without warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. Red Hat does not warrant that the functions contained in the Software will meet Client's requirements or that the operation of the Software will be entirely error free or appear precisely as described in the accompanying documentation. 
-
- 4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Software, even if Red Hat or such dealer has been advised of the possibility of such damages. 
-
- 5. General. If any provision of this agreement is held to be unenforceable, that shall not affect the enforceability of the remaining provisions. This agreement shall be governed by the laws of the State of North Carolina and of the United States, without regard to any conflict of laws provisions, except that the United Nations Convention on the International Sale of Goods shall not apply.
-Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc.

Deleted: CometVisu/trunk/visu/designs/alaska/fonts/README
===================================================================
--- CometVisu/trunk/visu/designs/alaska/fonts/README	2011-07-14 21:07:44 UTC (rev 388)
+++ CometVisu/trunk/visu/designs/alaska/fonts/README	2011-07-18 12:34:52 UTC (rev 389)
@@ -1,82 +0,0 @@
-   1. What's this?
-  =================
-
-  The Liberation Fonts is font collection which aims to provide document 
-  layout compatibility as usage of Times New Roman, Arial, Courier New.
-
-
-   2. Requirements
-  =================
-
-  * fontforge is installed.
-    (http://fontforge.sourceforge.net)
-
-
-   3. Install
-  ============
-
-  3.1 Decompress tarball
-
-    You can extract the files by following command:
-
-      $ tar zxvf liberation-fonts-[VERSION].tar.gz
-
-  3.2 Build from the source
-
-    Change into directory liberation-fonts-[VERSION]/ and build from sources by 
-    following commands:
-
-      $ cd liberation-fonts-[VERSION]
-      $ make
-
-    The built font files will be available in 'build' directory.
-
-  3.3 Install to system
-
-    For Fedora, you could manually install the fonts by copying the TTFs to 
-    ~/.fonts for user wide usage, or to /usr/share/fonts/truetype/liberation 
-    for system-wide availability. Then, run "fc-cache" to let that cached.
-
-    For other distributions, please check out corresponding documentation.
-
-
-   4. Usage
-  ==========
-
-  Simply select preferred liberation font in applications and start using.
-
-
-   5. License
-  ============
-
-  This font set had been released under GNU Public License version 2 
-  ("GPLv2") with exceptions.
-
-  Please read file "COPYING" for GPLv2 license.
-
-  Please read file "License.txt" for details of exceptions.
-
-
-   6. For Maintainers
-  ====================
-
-  Before packaging a new release based on a new source tarball, you have to
-  update the version suffix in the Makefile:
-
-    VER = [VERSION]
-
-  Make sure that the defined version corresponds to the font software metadata
-  which you can check with ftinfo/otfinfo or fontforge itself. It is highly 
-  recommended that file 'ChangeLog' is updated to reflect changes.
-
-  Create a tarball with the following command:
-
-    $ make dist
-
-  The new versioned tarball will be available in the dist/ folder as
-  'liberation-fonts-[NEW_VERSION].tar.gz'.
-
-  7. Credits
- ============
-
-  Please read file "AUTHORS" for list of contributors.

Deleted: CometVisu/trunk/visu/designs/alaska/fonts/TODO
===================================================================
--- CometVisu/trunk/visu/designs/alaska/fonts/TODO	2011-07-14 21:07:44 UTC (rev 388)
+++ CometVisu/trunk/visu/designs/alaska/fonts/TODO	2011-07-18 12:34:52 UTC (rev 389)
@@ -1,14 +0,0 @@
-Here are todo for next release
-
-1) resolving bug related with hinting
-	- https://bugzilla.redhat.com/show_bug.cgi?id=606217
-	- https://bugzilla.redhat.com/show_bug.cgi?id=591556
-2) shape improvement
-	- https://bugzilla.redhat.com/show_bug.cgi?id=591559
-	- https://bugzilla.redhat.com/show_bug.cgi?id=487581
-3) Ascent Descent Values Improvement
-	- using absolute values instead of relative values in OS/2 table
-4) RFE: Add Greek Polytonic support to Liberation fonts
-	- need some volunteer to add these shapes
-	- https://bugzilla.redhat.com/show_bug.cgi?id=473842
-	   

Deleted: CometVisu/trunk/visu/designs/alaska/fonts/alaska_black_nocaps.ttf
===================================================================
(Binary files differ)

Deleted: CometVisu/trunk/visu/designs/alaska/fonts/alaska_light_nocaps.ttf
===================================================================
(Binary files differ)

Added: CometVisu/trunk/visu/designs/alaska/fonts/new_cicle_fina.ttf
===================================================================
(Binary files differ)


Property changes on: CometVisu/trunk/visu/designs/alaska/fonts/new_cicle_fina.ttf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: CometVisu/trunk/visu/designs/alaska/fonts/new_cicle_gordita.ttf
===================================================================
(Binary files differ)


Property changes on: CometVisu/trunk/visu/designs/alaska/fonts/new_cicle_gordita.ttf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: CometVisu/trunk/visu/designs/alaska/fonts/new_cicle_semi.ttf
===================================================================
(Binary files differ)


Property changes on: CometVisu/trunk/visu/designs/alaska/fonts/new_cicle_semi.ttf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: CometVisu/trunk/visu/designs/alaska_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/basic.css	2011-07-14 21:07:44 UTC (rev 388)
+++ CometVisu/trunk/visu/designs/alaska_slim/basic.css	2011-07-18 12:34:52 UTC (rev 389)
@@ -1,10 +1,10 @@
 @import "colors.css";
-@font-face { font-family: Liberation; src:url(fonts/alaska_light_nocaps.ttf); }
-@font-face { font-family: Liberation; font-weight: bold; src:url(fonts/alaska_black_nocaps.ttf); }
+@font-face { font-family: new_cicle; src:url(fonts/new_cicle_fina.ttf); }
+@font-face { font-family: new_cicle; font-weight: bold; src:url(fonts/new_cicle_gordita.ttf); }
 
 body 
 { 
-  font-family: Liberation;
+  font-family: new_cicle,sans-serif;
   font-size: 5mm;
   overflow: hidden;
   margin:0;

Deleted: CometVisu/trunk/visu/designs/alaska_slim/fonts/AUTHORS
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/fonts/AUTHORS	2011-07-14 21:07:44 UTC (rev 388)
+++ CometVisu/trunk/visu/designs/alaska_slim/fonts/AUTHORS	2011-07-18 12:34:52 UTC (rev 389)
@@ -1,23 +0,0 @@
-AUTHORS
-
-Current Contributors (sorted alphabetically):
-
-  - Caius 'kaio' Chance <caius.chance at gmail.com>
-      Project Owner
-      Red Hat, Inc.
-
-  - Denis Jacquerye <moyogo at gmail.com>
-      Project Contributor
-
-  - Herbert Duerr <duerr at sun.com>
-      Narrow Fonts Contributor
-      Oracle, Inc.
-
-Previous Contributors
-
-  - Steve Matteson
-      Original Designer (support period expired)
-      Ascender, Inc.
-
-  - Mark Webbink <mwebbink AT redhat.com>
-      Release coordinator, Red Hat Inc.

Deleted: CometVisu/trunk/visu/designs/alaska_slim/fonts/COPYING
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/fonts/COPYING	2011-07-14 21:07:44 UTC (rev 388)
+++ CometVisu/trunk/visu/designs/alaska_slim/fonts/COPYING	2011-07-18 12:34:52 UTC (rev 389)
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  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
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  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.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE 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.
-
-		     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
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the 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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision 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, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever su...
 
[truncated message content]

[Openautomation-svn] SF.net SVN: openautomation:[388] CometVisu/trunk/visu/designs/alaska

[<pan...@us...>]

Revision: 388
          http://openautomation.svn.sourceforge.net/openautomation/?rev=388&view=rev
Author:   panzaeron
Date:     2011-07-14 21:07:44 +0000 (Thu, 14 Jul 2011)

Log Message:
-----------
Design Alaska um blauen und violetten Button erg?\195?\164nzt

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/alaska/colors.css
    CometVisu/trunk/visu/designs/alaska_slim/colors.css

Modified: CometVisu/trunk/visu/designs/alaska/colors.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/colors.css	2011-07-13 18:15:11 UTC (rev 387)
+++ CometVisu/trunk/visu/designs/alaska/colors.css	2011-07-14 21:07:44 UTC (rev 388)
@@ -8,6 +8,26 @@
   color: #999;
 }
 
+.red 
+{
+  color:white;
+}
+
+.green
+{
+  color:white;
+}
+
+.blue
+{
+  color:white;
+}
+
+.purple
+{
+  color:white;
+}
+
 .green.switchPressed, .green.switchUnpressed 
 {
   color: #e8f0de;
@@ -28,24 +48,24 @@
   color: #de898c;
 }
 
-.red 
+.blue.switchPressed, .blue.switchUnpressed 
 {
-  color:white;
+  color: #d9eef7;
 }
 
-.green
+.blue.switchPressed:active, .blue.switchUnpressed:active 
 {
-  color:white;
+  color: #80bed6;
 }
 
-.blue
+.purple.switchPressed, .purple.switchUnpressed 
 {
-  color:#44f;
+  color: #feeef5;
 }
 
-.purple
+.purple.switchPressed:active, .purple.switchUnpressed:active 
 {
-  color:#f4f;
+  color: #f3c3d9;
 }
 
 /* gradient */
@@ -66,6 +86,7 @@
 
 .green.switchPressed, .green.switchUnpressed 
 {
+  border-color: #538312;
   background: #64991e;
   background: -webkit-gradient(linear, left top, left bottom, from(#7db72f), to(#4e7d0e));
   background: -moz-linear-gradient(top,  #7db72f,  #4e7d0e);
@@ -81,6 +102,7 @@
 
 .red.switchPressed, .red.switchUnpressed 
 {
+  border-color: #980c10;
   background: #d81b21;
   background: -webkit-gradient(linear, left top, left bottom, from(#ed1c24), to(#aa1317));
   background: -moz-linear-gradient(top,  #ed1c24,  #aa1317);
@@ -94,6 +116,39 @@
   filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#aa1317', endColorstr='#ed1c24');
 }
 
+.blue.switchPressed, .blue.switchUnpressed 
+{
+  border-color: #0076a3;
+  background: #0095cd;
+  background: -webkit-gradient(linear, left top, left bottom, from(#00adee), to(#0078a5));
+  background: -moz-linear-gradient(top,  #00adee,  #0078a5);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5');
+}
+
+.blue.switchPressed:active, .blue.switchUnpressed:active 
+{
+  background: -webkit-gradient(linear, left top, left bottom, from(#0078a5), to(#00adee));
+  background: -moz-linear-gradient(top,  #0078a5,  #00adee);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#0078a5', endColorstr='#00adee');
+}
+
+.purple.switchPressed, .purple.switchUnpressed 
+{
+  border-color: #d2729e;
+  background: #f895c2;
+  background: -webkit-gradient(linear, left top, left bottom, from(#feb1d3), to(#f171ab));
+  background: -moz-linear-gradient(top,  #feb1d3,  #f171ab);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#feb1d3', endColorstr='#f171ab');
+
+}
+
+.purple.switchPressed:active, .purple.switchUnpressed:active 
+{
+  background: -webkit-gradient(linear, left top, left bottom, from(#f171ab), to(#feb1d3));
+  background: -moz-linear-gradient(top,  #f171ab,  #feb1d3);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#f171ab', endColorstr='#feb1d3');
+}
+
 /* border */
 div#top, .ui-state-default, .ui-widget-content, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, #pages .hr, .widget, .switchPressed, .switchUnpressed, .widget .ui-slider, .widget .ui-slider-handle, .popup_background, #diagramTooltip, .widget IFRAME, .clearfix 
 {
@@ -105,6 +160,8 @@
   background: #ececec;
 }
 
+
+
 /* shadow */
 .switchPressed, .switchUnpressed, .widget .ui-slider, .clearfix, .popup_background, .widget IFRAME 
 {
@@ -113,3 +170,4 @@
   box-shadow: 0 1px 2px rgba(0,0,0,.2);
 }
 
+

Modified: CometVisu/trunk/visu/designs/alaska_slim/colors.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/colors.css	2011-07-13 18:15:11 UTC (rev 387)
+++ CometVisu/trunk/visu/designs/alaska_slim/colors.css	2011-07-14 21:07:44 UTC (rev 388)
@@ -8,6 +8,26 @@
   color: #999;
 }
 
+.red 
+{
+  color:white;
+}
+
+.green
+{
+  color:white;
+}
+
+.blue
+{
+  color:white;
+}
+
+.purple
+{
+  color:white;
+}
+
 .green.switchPressed, .green.switchUnpressed 
 {
   color: #e8f0de;
@@ -28,24 +48,24 @@
   color: #de898c;
 }
 
-.red 
+.blue.switchPressed, .blue.switchUnpressed 
 {
-  color:white;
+  color: #d9eef7;
 }
 
-.green
+.blue.switchPressed:active, .blue.switchUnpressed:active 
 {
-  color:white;
+  color: #80bed6;
 }
 
-.blue
+.purple.switchPressed, .purple.switchUnpressed 
 {
-  color:#44f;
+  color: #feeef5;
 }
 
-.purple
+.purple.switchPressed:active, .purple.switchUnpressed:active 
 {
-  color:#f4f;
+  color: #f3c3d9;
 }
 
 /* gradient */
@@ -66,6 +86,7 @@
 
 .green.switchPressed, .green.switchUnpressed 
 {
+  border-color: #538312;
   background: #64991e;
   background: -webkit-gradient(linear, left top, left bottom, from(#7db72f), to(#4e7d0e));
   background: -moz-linear-gradient(top,  #7db72f,  #4e7d0e);
@@ -81,6 +102,7 @@
 
 .red.switchPressed, .red.switchUnpressed 
 {
+  border-color: #980c10;
   background: #d81b21;
   background: -webkit-gradient(linear, left top, left bottom, from(#ed1c24), to(#aa1317));
   background: -moz-linear-gradient(top,  #ed1c24,  #aa1317);
@@ -94,6 +116,39 @@
   filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#aa1317', endColorstr='#ed1c24');
 }
 
+.blue.switchPressed, .blue.switchUnpressed 
+{
+  border-color: #0076a3;
+  background: #0095cd;
+  background: -webkit-gradient(linear, left top, left bottom, from(#00adee), to(#0078a5));
+  background: -moz-linear-gradient(top,  #00adee,  #0078a5);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5');
+}
+
+.blue.switchPressed:active, .blue.switchUnpressed:active 
+{
+  background: -webkit-gradient(linear, left top, left bottom, from(#0078a5), to(#00adee));
+  background: -moz-linear-gradient(top,  #0078a5,  #00adee);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#0078a5', endColorstr='#00adee');
+}
+
+.purple.switchPressed, .purple.switchUnpressed 
+{
+  border-color: #d2729e;
+  background: #f895c2;
+  background: -webkit-gradient(linear, left top, left bottom, from(#feb1d3), to(#f171ab));
+  background: -moz-linear-gradient(top,  #feb1d3,  #f171ab);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#feb1d3', endColorstr='#f171ab');
+
+}
+
+.purple.switchPressed:active, .purple.switchUnpressed:active 
+{
+  background: -webkit-gradient(linear, left top, left bottom, from(#f171ab), to(#feb1d3));
+  background: -moz-linear-gradient(top,  #f171ab,  #feb1d3);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#f171ab', endColorstr='#feb1d3');
+}
+
 /* border */
 div#top, .ui-state-default, .ui-widget-content, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, #pages .hr, .widget, .switchPressed, .switchUnpressed, .widget .ui-slider, .widget .ui-slider-handle, .popup_background, #diagramTooltip, .widget IFRAME, .clearfix 
 {
@@ -105,6 +160,8 @@
   background: #ececec;
 }
 
+
+
 /* shadow */
 .switchPressed, .switchUnpressed, .widget .ui-slider, .clearfix, .popup_background, .widget IFRAME 
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[387] CometVisu/trunk/visu/plugins

[<ma...@us...>]

Revision: 387
          http://openautomation.svn.sourceforge.net/openautomation/?rev=387&view=rev
Author:   makki1
Date:     2011-07-13 18:15:11 +0000 (Wed, 13 Jul 2011)

Log Message:
-----------
Add gweather (Google)-Plugin, withdraw zweather, Yahoo data is crap

Modified Paths:
--------------
    CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.css

Added Paths:
-----------
    CometVisu/trunk/visu/plugins/gweather/
    CometVisu/trunk/visu/plugins/gweather/gweather.css
    CometVisu/trunk/visu/plugins/gweather/gweather.php
    CometVisu/trunk/visu/plugins/gweather/structure_plugin.js

Removed Paths:
-------------
    CometVisu/trunk/visu/plugins/zweather/

Added: CometVisu/trunk/visu/plugins/gweather/gweather.css
===================================================================
--- CometVisu/trunk/visu/plugins/gweather/gweather.css	                        (rev 0)
+++ CometVisu/trunk/visu/plugins/gweather/gweather.css	2011-07-13 18:15:11 UTC (rev 387)
@@ -0,0 +1,44 @@
+.gweather {
+	overflow: auto;
+	padding: 10px;
+	margin: 10px;
+/*	background: #ccc; */
+}
+
+.gweather div.day {
+	font-family: Verdana;
+	float: left;
+	border: 1px dashed #777;
+/*	background: #bbf; */
+	width: 150px;
+	margin: 5px;
+	padding: 5px;
+}
+
+.gweather img {
+	float: left;
+/*	height: 32px; */
+}
+
+.gweather div.name {
+	font-weight: bold;
+	height: 24px;
+	padding: 4px 4px 4px 4px;
+}
+
+.gweather .condition {
+	font-size: 12px;
+	padding: 0;
+	margin: 5px 0;
+	text-align: left;
+	height: 58px;
+	overflow: hidden;
+}
+
+.gweather .temp {
+	padding: 0;
+	margin: 0;
+	text-align: center;
+}	
+
+

Added: CometVisu/trunk/visu/plugins/gweather/gweather.php
===================================================================
--- CometVisu/trunk/visu/plugins/gweather/gweather.php	                        (rev 0)
+++ CometVisu/trunk/visu/plugins/gweather/gweather.php	2011-07-13 18:15:11 UTC (rev 387)
@@ -0,0 +1,8 @@
+<?php
+header("content-type: text/xml");
+$city = $_GET['city'];
+$lang = $_GET['lang'];
+
+$xmlData = utf8_encode(file_get_contents("http://www.google.com/ig/api?hl=$lang&weather=$city"));
+echo $xmlData;
+?>
\ No newline at end of file

Added: CometVisu/trunk/visu/plugins/gweather/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/gweather/structure_plugin.js	                        (rev 0)
+++ CometVisu/trunk/visu/plugins/gweather/structure_plugin.js	2011-07-13 18:15:11 UTC (rev 387)
@@ -0,0 +1,142 @@
+/* structure_plugin.js (c) 2011 by Michael Markstaller [de...@wi...]
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+*/
+
+/**
+ * This plugins integrates google weather into CometVisu.
+ */
+ 
+$( 'head' ).append( '<link rel="stylesheet" href="plugins/gweather/gweather.css" type="text/css" />' );
+
+VisuDesign_Custom.prototype.addCreator("gweather", {
+    create: function( page, path ) {
+        var $p = $(page);
+
+        function uniqid() {
+            var newDate = new Date;
+            return newDate.getTime();
+        }
+
+        var id = "gweather_" + uniqid();
+
+        var ret_val = $('<div class="widget" />');
+        ret_val.addClass( 'gweather' );
+        var label = '<div class="label">' + page.textContent + '</div>';
+        var actor = $("<div class=\"actor\"><div class=\"gweather\" id=\"" + id + "\">loading</div></div>");
+        var gweather = $("#" + id, actor);
+
+        if ($p.attr("width")) {
+            gweather.css("width", $p.attr("width"));
+        }
+        if ($p.attr("height")) {
+            gweather.css("height", $p.attr("height"));
+        }
+
+        ret_val.append(label).append(actor);
+        console.log("loaded plugin gweather");
+
+        gweather.data("id", id);
+        gweather.data("label", page.textContent);
+        gweather.data("refresh", $p.attr("refresh"));
+        gweather.data("city", $p.attr("city"));
+        gweather.data("lang", $p.attr("lang"));
+        gweather.data("image_url", $p.attr("image_url"));
+        gweather.data("current", $p.attr("current"));
+        gweather.data("forecast", $p.attr("forecast"));
+        refreshGweather(gweather, {});
+
+        return ret_val;
+    },
+    attributes: {
+        width:      {type: "string", required: false},
+        height:     {type: "string", required: false},
+        refresh:    {type: "numeric", required: false},
+        city:       {type: "string", required: true},
+        lang:       {type: "string", required: false},
+        image_url:  {type: "string", required: false},
+        current:    {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
+        forecast:   {type: "list", required: false, list: {'true': "yes", 'false': "no"}}
+    },
+    content: {type: "string", required: true}
+});
+
+function refreshGweather(gweather, data) {
+    var gweather = $(gweather);
+
+    var label = gweather.data("label");
+    var refresh = gweather.data("refresh");
+    var city = gweather.data("city");
+    var lang = gweather.data("lang") || "de";
+    var current = gweather.data("current") || true;
+    var forecast = gweather.data("forecast") || true;
+	 var image_url = gweather.data("image_url") || "http://www.google.com";
+	 var childData	= function(selector, arg)
+	 {
+	 	return selector.find(arg).attr('data');
+	 }
+
+    function addForecastDiv( day, condition, temp, icon ){
+		daydiv = $("<div class='day'></div>");			
+		daydiv.append( "<img src=\""+image_url+icon+"\" />");
+		daydiv.append( "<div class='name'>" + day + "</div>" );
+		daydiv.append( "<p class='condition'>" + condition + "</p>" );
+		daydiv.append( "<p class='temp'>" + temp + "</p>");
+		$(gweather).append(daydiv);
+    }
+
+	 $.ajax({
+	   type: "GET",
+	   datatype: "xml",
+	   data: "city="+encodeURI(city)+"&lang="+lang,
+	   url: "plugins/gweather/gweather.php",
+      success: function(data){
+			$(gweather).text('');
+			if(eval(current)){
+				addForecastDiv(
+					//$(data).find('forecast_information').find('current_date_time').attr('data'),
+					'',
+					$(data).find('current_conditions').find('condition').attr('data') + '<br/>' + 
+					$(data).find('current_conditions').find('humidity').attr('data') + '<br/>' + 
+					$(data).find('current_conditions').find('wind_condition').attr('data'),
+					$(data).find('current_conditions').find('temp_c').attr('data') + '&deg;C',
+					$(data).find('current_conditions').find('icon').attr('data')
+				);
+			}
+	
+			if(eval(forecast)){
+				$(data).find('forecast_conditions').each(function(){
+					addForecastDiv(
+						$(this).find('day_of_week').attr('data'),
+						$(this).find('condition').attr('data'),
+						$(this).find('low').attr('data') + '&deg;C' + ' - ' + 
+						$(this).find('high').attr('data') + '&deg;C',
+						$(this).find('icon').attr('data')
+					);
+				});
+			}
+		}
+	});
+
+    //refresh regularly
+    if (typeof (refresh) != "undefined" && refresh) {
+	     // reload regularly
+	     window.setTimeout(function(gweather, data) {
+	           refreshGweather(gweather, data)
+	         }, refresh * 1000, gweather, data);
+	 }
+    console.log("gweather end");
+    return false;
+}

Modified: CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.css
===================================================================
--- CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.css	2011-07-12 21:57:38 UTC (rev 386)
+++ CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.css	2011-07-13 18:15:11 UTC (rev 387)
@@ -1,52 +1,55 @@
-@charset "UTF-8";
-/*
- * Example of zRSSFeed Styling
- *
- * Version: 1.1.2
- * (c) Copyright 2010-2011, Zazar Ltd
- *
- */
-
-body {
-	margin: 1em 3em;
-	font-family: Tahoma, Genevam, sans-serif;
-}
-
-.rssFeed {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 90%;
-	margin: 2em 3em;
-}
-.rssFeed a {
-	color: #444;
-	text-decoration: none;
-}
-.rssFeed a:hover {
-	color: #000;
-	text-decoration: underline;
-}
-
-.rssHeader { padding: 0.2em 0; }
-
-.rssBody { border: 1px solid #999; }
-.rssBody ul { list-style: none; }
-.rssBody ul, .rssRow, .rssRow h4, .rssRow p {
-	margin: 0;
-	padding: 0;
-}
-
-.rssRow { padding: 0.8em; }
-.rssRow h4 { font-size: 1.1em; }
-.rssRow div {
-	font-size: 90%;
-	color: #666;
-	margin: 0.2em 0 0.4em 0;
-}
-
-.odd { background-color: #e8e8fc; }
-.even { background-color: #d4d4e8; }
-
-.rssRow .rssMedia {
-	padding: 0.5em;
-	font-size: 1em;
-}
+@charset "UTF-8";
+/*
+ * Example of zRSSFeed Styling
+ *
+ * Version: 1.1.2
+ * (c) Copyright 2010-2011, Zazar Ltd
+ *
+ */
+
+/*
+body {
+	margin: 1em 3em;
+	font-family: Tahoma, Genevam, sans-serif;
+}
+*/
+
+.rssFeed {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 90%;
+	margin: 2em 3em;
+}
+.rssFeed a {
+	color: #444;
+	text-decoration: none;
+}
+.rssFeed a:hover {
+	color: #000;
+	text-decoration: underline;
+}
+
+.rssHeader { padding: 0.2em 0; }
+
+.rssBody { border: 1px solid #999; }
+.rssBody ul { list-style: none; }
+.rssBody ul, .rssRow, .rssRow h4, .rssRow p {
+	margin: 0;
+	padding: 0;
+}
+
+.rssRow { padding: 0.8em; }
+.rssRow h4 { font-size: 1.1em; }
+.rssRow div {
+	font-size: 90%;
+	color: #666;
+	margin: 0.2em 0 0.4em 0;
+}
+
+.odd { background-color: #e8e8fc; }
+.even { background-color: #d4d4e8; }
+
+.rssRow .rssMedia {
+	padding: 0.5em;
+	font-size: 1em;
+}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[386] CometVisu/trunk/visu/designs

[<pan...@us...>]

Revision: 386
          http://openautomation.svn.sourceforge.net/openautomation/?rev=386&view=rev
Author:   panzaeron
Date:     2011-07-12 21:57:38 +0000 (Tue, 12 Jul 2011)

Log Message:
-----------
Design Alaska und Alaska_Slim hinzugef?\195?\188gt

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/structure_custom.js

Added Paths:
-----------
    CometVisu/trunk/visu/designs/alaska/
    CometVisu/trunk/visu/designs/alaska/basic.css
    CometVisu/trunk/visu/designs/alaska/colors.css
    CometVisu/trunk/visu/designs/alaska/fonts/
    CometVisu/trunk/visu/designs/alaska/fonts/AUTHORS
    CometVisu/trunk/visu/designs/alaska/fonts/COPYING
    CometVisu/trunk/visu/designs/alaska/fonts/ChangeLog
    CometVisu/trunk/visu/designs/alaska/fonts/License.txt
    CometVisu/trunk/visu/designs/alaska/fonts/README
    CometVisu/trunk/visu/designs/alaska/fonts/TODO
    CometVisu/trunk/visu/designs/alaska/fonts/alaska_black_nocaps.ttf
    CometVisu/trunk/visu/designs/alaska/fonts/alaska_light_nocaps.ttf
    CometVisu/trunk/visu/designs/alaska/mobile.css
    CometVisu/trunk/visu/designs/alaska_slim/
    CometVisu/trunk/visu/designs/alaska_slim/basic.css
    CometVisu/trunk/visu/designs/alaska_slim/colors.css
    CometVisu/trunk/visu/designs/alaska_slim/fonts/
    CometVisu/trunk/visu/designs/alaska_slim/fonts/AUTHORS
    CometVisu/trunk/visu/designs/alaska_slim/fonts/COPYING
    CometVisu/trunk/visu/designs/alaska_slim/fonts/ChangeLog
    CometVisu/trunk/visu/designs/alaska_slim/fonts/License.txt
    CometVisu/trunk/visu/designs/alaska_slim/fonts/README
    CometVisu/trunk/visu/designs/alaska_slim/fonts/TODO
    CometVisu/trunk/visu/designs/alaska_slim/fonts/alaska_black_nocaps.ttf
    CometVisu/trunk/visu/designs/alaska_slim/fonts/alaska_light_nocaps.ttf
    CometVisu/trunk/visu/designs/alaska_slim/mobile.css

Added: CometVisu/trunk/visu/designs/alaska/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/basic.css	                        (rev 0)
+++ CometVisu/trunk/visu/designs/alaska/basic.css	2011-07-12 21:57:38 UTC (rev 386)
@@ -0,0 +1,377 @@
+@import "colors.css";
+@font-face { font-family: Liberation; src:url(fonts/alaska_light_nocaps.ttf); }
+@font-face { font-family: Liberation; font-weight: bold; src:url(fonts/alaska_black_nocaps.ttf); }
+
+body 
+{ 
+  font-family: Liberation;
+  font-size: 5.5mm;
+  overflow: hidden;
+  margin:0;
+}
+
+h1
+{
+  font-size: 1.5em;
+  padding-left: 15px;
+}
+
+h2
+{
+  font-size: 1.1em;
+  margin-left: 15px;
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+
+body hr
+{
+  clear:both;
+  height: 1px;
+  border: none;
+  padding: 0;
+  margin:0.1em;
+}
+
+#pages hr 
+{
+  /* margin: 15px 0.1em 15px 0.1em; */
+  margin: 4px 1px 4px 1px;
+  border: 0; /* for Firefox and Opera */
+  border-top-style: solid;
+  border-top-width: 1px;
+  border-bottom: transparent;  
+  clear: both;
+}
+
+
+body br
+{
+  clear:both;
+}
+
+div#top {
+  padding-top: 8px;
+  border-bottom-style: solid;
+  border-width: 1px;
+  padding-bottom: 2px;
+}
+
+.page h1 
+{
+  margin-top: 0;
+  padding-top: 1em;
+}
+
+.nav_path 
+{
+  margin-left: 15px;
+}
+
+.nav_path a 
+{
+  text-decoration:none;
+}
+
+.footer, .footer * 
+{
+  font-size: 0.9em;
+  vertical-align: middle;
+  border-top-style: solid;
+  border-width: 1px;
+}
+
+.footer * 
+{
+  border-style: none;
+  text-decoration: none;
+}
+
+.widget 
+{
+  float:left;
+  width:48%;
+  margin: 0.2em;
+  padding: 0.2em;
+  border-style: solid none none none; /* oben rechts unten links */
+  border-width: 1px;
+  min-height: 2em;
+  background: transparent;
+}
+
+.widget .widget 
+{
+  width:98%;
+}
+
+.text > div, .link > a 
+{
+  float:left;
+  text-align:left;
+  padding-left: 1em;
+}
+
+.widget .label, .widget.info .actor, .text > div, .link > a 
+{
+    line-height: 2em;
+}
+
+.widget .label 
+{
+  float:left; 
+  width:49%;
+  text-align:left;
+  padding-left: 1em;
+}
+.widget .actor 
+{
+  float:left;
+  margin-left:1em;
+  text-align:left;
+}
+.widget .actor div 
+{
+  float:left;
+  white-space: pre-wrap;
+}
+
+.link a 
+{
+  width: 49%;
+}
+
+.page 
+{
+  float:left;
+  width: 900px;
+  overflow: auto;
+  position: relative;
+}
+
+.switchPressed, .switchUnpressed 
+{
+  overflow: hidden;
+  text-align: center;
+  font: 14px/100%;
+  padding: 1px;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+  border-style: solid;
+  border-width: 1px;
+  margin: 5px;
+}
+
+.switchPressed, .switchUnpressed:active, 
+{
+  position: relative;
+  top: 1px;
+}
+.switchPressed:active 
+{
+  position: relative;
+  top: 2px;
+}
+
+.switchUnpressed div, .switchPressed div
+{
+  padding: 2px;
+  width: 6em;
+  float: left;
+  background: transparent;
+  text-align: center;
+  cursor: pointer;
+}
+
+
+.ui-slider { position: relative; text-align: left;}
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+.ui-widget-content 
+{ 
+  border-style: solid;
+  border-width: 1px;
+}
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default 
+{ 
+  border-style: solid;
+  border-width: 1px; 
+  font-weight: bold; 
+}
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { text-decoration: none; }
+
+.dim .actor
+{
+  width: 3em;
+}
+
+.widget .ui-slider
+{
+  width: 30%;
+  float: left;
+  margin-left: 1em;
+  margin-top: 0.5em;
+  border-style: solid; 
+  border-width: 1px;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+}
+
+.widget .ui-slider-handle
+{
+  padding: 1px;
+  /*height: 0.9em; /* Slider small */
+  /* width: 0.9em; /* Slider small */
+  /* margin: 0em 0em 0em -0.4em; /* Slider small top */
+  /* margin: 0.38em 0em 0em -0.4em; /* Slider small middle */
+  -webkit-border-radius: 50%; 
+  -moz-border-radius: 50%;
+  border-radius: 50%;
+  border-style: solid;
+  border-width: 1px;
+}
+/* Clearfix */
+.clearfix:after 
+{
+  content: ".";
+  display: block;
+  clear: both;
+  visibility: hidden;
+  line-height: 0;
+  height: 0;
+}
+
+.clearfix
+{
+  display: inline-block;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+  border-style: solid;
+  border-width: 1px;
+}
+
+html[xmlns] .clearfix 
+{
+  display: block;
+}
+
+*:first-child+html .clearfix 
+{
+  min-height: 0;
+}
+
+* html .clearfix 
+{
+  height: 1%;
+}
+
+* html>body .clearfix 
+{
+  display: inline-block;
+  width: 100%;
+}
+
+* html .clearfix 
+{
+  /* Hides from IE-mac \*/ 
+  height: 1%;
+  /* End hide from IE-mac */
+}
+
+.loading 
+{
+  display: block !important;
+}
+
+div#loading 
+{
+  display: none !important;
+}
+
+.popup, .popup_background 
+{
+  position: absolute;
+  width: 90%;
+  height: 90%;
+  top: 5%;
+  left: 5%;
+}
+
+.popup 
+{
+  z-index: 101;
+  background: transparent;
+}
+
+
+.popup_background 
+{
+  z-index: 100;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+  border-style: solid;
+  border-width: 1px;
+  opacity: .98;
+}
+
+.popup div 
+{
+  margin: 4px;
+}
+
+.popup div.head 
+{
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+}
+
+.clickable 
+{
+  cursor: pointer;
+}
+
+.diagram_inline 
+{
+  width: 320px; 
+  height: 180px;
+}
+
+.diagram_preview 
+{
+  width: 240px;
+  height: 2em;
+}
+
+#diagramTooltip 
+{
+  z-index: 1000;
+  border-style: solid; 
+  border-width: 1px;
+  padding: 2px;
+  opacity: 0.80;
+}
+
+.widget IFRAME 
+{
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+  border-style: solid;
+  border-width: 1px;
+}
+

Added: CometVisu/trunk/visu/designs/alaska/colors.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/colors.css	                        (rev 0)
+++ CometVisu/trunk/visu/designs/alaska/colors.css	2011-07-12 21:57:38 UTC (rev 386)
@@ -0,0 +1,115 @@
+body, .nav_path, .nav_path a, .link a, .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited, .ui-widget-content a, .footer * 
+{
+  color: #686868;
+}
+
+.switchPressed 
+{
+  color: #999;
+}
+
+.green.switchPressed, .green.switchUnpressed 
+{
+  color: #e8f0de;
+}
+
+.green.switchPressed:active, .green.switchUnpressed:active 
+{
+  color: #a9c08c;
+}
+
+.red.switchPressed, .red.switchUnpressed 
+{
+  color: #faddde;
+}
+
+.red.switchPressed:active, .red.switchUnpressed:active 
+{
+  color: #de898c;
+}
+
+.red 
+{
+  color:white;
+}
+
+.green
+{
+  color:white;
+}
+
+.blue
+{
+  color:#44f;
+}
+
+.purple
+{
+  color:#f4f;
+}
+
+/* gradient */
+body, div#top, .switchUnpressed, .switchPressed:active, .widget .ui-slider-handle, .popup_background, .clearfix 
+{
+  background: #fff;
+  background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ededed));
+  background: -moz-linear-gradient(top,  #fff,  #ededed);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed');
+}
+
+.page h1, .switchPressed, .switchUnpressed:active, .footer
+{
+  background: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff));
+  background: -moz-linear-gradient(top,  #ededed,  #fff);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#ffffff');
+}
+
+.green.switchPressed, .green.switchUnpressed 
+{
+  background: #64991e;
+  background: -webkit-gradient(linear, left top, left bottom, from(#7db72f), to(#4e7d0e));
+  background: -moz-linear-gradient(top,  #7db72f,  #4e7d0e);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#7db72f', endColorstr='#4e7d0e');
+}
+
+.green.switchPressed:active, .green.switchUnpressed:active 
+{
+  background: -webkit-gradient(linear, left top, left bottom, from(#4e7d0e), to(#7db72f));
+  background: -moz-linear-gradient(top,  #4e7d0e,  #7db72f);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#4e7d0e', endColorstr='#7db72f');
+}
+
+.red.switchPressed, .red.switchUnpressed 
+{
+  background: #d81b21;
+  background: -webkit-gradient(linear, left top, left bottom, from(#ed1c24), to(#aa1317));
+  background: -moz-linear-gradient(top,  #ed1c24,  #aa1317);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ed1c24', endColorstr='#aa1317');
+}
+
+.red.switchPressed:active, .red.switchUnpressed:active 
+{
+  background: -webkit-gradient(linear, left top, left bottom, from(#aa1317), to(#ed1c24));
+  background: -moz-linear-gradient(top,  #aa1317,  #ed1c24);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#aa1317', endColorstr='#ed1c24');
+}
+
+/* border */
+div#top, .ui-state-default, .ui-widget-content, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, #pages .hr, .widget, .switchPressed, .switchUnpressed, .widget .ui-slider, .widget .ui-slider-handle, .popup_background, #diagramTooltip, .widget IFRAME, .clearfix 
+{
+  border-color: #686868;
+}
+
+.ui-widget-content, .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, #diagramTooltip 
+{
+  background: #ececec;
+}
+
+/* shadow */
+.switchPressed, .switchUnpressed, .widget .ui-slider, .clearfix, .popup_background, .widget IFRAME 
+{
+  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2);
+  -moz-box-shadow: 0 1px 2px rgba(0,0,0,.2);
+  box-shadow: 0 1px 2px rgba(0,0,0,.2);
+}
+

Added: CometVisu/trunk/visu/designs/alaska/fonts/AUTHORS
===================================================================
--- CometVisu/trunk/visu/designs/alaska/fonts/AUTHORS	                        (rev 0)
+++ CometVisu/trunk/visu/designs/alaska/fonts/AUTHORS	2011-07-12 21:57:38 UTC (rev 386)
@@ -0,0 +1,23 @@
+AUTHORS
+
+Current Contributors (sorted alphabetically):
+
+  - Caius 'kaio' Chance <caius.chance at gmail.com>
+      Project Owner
+      Red Hat, Inc.
+
+  - Denis Jacquerye <moyogo at gmail.com>
+      Project Contributor
+
+  - Herbert Duerr <duerr at sun.com>
+      Narrow Fonts Contributor
+      Oracle, Inc.
+
+Previous Contributors
+
+  - Steve Matteson
+      Original Designer (support period expired)
+      Ascender, Inc.
+
+  - Mark Webbink <mwebbink AT redhat.com>
+      Release coordinator, Red Hat Inc.

Added: CometVisu/trunk/visu/designs/alaska/fonts/COPYING
===================================================================
--- CometVisu/trunk/visu/designs/alaska/fonts/COPYING	                        (rev 0)
+++ CometVisu/trunk/visu/designs/alaska/fonts/COPYING	2011-07-12 21:57:38 UTC (rev 386)
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  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
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  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.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the 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 a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE 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.
+
+		     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
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the 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 2 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, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision 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, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This 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.

Added: CometVisu/trunk/visu/designs/alaska/fonts/ChangeLog
===================================================================
--- CometVisu/trunk/visu/designs/alaska/fonts/ChangeLog	                        (rev 0)
+++ CometVisu/trunk/visu/designs/alaska/fonts/ChangeLog	2011-07-12 21:57:38 UTC (rev 386)
@@ -0,0 +1,224 @@
+* Wed Jul 21 2010 Pravin Satpute <psa...@re...>
+- Update for New Release 1.06
+- Added New Family Narrow (Contribution from Herbert Duerr <her...@or...>)
+- updated version of fonts
+
+* Mon 10 May 2010 Caius 'kaio' Chance <me at kaio.net>
+- Fixed Romanian glyphs, U+021A, 021B, 0218, 0219, 0162, 0163, 015E, 015F,
+  2010, 2011. (rhbz#440992)
+- Fixed height of arrows U+2190, 2192, 2194. (Issue #2)
+
+* Thu 06 May 2010 Caius 'kaio' Chance <me at kaio.net>
+- Cleaned up points and auto-instructed hinting of 'u', 'v', 'w', 'y'.
+(rhbz#463036)
+- Created the first project icon. (Issue #5)
+
+* Wed May 05 2010 Caius 'kaio' Chance <k at kaio.net>
+- Incorrect cent sign glyph (U+00A2) in Sans and Mono
+style in Liberation fonts. (rhbz#474522)
+
+* Wed 28 Apr 2010 Caius 'kaio' Chance <me at kaio.net>
+- rhbz#510174: Corrected version number of all SFD files.
+- Corrected license exceptions to GPLv2.
+- Updated README file.
+
+* Tue 27 Apr 2010 Caius 'kaio' Chance <me at kaio.net>
+- Renamed Narrow Fonts.
+- Updated list of contributors.
+- Released version 1.05.3.
+
+* Thu 22 Apr 2010 Herbert Duerr <duerr at sun.com>
+- Contributed Liberation Sans Narrow Fonts.
+
+* Fri 12 Mar 2010 Caius 'kaio' Chance <me at kaio.me>
+- Migrated to Google Code.
+- Updated AUTHORS.
+- Upgraded license to GPLv3+exceptions.
+
+* Sun 27 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
+- Fixed ttf pack preparation error.
+
+* Tue 21 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
+- Fixed 'wrongly encoded glyphs after U+10000' (rhbz#525498),
+  provided by Denis Jacquerye <moyogo at gmail.com>.
+
+* Tue 21 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
+- Fixed fontforge script sfd2ttf.pe.
+- Include traditional kern table for Sans and Serif.
+
+* Tue 14 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
+- Generated TTFs with tradition kern table, with fontforge ver 20090408.
+- Added make target alias dist-src as dist-sfd.
+
+* Mon 13 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
+- Updated for generation of traditional kern table via scripts.
+
+* Mon 06 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
+- Reconverted SFDs from original TTFs with traditional kern table.
+- Updated "clean" target in Makefile.
+
+* Tue 30 Jun 2009 Caius 'kaio' Chance <me at kaio.me>
+- Reconverted SFDs from original TTFs with traditional kern table.
+- Updated "clean" target in Makefile.
+
+* Tue 30 Jun 2009 Caius 'kaio' Chance <me at kaio.me>
+- Generated cleaner SFD from original TTFs.
+- Include Makefile in sources tarball.
+
+* Wed 24 Jun 2009 Caius 'kaio' Chance <me at kaio.me>
+- Makefile: pack SFD files as source tarball.
+- Makefile: pack TTF files as ttf packs.
+- Tidy up repository.
+- Updated documents.
+
+* Mon 12 Jan 2009 Caius Chance <cchance at redhat.com>
+- Fixed copyright holder name typo for Sans Regular font (rhbz#479521).
+
+* Tue 09 Dec 2008 Caius Chance <cchance at redhat.com>
+- Changed cent sign glyph (U+00A2) to be coressed in Sans and Mono
+  (rhbz#474522).
+
+* Wed 03 Dec 2008 Caius Chance <cchance at redhat.com>
+- Started 1.04.93.devel.
+- Fixed blurriness of U+03BC for Sans Regular font (rhbz#473481).
+- Fixed src tarball mis-inclusion of dist files in Makefile.
+
+* Fri 28 Nov 2008 Caius Chance <cchance at redhat.com>
+- Corrected version number in Makefile.
+- Fixed make target of source tarball.
+- Uploaded 1.04.92 source tarball to release area.
+
+* Wed 15 Oct 2008 Caius Chance <cchance at redhat.com>
+- Fixed blurred 'u' and 'W' for Sans Bold font (rhbz#463036).
+- Released as version 1.04.92
+
+* Wed 17 Sep 2008 Caius Chance <cchance at redhat.com>
+- Fixed missing hinting instructions for all Mono fonts (rhbz#460090).
+- Fixed missing hinting instructions for all Sans fonts (rhbz#460090).
+- Fixed missing hinting instructions for all Serif fonts (rhbz#460090).
+- Released as version 1.04.91
+
+* Tue 09 Sep 2008 Caius Chance <cchance at redhat.com>
+- Backed up all released files in ./dist directory.
+
+* Fri 05 Sep 2008 Caius Chance <cchance at redhat.com>
+- Fixed incorrect glyph points and missing hinting instructions for:
+  Mono Bold Italic (up to U+2012) (rhbz#460090).
+
+* Mon 25 Aug 2008 Caius Chance <cchance at redhat.com>
+- Fixed incorrect glyph points and missing hinting instructions for:
+  U+0079, U+03BC, U+0431, U+2010..2012, U+1114117 (rhbz#458592).
+- Released as version 1.04.90.
+
+* Thu 13 Jul 2008 Caius Chance <cchance at redhat.com>
+- Released as version 1.04.
+
+* Thu 12 Jun 2008 Caius Chance <cchance at redhat.com>
+- Released as version 1.04.beta2 (1.03.99).
+- Added ZIP package building for non-tar users.
+- rhbz#440992:
+  - Created Romanian "T/t/S/s with comma below" (U+0218..021B) on all fonts.
+  - Fixed "T/s with cedilla below" (U+0162/0163) on all fonts.
+  - Created "Hyphen" and "Non-Breaking Hyphen" (U+2010..2011) on all fonts.
+
+* Wed 11 Jun 2008 Caius Chance <cchance at redhat.com>
+- Added last Version 1.03 from original manufacturer.
+- Renamed directory 'archive' to 'sandbox'.
+- Added directory description in hosting home directory.
+- Created ZIP packages for Version 1.03 and 1.04.beta.
+
+* Tue 04 Jun 2008 Caius Chance <cchance at redhat.com>
+- rhbz#440992:
+  - Created "Hyphen" and "Non-Breaking Hyphen" (U+2010..2011) on Sans Regular.
+
+* Mon 03 Jun 2008 Caius Chance <cchance at redhat.com>
+- rhbz#440992:
+  - Created Romanian "T/t/S/s with comma below" (U+0218..021B) on Sans Regular. 
+  - Fixed "T/s with cedilla below" (U+0162/0163) on Sans Regular.
+
+* Fri 30 May 2008 Caius Chance <cchance at redhat.com>
+- Release Version 1.04.beta (liberation-fonts-1_04_beta).
+
+* Thu 29 May 2008 Caius Chance <cchance at redhat.com>
+- Correct SFD version numbers in "TTF Info" categor for correct version 
+  number during export to TTFs.
+
+* Wed 28 May 2008 Caius Chance <cchance at redhat.com>
+- Reencoded with "Glyph Order" by FontForge.
+- Corrected font name for all Regular fonts.
+- Generated TTFs (experimantal, in "archive") with old stle kern and dummy 
+  DSIG table.
+- Updated README in 1.04b TTFs (experimental, in "archive").
+
+* Tue 27 May 2008 Caius Chance <cchance at redhat.com>
+- Fixed Unicode name mis-mapping of Sans and Serif TTF files.
+- Regenerate SFD files from Unicode name mis-mapping fixed Sans and Serif TTF 
+  files.
+
+* Mon 26 May 2008 Caius Chance <cchance at redhat.com>
+- Fixed Unicode name mis-mapping of Mono TTF files.
+- Regenerate SFD files from Unicode name mis-mapping fixed Mono TTF files.
+==========
+- Applied following patches submitted by Nicolas Spalinger
+  <nicolas_spalinger sil org>:
+  - We-need-versioned-tarballs.
+  - Add-ignore-file-so-the-VCS-does-not-track-the-folder.
+  - Adjust-path-for-various-Makefile-targets-subfolders.
+  - Fix-versionning-mismatch-in-the-binary-font-metadata.
+  - Add-some-description-and-extra-lines-to-the-build-ta.
+  - Reword-and-restructure-maintainers-recommendations.
+  - Some-rewording-of-the-readme-file.
+==========
+	
+* Thu May 22 2008 Caius Chance <cchance at redhat.com>
+- Added latest (1.03) TTF files from Ascender. (in 'archive')
+
+* Fri May 16 2008 Caius Chance <cchance at redhat.com>
+- Change source tree as 'trunk', 'tags', 'branches'.
+==========
+- Applied following patches submitted by Nicolas Spalinger
+  <nicolas_spalinger sil org>:
+  - Add-more-information-about-the-upstream-designer.
+  - Minor-typo-and-layout-fixes.
+  - Adjust-fontforge-path-with-env-as-a-source-build.
+==========
+
+* Wed May 14 2008 Caius Chance <cchance at redhat.com>
+- Renamed target 'ttf' to 'build'.
+- Removed 'Re-Package' chapter from README and refine contents.
+- Changed AUTHORS contents.
+- Created maintainer documentation MAINTAINER.
+
+* Tue May 06 2008 Caius Chance <cchance at redhat.com>
+- Refined clean target.
+- Removed TTFs from git.
+
+* Fri May 02 2008 Caius Chance <cchance at redhat.com>
+- Imported into fedorahosted.org repository and be hosted.
+    https://fedorahosted.org/liberation-fonts/
+- Modified source root directory name definition in Makefile.
+- Created 'dist' target for binary TTF tarball and 'src' for source tarball.
+- Corrected Regular fonts filenames.
+- Added TTF -> SFD make target.
+
+* Thu May 01 2008 Caius Chance <cchance at redhat.com>
+- Converted previous TTF files into SFD files to be open source.
+- Created fontforge SFD -> TTF scripts.
+- Created Makefile.
+- Added documentations: AUTHORS, ChangeLog, README.
+
+* Thu Apr 10 2008 Caius Chance <cchance at redhat.com>
+- Fixed exchanged and incomplete glyphs (from Ascender).
+- Repacked source tarball.
+- Released version 1.03.
+
+* Tue Mar 25 2008 Caius Chance <cchance at redhat.com>
+- Fixed alignment mismatch of dot accents (from Ascender).
+- Released version 1.02.
+
+* Mon Jan 14 2008 Caius Chance <cchance at redhat.com>
+- Updated new source tarball from Ascender.
+- Released version 1.0.
+
+* Thu Jun 14 2007 Caius Chance <cchance at redhat.com>
+- Updated new source tarball from Ascender.

Added: CometVisu/trunk/visu/designs/alaska/fonts/License.txt
===================================================================
--- CometVisu/trunk/visu/designs/alaska/fonts/License.txt	                        (rev 0)
+++ CometVisu/trunk/visu/designs/alaska/fonts/License.txt	2011-07-12 21:57:38 UTC (rev 386)
@@ -0,0 +1,19 @@
+LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY
+LIBERATION FONT SOFTWARE
+
+This agreement governs the use of the Software and any updates to the Software, regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant to the GNU General Public License v.2 with the exceptions set forth below and such other terms as are set forth in this End User License Agreement.
+
+ 1. The Software and License Exception. LIBERATION font software  (the "Software") consists of TrueType-OpenType formatted font software for rendering LIBERATION typefaces in sans-serif, serif, and monospaced character styles. You are licensed to use, modify, copy, and distribute the Software pursuant to the GNU General Public License v.2 with the following exceptions:  
+
+  (a) As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.
+
+  (b) As a further exception, any distribution of the object code of the Software in a physical product must provide you the right to access and modify the source code for the Software and to reinstall that modified version of the Software in object code form on the same physical product on which you received it.
+
+ 2. Intellectual Property Rights. The Software and each of its components, including the source code, documentation, appearance, structure and organization are owned by Red Hat and others and are protected under copyright and other laws. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with the aforementioned, subject to the applicable license. The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other countries. This agreement does not permit Client to distribute modified versions of the Software using Red Hat's trademarks. If Client makes a redistribution of a modified version of the Software, then Client must modify the files names to remove any reference to the Red Hat trademarks and must not use the Red Hat trademarks in any way to reference or promote the modified Software. 
+
+ 3. Limited Warranty. To the maximum extent permitted under applicable law, the Software is provided and licensed "as is" without warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. Red Hat does not warrant that the functions contained in the Software will meet Client's requirements or that the operation of the Software will be entirely error free or appear precisely as described in the accompanying documentation. 
+
+ 4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Software, even if Red Hat or such dealer has been advised of the possibility of such damages. 
+
+ 5. General. If any provision of this agreement is held to be unenforceable, that shall not affect the enforceability of the remaining provisions. This agreement shall be governed by the laws of the State of North Carolina and of the United States, without regard to any conflict of laws provisions, except that the United Nations Convention on the International Sale of Goods shall not apply.
+Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc.

Added: CometVisu/trunk/visu/designs/alaska/fonts/README
===================================================================
--- CometVisu/trunk/visu/designs/alaska/fonts/README	                        (rev 0)
+++ CometVisu/trunk/visu/designs/alaska/fonts/README	2011-07-12 21:57:38 UTC (rev 386)
@@ -0,0 +1,82 @@
+   1. What's this?
+  =================
+
+  The Liberation Fonts is font collection which aims to provide document 
+  layout compatibility as usage of Times New Roman, Arial, Courier New.
+
+
+   2. Requirements
+  =================
+
+  * fontforge is installed.
+    (http://fontforge.sourceforge.net)
+
+
+   3. Install
+  ============
+
+  3.1 Decompress tarball
+
+    You can extract the files by following command:
+
+      $ tar zxvf liberation-fonts-[VERSION].tar.gz
+
+  3.2 Build from the source
+
+    Change into directory liberation-fonts-[VERSION]/ and build from sources by 
+    following commands:
+
+      $ cd liberation-fonts-[VERSION]
+      $ make
+
+    The built font files will be available in 'build' directory.
+
+  3.3 Install to system
+
+    For Fedora, you could manually install the fonts by copying the TTFs to 
+    ~/.fonts for user wide usage, or to /usr/share/fonts/truetype/liberation 
+    for system-wide availability. Then, run "fc-cache" to let that cached.
+
+    For other distributions, please check out corresponding documentation.
+
+
+   4. Usage
+  ==========
+
+  Simply select preferred liberation font in applications and start using.
+
+
+   5. License
+  ============
+
+  This font set had been released under GNU Public License version 2 
+  ("GPLv2") with exceptions.
+
+  Please read file "COPYING" for GPLv2 license.
+
+  Please read file "License.txt" for details of exceptions.
+
+
+   6. For Maintainers
+  ====================
+
+  Before packaging a new release based on a new source tarball, you have to
+  update the version suffix in the Makefile:
+
+    VER = [VERSION]
+
+  Make sure that the defined version corresponds to the font software metadata
+  which you can check with ftinfo/otfinfo or fontforge itself. It is highly 
+  recommended that file 'ChangeLog' is updated to reflect changes.
+
+  Create a tarball with the following command:
+
+    $ make dist
+
+  The new versioned tarball will be available in the dist/ folder as
+  'liberation-fonts-[NEW_VERSION].tar.gz'.
+
+  7. Credits
+ ============
+
+  Please read file "AUTHORS" for list of contributors.

Added: CometVisu/trunk/visu/designs/alaska/fonts/TODO
===================================================================
--- CometVisu/trunk/visu/designs/alaska/fonts/TODO	                        (rev 0)
+++ CometVisu/trunk/visu/designs/alaska/fonts/TODO	2011-07-12 21:57:38 UTC (rev 386)
@@ -0,0 +1,14 @@
+Here are todo for next release
+
+1) resolving bug related with hinting
+	- https://bugzilla.redhat.com/show_bug.cgi?id=606217
+	- https://bugzilla.redhat.com/show_bug.cgi?id=591556
+2) shape improvement
+	- https://bugzilla.redhat.com/show_bug.cgi?id=591559
+	- https://bugzilla.redhat.com/show_bug.cgi?id=487581
+3) Ascent Descent Values Improvement
+	- using absolute values instead of relative values in OS/2 table
+4) RFE: Add Greek Polytonic support to Liberation fonts
+	- need some volunteer to add these shapes
+	- https://bugzilla.redhat.com/show_bug.cgi?id=473842
+	   

Added: CometVisu/trunk/visu/designs/alaska/fonts/alaska_black_nocaps.ttf
===================================================================
(Binary files differ)


Property changes on: CometVisu/trunk/visu/designs/alaska/fonts/alaska_black_nocaps.ttf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: CometVisu/trunk/visu/designs/alaska/fonts/alaska_light_nocaps.ttf
===================================================================
(Binary files differ)


Property changes on: CometVisu/trunk/visu/designs/alaska/fonts/alaska_light_nocaps.ttf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: CometVisu/trunk/visu/designs/alaska/mobile.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/mobile.css	                        (rev 0)
+++ CometVisu/trunk/visu/designs/alaska/mobile.css	2011-07-12 21:57:38 UTC (rev 386)
@@ -0,0 +1,14 @@
+.widget
+{
+  width:98%;
+}
+
+#bottom 
+{
+  display: none;
+}
+
+.page 
+{
+  overflow: visible;
+}

Added: CometVisu/trunk/visu/designs/alaska_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/basic.css	                        (rev 0)
+++ CometVisu/trunk/visu/designs/alaska_slim/basic.css	2011-07-12 21:57:38 UTC (rev 386)
@@ -0,0 +1,358 @@
+@import "colors.css";
+@font-face { font-family: Liberation; src:url(fonts/alaska_light_nocaps.ttf); }
+@font-face { font-family: Liberation; font-weight: bold; src:url(fonts/alaska_black_nocaps.ttf); }
+
+body 
+{ 
+  font-family: Liberation;
+  font-size: 5mm;
+  overflow: hidden;
+  margin:0;
+}
+
+h1
+{
+  font-size: 1.5em;
+  padding-left: 15px;
+}
+
+h2
+{
+  font-size: 1.1em;
+  margin-left: 15px;
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+
+body hr
+{
+  clear:both;
+  height: 1px;
+  border: none;
+  padding: 0;
+  margin: 0.1em;
+}
+
+#pages hr {
+ margin: 4px 1px 4px 1px;
+ border: 0; /* Für Firefox und Opera */
+ border-top: solid 1px;
+ border-bottom: transparent;  
+ clear: both;
+}
+
+
+body br
+{
+  clear:both;
+}
+
+div#top {
+  padding-top: 8px;
+  border-bottom: 1px solid;
+  padding-bottom: 2px;
+}
+
+.page h1 {
+  margin-top: 0;
+  padding-top: 1em;
+}
+
+.nav_path 
+{
+  margin-left: 15px;
+}
+
+.nav_path a
+{
+  text-decoration:none;
+}
+
+.footer, .footer * 
+{
+  font-size: 0.9em;
+  vertical-align: middle;
+  border-top-style: solid;
+  border-width: 1px;
+}
+
+.footer * 
+{
+  border-style: none;
+  text-decoration: none;
+}
+
+.widget
+{
+  float:left;
+  width:32%;
+  margin: 0.2em;
+  padding: 0.2em;
+  border-style: solid none none none; /* oben rechts unten links */
+  border-width: 1px;
+  min-height: 2em;
+  background: transparent;
+}
+
+.widget .widget
+{
+  width:98%;
+}
+
+.text > div, .link > a {
+  float:left;
+  text-align:left;
+  padding-left: 1em;
+  text-decoration: none;
+}
+
+.widget .label, .widget.info .actor, .text > div, .link > a 
+{
+  line-height: 2em;
+}
+
+.widget .label
+{
+  float:left; 
+  width:49%;
+  text-align:left;
+  padding-left: 1em;
+}
+.widget .actor
+{
+  float:left;
+  margin-left:1em;
+  text-align:left;
+}
+.widget .actor div
+{
+  float:left;
+  white-space: pre-wrap;
+}
+
+.link a
+{
+  width: 49%;
+}
+
+.page
+{
+  float:left;
+  width: 900px;
+  overflow: auto;
+  position: relative;
+}
+
+.switchPressed, .switchUnpressed 
+{
+  overflow: hidden;
+  text-align: center;
+  font: 14px/100%;
+  padding: 1px;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+  margin: 5px;
+}
+
+.switchPressed 
+{
+   position: relative;
+	top: 1px;
+}
+
+.switchUnpressed:active {
+  position: relative;
+  top: 1px;
+}
+
+.switchPressed:active {
+   position: relative;
+   top: 2px;
+}
+
+.switchUnpressed div, .switchPressed div
+{
+  padding: 2px;
+  width: 6em;
+  float: left;
+  background: transparent;
+  text-align: center;
+  cursor: pointer;
+}
+
+.ui-slider { position: relative; text-align: left;}
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+.ui-widget-content { border: 0px solid; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 0px solid; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { text-decoration: none; }
+
+.dim .actor
+{
+  width: 3em;
+}
+.widget .ui-slider
+{
+  width: 30%;
+  float: left;
+  margin-left: 1em;
+  margin-top: 0.5em;
+  border: solid 1px;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+}
+
+.widget .ui-slider-handle
+{
+  padding: 1px;
+  /*height: 0.9em; /* Slider small */
+  /* width: 0.9em; /* Slider small */
+  /* margin: 0em 0em 0em -0.4em; /* Slider small top */
+  /* margin: 0.38em 0em 0em -0.4em; /* Slider small middle */
+  border: solid 1px;
+  -webkit-border-radius: 50%; 
+  -moz-border-radius: 50%;
+  border-radius: 50%;
+}
+/* Clearfix */
+.clearfix:after {
+   content: ".";
+   display: block;
+   clear: both;
+   visibility: hidden;
+   line-height: 0;
+   height: 0;
+}
+
+.clearfix {
+  display: inline-block;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+  border: solid 1px;
+}
+
+html[xmlns] .clearfix 
+{
+  display: block;
+}
+
+*:first-child+html .clearfix 
+{
+  min-height: 0;
+}
+
+* html .clearfix 
+{
+  height: 1%;
+}
+
+* html>body .clearfix 
+{
+  display: inline-block;
+  width: 100%;
+}
+
+* html .clearfix 
+{
+  /* Hides from IE-mac \*/
+  height: 1%;
+  /* End hide from IE-mac */
+}
+
+.loading 
+{
+  display: block !important;
+}
+
+div#loading 
+{
+  display: none !important;
+}
+
+.popup, .popup_background 
+{
+  position: absolute;
+  width: 90%;
+  height: 90%;
+  top: 5%;
+  left: 5%;
+}
+
+.popup 
+{
+  z-index: 101;
+  background: transparent;
+}
+
+
+.popup_background 
+{
+  z-index: 100;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+  opacity: .98;
+}
+
+.popup div 
+{
+  margin: 4px;
+}
+
+.popup div.head 
+{
+  border-bottom: 1px solid;
+}
+
+.popup_background.error 
+{
+  background: #ececec;
+  border: solid 1px;
+}
+
+.clickable 
+{
+  cursor: pointer;
+}
+
+.diagram_inline 
+{
+  width: 320px;
+  height: 180px;
+}
+
+.diagram_preview 
+{
+  width: 240px;
+  height: 2em;
+}
+
+#diagramTooltip 
+{
+  z-index: 1000;
+  border: solid 1px;
+	padding: 2px;
+	opacity: 0.80;
+}
+
+.widget IFRAME 
+{
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+}

Added: CometVisu/trunk/visu/designs/alaska_slim/colors.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/colors.css	                        (rev 0)
+++ CometVisu/trunk/visu/designs/alaska_slim/colors.css	2011-07-12 21:57:38 UTC (rev 386)
@@ -0,0 +1,115 @@
+body, .nav_path, .nav_path a, .link a, .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited, .ui-widget-content a, .footer * 
+{
+  color: #686868;
+}
+
+.switchPressed 
+{
+  color: #999;
+}
+
+.green.switchPressed, .green.switchUnpressed 
+{
+  color: #e8f0de;
+}
+
+.green.switchPressed:active, .green.switchUnpressed:active 
+{
+  color: #a9c08c;
+}
+
+.red.switchPressed, .red.switchUnpressed 
+{
+  color: #faddde;
+}
+
+.red.switchPressed:active, .red.switchUnpressed:active 
+{
+  color: #de898c;
+}
+
+.red 
+{
+  color:white;
+}
+
+.green
+{
+  color:white;
+}
+
+.blue
+{
+  color:#44f;
+}
+
+.purple
+{
+  color:#f4f;
+}
+
+/* gradient */
+body, div#top, .switchUnpressed, .switchPressed:active, .widget .ui-slider-handle, .popup_background, .clearfix 
+{
+  background: #fff;
+  background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ededed));
+  background: -moz-linear-gradient(top,  #fff,  #ededed);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed');
+}
+
+.page h1, .switchPressed, .switchUnpressed:active, .footer
+{
+  background: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff));
+  background: -moz-linear-gradient(top,  #ededed,  #fff);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#ffffff');
+}
+
+.green.switchPressed, .green.switchUnpressed 
+{
+  background: #64991e;
+  background: -webkit-gradient(linear, left top, left bottom, from(#7db72f), to(#4e7d0e));
+  background: -moz-linear-gradient(top,  #7db72f,  #4e7d0e);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#7db72f', endColorstr='#4e7d0e');
+}
+
+.green.switchPressed:active, .green.switchUnpressed:active 
+{
+  background: -webkit-gradient(linear, left top, left bottom, from(#4e7d0e), to(#7db72f));
+  background: -moz-linear-gradient(top,  #4e7d0e,  #7db72f);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#4e7d0e', endColorstr='#7db72f');
+}
+
+.red.switchPressed, .red.switchUnpressed 
+{
+  background: #d81b21;
+  background: -webkit-gradient(linear, left top, left bottom, from(#ed1c24), to(#aa1317));
+  background: -moz-linear-gradient(top,  #ed1c24,  #aa1317);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ed1c24', endColorstr='#aa1317');
+}
+
+.red.switchPressed:active, .red.switchUnpressed:active 
+{
+  background: -webkit-gradient(linear, left top, left bottom, from(#aa1317), to(#ed1c24));
+  background: -moz-linear-gradient(top,  #aa1317,  #ed1c24);
+  filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#aa1317', endColorstr='#ed1c24');
+}
+
+/* border */
+div#top, .ui-state-default, .ui-widget-content, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, #pages .hr, .widget, .switchPressed, .switchUnpressed, .widget .ui-slider, .widget .ui-slider-handle, .popup_background, #diagramTooltip, .widget IFRAME, .clearfix 
+{
+  border-color: #686868;
+}
+
+.ui-widget-content, .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, #diagramTooltip 
+{
+  background: #ececec;
+}
+
+/* shadow */
+.switchPressed, .switchUnpressed, .widget .ui-slider, .clearfix, .popup_background, .widget IFRAME 
+{
+  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2);
+  -moz-box-shadow: 0 1px 2px rgba(0,0,0,.2);
+  box-shadow: 0 1px 2px rgba(0,0,0,.2);
+}
+

Added: CometVisu/trunk/visu/designs/alaska_slim/fonts/AUTHORS
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/fonts/AUTHORS	                        (rev 0)
+++ CometVisu/trunk/visu/designs/alaska_slim/fonts/AUTHORS	2011-07-12 21:57:38 UTC (rev 386)
@@ -0,0 +1,23 @@
+AUTHORS
+
+Current Contributors (sorted alphabetically):
+
+  - Caius 'kaio' Chance <caius.chance at gmail.com>
+      Project Owner
+      Red Hat, Inc.
+
+  - Denis Jacquerye <moyogo at gmail.com>
+      Project Contributor
+
+  - Herbert Duerr <duerr at sun.com>
+      Narrow Fonts Contributor
+      Oracle, Inc.
+
+Previous Contributors
+
+  - Steve Matteson
+      Original Designer (support period expired)
+      Ascender, Inc.
+
+  - Mark Webbink <mwebbink AT redhat.com>
+    ...
 
[truncated message content]

[Openautomation-svn] SF.net SVN: openautomation:[385] wiregate/plugin/generic/ denon_steuerung_knx.pl

[<sw...@us...>]

Revision: 385
          http://openautomation.svn.sourceforge.net/openautomation/?rev=385&view=rev
Author:   swiss1
Date:     2011-07-09 15:42:04 +0000 (Sat, 09 Jul 2011)

Log Message:
-----------
Das Plugin wurde so angepasst, dass nun komfortabel unter Einstellungen ausgew?\195?\164hlt werden kann welche MEMORY-Taste welche Quelle aufrufen soll. Version 0.3 BETA

Modified Paths:
--------------
    wiregate/plugin/generic/denon_steuerung_knx.pl

Modified: wiregate/plugin/generic/denon_steuerung_knx.pl
===================================================================
--- wiregate/plugin/generic/denon_steuerung_knx.pl	2011-07-09 07:43:17 UTC (rev 384)
+++ wiregate/plugin/generic/denon_steuerung_knx.pl	2011-07-09 15:42:04 UTC (rev 385)
@@ -1,5 +1,5 @@
 # Plugin zur Multimediasteuerung \xFCber einen 8fach Tastsensor oder eine Visu
-# Version 0.2 23.06.2011 BETA
+# Version 0.3 09.07.2011 BETA
 # Copyright: swiss (http://knx-user-forum.de/members/swiss.html)
 # Die Vorlage f\xFCr die Daten\xFCbertragung via socat stammt von makki (http://knx-user-forum.de/members/makki.html)
 # Aufbau m\xF6glichst so, dass man unterhalb der Einstellungen nichts ver\xE4ndern muss!
@@ -35,19 +35,34 @@
 
 my $ga_status_lautstaerke = '9/5/9'; #Hier wird die aktuelle Lautst\xE4rke als 14byte TEXT zur\xFCckgegeben (z.B. -35.5)
 
-my $ga_umschalttaste = '9/1/5';
-my $ga_status_umschalttaste = '9/1/14';
 
+my $ga_umschalttaste = '9/1/5'; #Hier wird die GA f\xFCr die Umschalttaste eingetragen. Damit lassen sich die MEMORY-Tasten doppelt belegen.
+my $ga_status_umschalttaste = '9/1/14'; #Hier wird die GA f\xFCr die R\xFCckmeldung der Umschalttaste eingetragen.
+
 my $ga_kurzwahltaste1 = '9/1/6'; #Hier die GA f\xFCr die MEMORY-Taste 1 eintragen (1=abrufen)
+my $ga_status_kurzwahltaste1 = '9/1/10'; #Hier die GA f\xFCr die Status LED der Taste 1 eintragen (1=EIN, 0=Aus)
+my $quelle_kurzwahltaste1 = 'SAT';  #Hier kann die aufzurufende Quelle f\xFCr die Grundbelegung eingetragen. z.B. SAT, DVD, TV, IRADIO (Internet Radio) oder TUNER angegeben werden
+my $quelle_kurzwahltaste1u = 'NET'; #Hier kann die aufzurufende Quelle f\xFCr die Zweitbelegung eingetragen. z.B. SAT, DVD, TV, IRADIO (Internet Radio) oder TUNER angegeben werden
+
+
 my $ga_kurzwahltaste2 = '9/1/7'; #Hier die GA f\xFCr die MEMORY-Taste 2 eintragen (1=abrufen)
+my $ga_status_kurzwahltaste2 = '9/1/11'; #Hier die GA f\xFCr die Status LED der Taste 2 eintragen (1=EIN, 0=Aus)
+my $quelle_kurzwahltaste2 = 'TV';  #Hier kann die aufzurufende Quelle f\xFCr die Grundbelegung eingetragen. z.B. SAT, DVD, TV, IRADIO (Internet Radio) oder TUNER angegeben werden
+my $quelle_kurzwahltaste2u = 'IRADIO'; #Hier kann die aufzurufende Quelle f\xFCr die Zweitbelegung eingetragen. z.B. SAT, DVD, TV, IRADIO (Internet Radio) oder TUNER angegeben werden
+
+
 my $ga_kurzwahltaste3 = '9/1/8'; #Hier die GA f\xFCr die MEMORY-Taste 3 eintragen (1=abrufen)
+my $ga_status_kurzwahltaste3 = '9/1/12'; #Hier die GA f\xFCr die Status LED der Taste 3 eintragen (1=EIN, 0=Aus)
+my $quelle_kurzwahltaste3 = 'DVD';  #Hier kann die aufzurufende Quelle f\xFCr die Grundbelegung eingetragen. z.B. SAT, DVD, TV, IRADIO (Internet Radio) oder TUNER angegeben werden
+my $quelle_kurzwahltaste3u = 'DVR'; #Hier kann die aufzurufende Quelle f\xFCr die Zweitbelegung eingetragen. z.B. SAT, DVD, TV, IRADIO (Internet Radio) oder TUNER angegeben werden
+
+
 my $ga_kurzwahltaste4 = '9/1/9'; #Hier die GA f\xFCr die MEMORY-Taste 4 eintragen (1=abrufen)
-
-my $ga_status_kurzwahltaste1 = '9/1/10'; #Hier die GA f\xFCr die Status LED der Taste 1 eintragen (1=EIN, 0=Aus)
-my $ga_status_kurzwahltaste2 = '9/1/11'; #Hier die GA f\xFCr die Status LED der Taste 2 eintragen (1=EIN, 0=Aus)
-my $ga_status_kurzwahltaste3 = '9/1/12'; #Hier die GA f\xFCr die Status LED der Taste 3 eintragen (1=EIN, 0=Aus)
 my $ga_status_kurzwahltaste4 = '9/1/13'; #Hier die GA f\xFCr die Status LED der Taste 4 eintragen (1=EIN, 0=Aus)
+my $quelle_kurzwahltaste4 = 'CD';  #Hier kann die aufzurufende Quelle f\xFCr die Grundbelegung eingetragen. z.B. SAT, DVD, TV, IRADIO (Internet Radio) oder TUNER angegeben werden
+my $quelle_kurzwahltaste4u = 'TUNER'; #Hier kann die aufzurufende Quelle f\xFCr die Zweitbelegung eingetragen. z.B. SAT, DVD, TV, IRADIO (Internet Radio) oder TUNER angegeben werden
 
+
 my $socknum = 118; # Eindeutige Nummer des Sockets +1
 
 
@@ -57,26 +72,28 @@
 my $recv_ip = "localhost"; # Empfangsport (UDP, siehe in Socket-Einstellungen)
 my $recv_port = "50105"; # Empfangsport (UDP, siehe in Socket-Einstellungen)
 
+
 ######################
 ##ENDE Einstellungen##
 ######################
 
+
+
 use Time::HiRes qw(usleep nanosleep);
 
-
 #Hier werden den Denon-befehle interne Namen zugewiesen
-my %denon_befehle = ("PWOFF" => "PWSTANDBY\r",
-		     "PWON" => "PWON\r",
-		     "MVDOWN" => "MVDOWN\r",
-		     "MVUP" => "MVUP\r",
-		     "SAT" => "SISAT/CBL\r",
-		     "DVD" => "SIDVD\r",
-		     "TV" => "SITV\r",
-		     "NET" => "SINET/USB\r",
-		     "CD" => "SICD\r",
-		     "TUNER" => "SITUNER\r",
-		     "IRADIO" => "SIIRADIO\r",
-		     "DVR" => "SIDVR\r");  
+my %denon_befehle = ("PWOFF" => "PWSTANDBY",
+		     "PWON" => "PWON",
+		     "MVDOWN" => "MVDOWN",
+		     "MVUP" => "MVUP",
+		     "SAT" => "SISAT/CBL",
+		     "DVD" => "SIDVD",
+		     "TV" => "SITV",
+		     "NET" => "SINET/USB",
+		     "CD" => "SICD",
+		     "TUNER" => "SITUNER",
+		     "IRADIO" => "SIIRADIO",
+		     "DVR" => "SIDVR");  
 
 
 $plugin_info{$plugname.'_cycle'} = 600; 
@@ -122,7 +139,7 @@
 		if (knx_read($msg{'dst'},0,1) == 1){
 			do
 			{
-				my $return_value2 = command_senden('MVDOWN');
+				my $return_value2 = command_senden('MVDOWN').'\r';
 				usleep(150000);
 			} until (knx_read($msg{'dst'},0,1) == 0);
 			return;
@@ -150,12 +167,12 @@
 			if (knx_read($msg{'dst'},0,1) == 1){
 				if ($plugin_info{$plugname.'_status_umschaltung'} == 0) {
 					$plugin_info{$plugname.'_status_quelle'} = 1;
-					my $return_value2 = command_senden('SAT');
+					my $return_value2 = command_senden($quelle_kurzwahltaste1);
 					my $return_value = rueckmeldung_led();
 					return;
 				} elsif ($plugin_info{$plugname.'_status_umschaltung'} == 1){
 					$plugin_info{$plugname.'_status_quelle'} = 5;
-					my $return_value2 = command_senden('NET');
+					my $return_value2 = command_senden($quelle_kurzwahltaste1u);
 					my $return_value = rueckmeldung_led();
 					return;
 				}
@@ -166,12 +183,12 @@
 			if (knx_read($msg{'dst'},0,1) == 1){
 				if ($plugin_info{$plugname.'_status_umschaltung'} == 0) {
 					$plugin_info{$plugname.'_status_quelle'} = 2;
-					my $return_value2 = command_senden('TV');
+					my $return_value2 = command_senden($quelle_kurzwahltaste2);
 					my $return_value = rueckmeldung_led();
 					return;
 				} elsif ($plugin_info{$plugname.'_status_umschaltung'} == 1){
 					$plugin_info{$plugname.'_status_quelle'} = 6;
-					my $return_value2 = command_senden('IRADIO');
+					my $return_value2 = command_senden($quelle_kurzwahltaste2u);
 					my $return_value = rueckmeldung_led();
 					return;
 				}
@@ -182,12 +199,12 @@
 			if (knx_read($msg{'dst'},0,1) == 1){
 				if ($plugin_info{$plugname.'_status_umschaltung'} == 0) {
 					$plugin_info{$plugname.'_status_quelle'} = 3;
-					my $return_value2 = command_senden('DVD');
+					my $return_value2 = command_senden($quelle_kurzwahltaste3);
 					my $return_value = rueckmeldung_led();
 					return;
 				} elsif ($plugin_info{$plugname.'_status_umschaltung'} == 1){
 					$plugin_info{$plugname.'_status_quelle'} = 7;
-					my $return_value2 = command_senden('DVR');
+					my $return_value2 = command_senden($quelle_kurzwahltaste3u);
 					my $return_value = rueckmeldung_led();
 					return;
 				}
@@ -198,12 +215,12 @@
 			if (knx_read($msg{'dst'},0,1) == 1){
 				if ($plugin_info{$plugname.'_status_umschaltung'} == 0) {
 					$plugin_info{$plugname.'_status_quelle'} = 4;
-					my $return_value2 = command_senden('CD');
+					my $return_value2 = command_senden($quelle_kurzwahltaste4);
 					my $return_value = rueckmeldung_led();
 					return;
 				} elsif ($plugin_info{$plugname.'_status_umschaltung'} == 1){
 					$plugin_info{$plugname.'_status_quelle'} = 8;
-					my $return_value2 = command_senden('TUNER');
+					my $return_value2 = command_senden($quelle_kurzwahltaste4u);
 					my $return_value = rueckmeldung_led();
 					return;
 				}
@@ -237,24 +254,15 @@
 			$plugin_info{$plugname.'_status_quelle'} = 0;
 			
 		} else {
-			if ($buf eq "SISAT/CBL"){
-				$plugin_info{$plugname.'_status_quelle'} = 1;
-			} elsif ($buf eq "SITV") {
-				$plugin_info{$plugname.'_status_quelle'} = 2;
-			} elsif ($buf eq "SIDVD") {
-				$plugin_info{$plugname.'_status_quelle'} = 3;		
-			} elsif ($buf eq "SICD") {
-				$plugin_info{$plugname.'_status_quelle'} = 4;
-			} elsif ($buf eq "SINET/USB") {
-				$plugin_info{$plugname.'_status_quelle'} = 5;
-			} elsif ($buf eq "SIIRADIO") {
-				$plugin_info{$plugname.'_status_quelle'} = 6;
-			} elsif ($buf eq "SIDVR") {
-				$plugin_info{$plugname.'_status_quelle'} = 7;
-			} elsif ($buf eq "SITUNER") {
-				$plugin_info{$plugname.'_status_quelle'} = 8;
-			} else {
-				$plugin_info{$plugname.'_status_quelle'} = 0;
+			SELECT:{
+			if ($buf eq $denon_befehle{$quelle_kurzwahltaste1}){ $plugin_info{$plugname.'_status_quelle'} = 1; last SELECT; }
+			if ($buf eq $denon_befehle{$quelle_kurzwahltaste2}){ $plugin_info{$plugname.'_status_quelle'} = 2; last SELECT; }
+			if ($buf eq $denon_befehle{$quelle_kurzwahltaste3}){ $plugin_info{$plugname.'_status_quelle'} = 3; last SELECT; }
+			if ($buf eq $denon_befehle{$quelle_kurzwahltaste4}){ $plugin_info{$plugname.'_status_quelle'} = 4; last SELECT; }
+			if ($buf eq $denon_befehle{$quelle_kurzwahltaste1u}){ $plugin_info{$plugname.'_status_quelle'} = 5; last SELECT; }
+			if ($buf eq $denon_befehle{$quelle_kurzwahltaste2u}){ $plugin_info{$plugname.'_status_quelle'} = 6; last SELECT; }
+			if ($buf eq $denon_befehle{$quelle_kurzwahltaste3u}){ $plugin_info{$plugname.'_status_quelle'} = 7; last SELECT; }
+			if ($buf eq $denon_befehle{$quelle_kurzwahltaste4u}){ $plugin_info{$plugname.'_status_quelle'} = 8; last SELECT; }
 			}
 		}
 		my $return_value = rueckmeldung_led();
@@ -322,7 +330,10 @@
 	}
 }
 
+
 sub command_senden{
 	my $befehl = $_[0];
-	syswrite($socket[$socknum], $denon_befehle{$befehl});
+	my $command = $denon_befehle{$befehl}."\r";
+	$plugin_info{$plugname.'_debug'} = $command;
+	syswrite($socket[$socknum], $command);
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[384] wiregate/plugin/generic/emx_uhr.pl

[<e....@us...>]

Revision: 384
          http://openautomation.svn.sourceforge.net/openautomation/?rev=384&view=rev
Author:   e.max
Date:     2011-07-09 07:43:17 +0000 (Sat, 09 Jul 2011)

Log Message:
-----------
Schaltuhr, emax' Variante, Version 1

Added Paths:
-----------
    wiregate/plugin/generic/emx_uhr.pl

Added: wiregate/plugin/generic/emx_uhr.pl
===================================================================
--- wiregate/plugin/generic/emx_uhr.pl	                        (rev 0)
+++ wiregate/plugin/generic/emx_uhr.pl	2011-07-09 07:43:17 UTC (rev 384)
@@ -0,0 +1,123 @@
+# Plugin zum Zeitabhängigen Schalten von GA's (Schaltuhr)
+# License: GPL (v2)
+# version von emax
+# Version 1, 8.7.2011
+# Copyright: Edgar (emax) Hermanns, emax at berlios Punkt de
+
+####################
+###Einstellungen:###
+####################
+
+my @Zeiten = 
+    ( 
+      { Name=>'Test',           Aktiv=>'1', Std=>undef, Min=>undef, MTag=>undef, Mon=>undef, WTag=>undef,   Wert=>'1', DPT=>'1', GA=>'1/1/30', Log=>'1' }, 
+      { Name=>'Bewaesserung',   Aktiv=>'1', Std=>'7',   Min=> '0',  MTag=>'3',   Mon=>'4-9', WTag=>'1-5',   Wert=>'1', DPT=>'1', GA=>'1/1/30' },
+      { Name=>'AussenlichtEin', Aktiv=>'1', Std=>'19',  Min=>'30',  MTag=>'4',   Mon=>undef, WTag=>'1,3,5', Wert=>'1', DPT=>'1', GA=>'1/2/40' },
+      { Name=>'AussenlichtAus', Aktiv=>'1', Std=>'7',   Min=> '0',  MTag=>undef, Mon=>undef, WTag=>'2,4,6', Wert=>'0', DPT=>'1', GA=>'1/2/40' }
+    );
+
+######################
+##ENDE Einstellungen##
+######################
+
+use POSIX;
+
+############################################################
+# Eigenen Aufruf-Zyklus setzen
+# Das script verarbeitet keine Sekunden, weshalb die kleinste 
+# Granulaität ohne zusätzlioche Statusverarbeitung eine Minute ist. 
+############################################################
+my $cycleTime = 60;
+
+############################################################
+# definiert die Sekunde, ab der neu synchronisiert wird    #
+############################################################
+my $slotEnd = 10; 
+
+############################################################
+# Die Versionsnummer ist Teil des plugin_info hashes und dient
+# dazu, dass das script definierte Anfangskonditionen findet 
+# auch ohne alles neu starten zu müssen. Die Nummer 
+# einfach nach einer Änderung des scripts um eins erhöhen.
+############################################################
+my $version = 1;
+
+###################################################################
+# Auswertung von Bereichs und Listenvergleichen                   #
+# Prüft, ob ein Wert zu einer Liste oder in einen Bereich passt   #
+###################################################################
+sub matches
+{
+    my ($value, $def) = @_;  # Zu prüfender Wert, Bereichsdefinition
+    (!$def) and return 1;
+    foreach (split(/,/, $def))
+    {        
+        s/\s+//g;
+        (/^$value$/) and return 1;
+        (/^([\d]+)-(\d+)/) and return ($value >= $1 && $value <= $2);
+    }
+    return 0;
+}
+
+##########
+# main() #
+##########
+
+# kontrollierte Startkonditionen setzen
+if (!defined $plugin_info{$plugname.$version.'firstRun'}) 
+{
+    $plugin_info{$plugname.$version.'firstRun'} = 1;
+    plugin_log($plugname, "Started plugin version $version, first have to sync with time slot.");
+    # die Anpassungs der Zyklyzweit erfolgt dynamisch, s.u.
+    $plugin_info{$plugname.'_cycle'} = 1;
+}
+
+my ($curSec,$curMin,$curStu,$curMTag,$curMon,$curJahr,$curWTag,$curJTag,$isdst) = localtime(time);
+$curJahr += 1900;
+
+#######################################################################
+# Es ist sinnvoll, dafür zu sorgen, dass die Startzeit dieses Plugins 
+# mit der Zeit nicht "abdriftet", da sonst über lange Laufzeiten ein 
+# Minutenüberlauf entstehen könnte, und so Ereignisse verloren gingen.
+# Aus diesem Grund prüft das script, ob es innerhalb der ersten 10 Sekunden 
+# einer Minute läuft, Wenn das nicht der Fall ist, wird so lange eine 
+# verkürzte Zykluszeit verwendet, bis die Ausführung wieder im vorgesehenen 
+# Zeitraum abläuft.
+#
+# Bei der Erstausführung des Plugins nimmt dieses erst nach Erreichen 
+# des vorgesehenen Zeitfensters die eigentliche Arbeit auf, weil der 
+# Abstand zwischen zwei sonst zu klein werden könnte.
+#######################################################################
+
+if ($curSec >= $slotEnd)
+{
+    if ($plugin_info{$plugname.'_cycle'} != 1)
+    {
+        plugin_log($plugname, "lost time-slot due to time drift, reducing cycle time to 1 second");
+            $plugin_info{$plugname.'_cycle'} = 1;
+    }
+    
+    # bei Erstausführung auf Zeitfenster warten
+    ($plugin_info{$plugname.$version.'firstRun'} == 1) and return;
+}
+
+# prüfen, ob in dieser Minute bereits ausgeführt
+(defined $plugin_info{$plugname.$version.'lastMinute'} && $plugin_info{$plugname.$version.'lastMinute'} == $curMin) and return;
+
+foreach my $Zeit (@Zeiten) 
+{
+    (defined $Zeit->{Aktiv} && !$Zeit->{Aktiv}) and next;
+
+    (defined $Zeit->{Min}  && !&matches($curMin,  $Zeit->{Min}))  and next;
+    (defined $Zeit->{Std}  && !&matches($curStu,  $Zeit->{Std}))  and next;
+    (defined $Zeit->{MTag} && !&matches($curMTag, $Zeit->{MTag})) and next;
+    (defined $Zeit->{Mon}  && !&matches($curMon,  $Zeit->{Mon}))  and next;
+    (defined $Zeit->{WTag} && !&matches($curWTag, $Zeit->{WTag})) and next;
+    (defined $Zeit->{Log}  && $Zeit->{Log} eq '1') and 
+        plugin_log($plugname, "Sending $Zeit->{Name}, GA[$Zeit->{GA}], Value[$Zeit->{Wert}]"); 
+
+    knx_write($Zeit->{GA},$Zeit->{Wert}, $Zeit->{DPT});   
+}
+
+$plugin_info{$plugname.$version.'lastMinute'} = $curMin;
+$plugin_info{$plugname.$version.'firstRun'} = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[383] CometVisu/trunk/visu/plugins

[<ma...@us...>]

Revision: 383
          http://openautomation.svn.sourceforge.net/openautomation/?rev=383&view=rev
Author:   makki1
Date:     2011-07-06 19:45:58 +0000 (Wed, 06 Jul 2011)

Log Message:
-----------
Plugins RSS and Yahoo-weather - both still need some work on CSS to look fine, so no entry in visu_config_demo yet

Added Paths:
-----------
    CometVisu/trunk/visu/plugins/rss/
    CometVisu/trunk/visu/plugins/rss/structure_plugin.js
    CometVisu/trunk/visu/plugins/rss/zrssfeed/
    CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.vticker.js
    CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.css
    CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.js
    CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.min.js
    CometVisu/trunk/visu/plugins/zweather/
    CometVisu/trunk/visu/plugins/zweather/structure_plugin.js
    CometVisu/trunk/visu/plugins/zweather/zweatherfeed/
    CometVisu/trunk/visu/plugins/zweather/zweatherfeed/jquery.zweatherfeed.css
    CometVisu/trunk/visu/plugins/zweather/zweatherfeed/jquery.zweatherfeed.js
    CometVisu/trunk/visu/plugins/zweather/zweatherfeed/jquery.zweatherfeed.min.js

Added: CometVisu/trunk/visu/plugins/rss/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/rss/structure_plugin.js	                        (rev 0)
+++ CometVisu/trunk/visu/plugins/rss/structure_plugin.js	2011-07-06 19:45:58 UTC (rev 383)
@@ -0,0 +1,115 @@
+/* structure_plugin.js (c) 2011 by Michael Markstaller [de...@wi...]
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+*/
+
+/**
+ * This plugins integrates jFeed to display RSS-Feeds into CometVisu.
+ */
+
+$("body").append("<script type=\"text/javascript\" src=\"plugins/rss/zrssfeed/jquery.zrssfeed.min.js\"></script>");
+
+VisuDesign_Custom.prototype.addCreator("rss", {
+    create: function( page, path ) {
+        var $p = $(page);
+
+        function uniqid() {
+            var newDate = new Date;
+            return newDate.getTime();
+        }
+
+        var id = "rss_" + uniqid();
+
+        var ret_val = $('<div class="widget" />');
+        ret_val.addClass( 'rss' );
+        var label = '<div class="label">' + page.textContent + '</div>';
+        var actor = $("<div class=\"actor\"><div class=\"rss_inline\" id=\"" + id + "\">loading...</div></div>");
+        var rss = $("#" + id, actor);
+
+        if ($p.attr("width")) {
+            rss.css("width", $p.attr("width"));
+        }
+        if ($p.attr("height")) {
+            rss.css("height", $p.attr("height"));
+        }
+
+        ret_val.append(label).append(actor);
+
+        rss.data("id", id);
+        rss.data("src", $p.attr("src"));
+        rss.data("label", page.textContent);
+        rss.data("refresh", $p.attr("refresh"));
+        rss.data("limit", $p.attr("limit")) || 10;
+        rss.data("header", $p.attr("header")) || true;
+        rss.data("date", $p.attr("date")) || true;
+        rss.data("content", $p.attr("content")) || true;
+        rss.data("snippet", $p.attr("snippet")) || true;
+        rss.data("showerror", $p.attr("showerror")) || true;
+        rss.data("ssl", $p.attr("ssl")) || false;
+        rss.data("linktarget", $p.attr("linktarget")) || "_new";
+
+        refreshRSS(rss, {});
+
+        return ret_val;
+    },
+    attributes: {
+        src:        {type: "string", required: true},
+        width:      {type: "string", required: false},
+        height:     {type: "string", required: false},
+        refresh:    {type: "numeric", required: false},
+        limit:      {type: "numeric", required: false},
+        header:     {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
+        date:       {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
+        content:    {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
+        snippet:    {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
+        showerror:  {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
+        ssl:        {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
+        linktarget: {type: "list", required: false, list: {"_new": "_new", "_self": "_self"}}
+    },
+    content: {type: "string", required: true}
+});
+
+function refreshRSS(rss, data) {
+    var rss = $(rss);
+
+    var src = rss.data("src");
+    var label = rss.data("label");
+    var refresh = rss.data("refresh");
+    var limit = rss.data("limit");
+    //console.log("refresh rss:" + src); //DEBUG
+    //eval needed to convert string true/false to bool?
+    jQuery(function() {
+			$(rss).rssfeed(src, {
+				limit: rss.data("limit"),
+				header: eval(rss.data("header")),
+				date: eval(rss.data("date")),
+				date: eval(rss.data("date")),
+				content: rss.data("content"),
+				snippet: eval(rss.data("snippet")),
+				showerror: eval(rss.data("showerror")),
+				ssl: eval(rss.data("ssl")),
+				linktarget: rss.data("linktarget")
+			});
+
+	 });
+    if (typeof (refresh) != "undefined" && refresh) {
+	     // reload regularly
+	     window.setTimeout(function(rss, data) {
+	           refreshRSS(rss, data)
+	         }, refresh * 1000, rss, data);
+	 }
+
+    return false;
+}

Added: CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.vticker.js
===================================================================
--- CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.vticker.js	                        (rev 0)
+++ CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.vticker.js	2011-07-06 19:45:58 UTC (rev 383)
@@ -0,0 +1,77 @@
+/*
+* Tadas Juozapaitis ( kas...@gm... )
+*
+* Modifed by Zazar:
+* 24.06.2011 - Corrected pausing issue with multiple instances
+*
+*/
+
+(function($){
+
+$.fn.vTicker = function(options) {
+	var defaults = {
+		speed: 700,
+		pause: 4000,
+		showItems: 3,
+		animation: '',
+		mousePause: true,
+		isPaused: false
+	};
+
+	var options = $.extend(defaults, options);
+
+	moveUp = function(obj2, height, paused){
+		if(paused) return;
+		
+		var obj = obj2.children('ul');
+		
+	    	first = obj.children('li:first').clone(true);
+		
+    		obj.animate({top: '-=' + height + 'px'}, options.speed, function() {
+        		$(this).children('li:first').remove();
+	        	$(this).css('top', '0px');
+        	});
+		
+		if(options.animation == 'fade') {
+			obj.children('li:first').fadeOut(options.speed);
+			obj.children('li:last').hide().fadeIn(options.speed);
+		}
+
+	    	first.appendTo(obj);
+	};
+	
+	return this.each(function() {
+		var obj = $(this);
+		var maxHeight = 0;
+		var itempause = options.isPaused;
+
+		obj.css({overflow: 'hidden', position: 'relative'})
+			.children('ul').css({position: 'absolute', margin: 0, padding: 0})
+			.children('li').css({margin: 0, padding: 0});
+
+		obj.children('ul').children('li').each(function(){
+
+			if($(this).height() > maxHeight) {
+				maxHeight = $(this).height();
+			}
+		});
+
+		obj.children('ul').children('li').each(function() {
+			$(this).height(maxHeight);
+		});
+
+		obj.height(maxHeight * options.showItems);
+		
+    		var interval = setInterval(function(){ moveUp(obj, maxHeight, itempause); }, options.pause);
+		
+		if (options.mousePause)
+		{
+			obj.bind("mouseenter",function() {
+				itempause = true;
+			}).bind("mouseleave",function() {
+				itempause = false;
+			});
+		}
+	});
+};
+})(jQuery);
\ No newline at end of file

Added: CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.css
===================================================================
--- CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.css	                        (rev 0)
+++ CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.css	2011-07-06 19:45:58 UTC (rev 383)
@@ -0,0 +1,52 @@
+@charset "UTF-8";
+/*
+ * Example of zRSSFeed Styling
+ *
+ * Version: 1.1.2
+ * (c) Copyright 2010-2011, Zazar Ltd
+ *
+ */
+
+body {
+	margin: 1em 3em;
+	font-family: Tahoma, Genevam, sans-serif;
+}
+
+.rssFeed {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 90%;
+	margin: 2em 3em;
+}
+.rssFeed a {
+	color: #444;
+	text-decoration: none;
+}
+.rssFeed a:hover {
+	color: #000;
+	text-decoration: underline;
+}
+
+.rssHeader { padding: 0.2em 0; }
+
+.rssBody { border: 1px solid #999; }
+.rssBody ul { list-style: none; }
+.rssBody ul, .rssRow, .rssRow h4, .rssRow p {
+	margin: 0;
+	padding: 0;
+}
+
+.rssRow { padding: 0.8em; }
+.rssRow h4 { font-size: 1.1em; }
+.rssRow div {
+	font-size: 90%;
+	color: #666;
+	margin: 0.2em 0 0.4em 0;
+}
+
+.odd { background-color: #e8e8fc; }
+.even { background-color: #d4d4e8; }
+
+.rssRow .rssMedia {
+	padding: 0.5em;
+	font-size: 1em;
+}

Added: CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.js
===================================================================
--- CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.js	                        (rev 0)
+++ CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.js	2011-07-06 19:45:58 UTC (rev 383)
@@ -0,0 +1,187 @@
+/**
+ * Plugin: jquery.zRSSFeed
+ * 
+ * Version: 1.1.2
+ * (c) Copyright 2010-2011, Zazar Ltd
+ * 
+ * Description: jQuery plugin for display of RSS feeds via Google Feed API
+ *              (Based on original plugin jGFeed by jQuery HowTo. Filesize function by Cary Dunn.)
+ * 
+ * History:
+ * 1.1.2 - Added user callback function due to issue with ajaxStop after jQuery 1.4.2
+ * 1.1.1 - Correction to null xml entries and support for media with jQuery < 1.5
+ * 1.1.0 - Added support for media in enclosure tags
+ * 1.0.3 - Added feed link target
+ * 1.0.2 - Fixed issue with GET parameters (Seb Dangerfield) and SSL option
+ * 1.0.1 - Corrected issue with multiple instances
+ *
+ **/
+
+(function($){
+
+	$.fn.rssfeed = function(url, options, fn) {	
+	
+		// Set pluign defaults
+		var defaults = {
+			limit: 10,
+			header: true,
+			titletag: 'h4',
+			date: true,
+			content: true,
+			snippet: true,
+			showerror: true,
+			errormsg: '',
+			key: null,
+			ssl: false,
+			linktarget: '_self'
+		};  
+		var options = $.extend(defaults, options); 
+		
+		// Functions
+		return this.each(function(i, e) {
+			var $e = $(e);
+			var s = '';
+
+			// Check for SSL protocol
+			if (options.ssl) s = 's';
+			
+			// Add feed class to user div
+			if (!$e.hasClass('rssFeed')) $e.addClass('rssFeed');
+			
+			// Check for valid url
+			if(url == null) return false;
+			
+			// Create Google Feed API address
+			var api = "http"+ s +"://ajax.googleapis.com/ajax/services/feed/load?v=1.0&callback=?&q=" + encodeURIComponent(url);
+			if (options.limit != null) api += "&num=" + options.limit;
+			if (options.key != null) api += "&key=" + options.key;
+			api += "&output=json_xml"
+
+			// Send request
+			$.getJSON(api, function(data){
+				
+				// Check for error
+				if (data.responseStatus == 200) {
+	
+					// Process the feeds
+					_process(e, data.responseData, options);
+
+					// Optional user callback function
+					if ($.isFunction(fn)) fn.call(this,$e);
+					
+				} else {
+
+					// Handle error if required
+					if (options.showerror)
+						if (options.errormsg != '') {
+							var msg = options.errormsg;
+						} else {
+							var msg = data.responseDetails;
+						};
+						$(e).html('<div class="rssError"><p>'+ msg +'</p></div>');
+				};
+			});				
+		});
+	};
+	
+	// Function to create HTML result
+	var _process = function(e, data, options) {
+
+		// Get JSON feed data
+		var feeds = data.feed;
+		if (!feeds) {
+			return false;
+		}
+		var html = '';	
+		var row = 'odd';
+		
+		// Get XML data for media (parseXML not used as requires 1.5+)
+		var xml = getXMLDocument(data.xmlString);
+		var xmlEntries = xml.getElementsByTagName('item');
+		
+		// Add header if required
+		if (options.header)
+			html +=	'<div class="rssHeader">' +
+				'<a href="'+feeds.link+'" title="'+ feeds.description +'">'+ feeds.title +'</a>' +
+				'</div>';
+			
+		// Add body
+		html += '<div class="rssBody">' +
+			'<ul>';
+		
+		// Add feeds
+		for (var i=0; i<feeds.entries.length; i++) {
+			
+			// Get individual feed
+			var entry = feeds.entries[i];
+		
+			// Format published date
+			var entryDate = new Date(entry.publishedDate);
+			var pubDate = entryDate.toLocaleDateString() + ' ' + entryDate.toLocaleTimeString();
+			
+			// Add feed row
+			html += '<li class="rssRow '+row+'">' + 
+				'<'+ options.titletag +'><a href="'+ entry.link +'" title="View this feed at '+ feeds.title +'" target="'+ options.linktarget +'">'+ entry.title +'</a></'+ options.titletag +'>'
+			if (options.date) html += '<div>'+ pubDate +'</div>'
+			if (options.content) {
+			
+				// Use feed snippet if available and optioned
+				if (options.snippet && entry.contentSnippet != '') {
+					var content = entry.contentSnippet;
+				} else {
+					var content = entry.content;
+				}
+				
+				html += '<p>'+ content +'</p>'
+			}
+			
+			// Add any media
+			if(xmlEntries.length > 0) {
+				var xmlMedia = xmlEntries[i].getElementsByTagName('enclosure');
+				if (xmlMedia.length > 0) {
+					html += '<div class="rssMedia"><div>Media files</div><ul>'
+					for (var m=0; m<xmlMedia.length; m++) {
+						var xmlUrl = xmlMedia[m].getAttribute("url");
+						var xmlType = xmlMedia[m].getAttribute("type");
+						var xmlSize = xmlMedia[m].getAttribute("length");
+						html += '<li><a href="'+ xmlUrl +'" title="Download this media">'+ xmlUrl.split('/').pop() +'</a> ('+ xmlType +', '+ formatFilesize(xmlSize) +')</li>';
+					}
+					html += '</ul></div>'
+				}
+				html += '</li>';
+			}
+			
+			// Alternate row classes
+			if (row == 'odd') {
+				row = 'even';
+			} else {
+				row = 'odd';
+			}			
+		}
+		
+		html += '</ul>' +
+			'</div>'
+		
+		$(e).html(html);
+	};
+	
+	function formatFilesize(bytes) {
+		var s = ['bytes', 'kb', 'MB', 'GB', 'TB', 'PB'];
+		var e = Math.floor(Math.log(bytes)/Math.log(1024));
+		return (bytes/Math.pow(1024, Math.floor(e))).toFixed(2)+" "+s[e];
+	}
+
+	function getXMLDocument(string) {
+		var browser = navigator.appName;
+		var xml;
+		if (browser == 'Microsoft Internet Explorer') {
+			xml = new ActiveXObject('Microsoft.XMLDOM');
+			xml.async = 'false'
+			xml.loadXML(string);
+		} else {
+			xml = (new DOMParser()).parseFromString(string, 'text/xml');
+		}
+		return xml;
+	}
+
+})(jQuery);

Added: CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.min.js
===================================================================
--- CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.min.js	                        (rev 0)
+++ CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.min.js	2011-07-06 19:45:58 UTC (rev 383)
@@ -0,0 +1,19 @@
+
+(function($){$.fn.rssfeed=function(url,options,fn){var defaults={limit:10,header:true,titletag:'h4',date:true,content:true,snippet:true,showerror:true,errormsg:'',key:null,ssl:false,linktarget:'_self'};var options=$.extend(defaults,options);return this.each(function(i,e){var $e=$(e);var s='';if(options.ssl)s='s';if(!$e.hasClass('rssFeed'))$e.addClass('rssFeed');if(url==null)return false;var api="http"+s+"://ajax.googleapis.com/ajax/services/feed/load?v=1.0&callback=?&q="+encodeURIComponent(url);if(options.limit!=null)api+="&num="+options.limit;if(options.key!=null)api+="&key="+options.key;api+="&output=json_xml"
+$.getJSON(api,function(data){if(data.responseStatus==200){_process(e,data.responseData,options);if($.isFunction(fn))fn.call(this,$e);}else{if(options.showerror)
+if(options.errormsg!=''){var msg=options.errormsg;}else{var msg=data.responseDetails;};$(e).html('<div class="rssError"><p>'+msg+'</p></div>');};});});};var _process=function(e,data,options){var feeds=data.feed;if(!feeds){return false;}
+var html='';var row='odd';var xml=getXMLDocument(data.xmlString);var xmlEntries=xml.getElementsByTagName('item');if(options.header)
+html+='<div class="rssHeader">'+'<a href="'+feeds.link+'" title="'+feeds.description+'">'+feeds.title+'</a>'+'</div>';html+='<div class="rssBody">'+'<ul>';for(var i=0;i<feeds.entries.length;i++){var entry=feeds.entries[i];var entryDate=new Date(entry.publishedDate);var pubDate=entryDate.toLocaleDateString()+' '+entryDate.toLocaleTimeString();html+='<li class="rssRow '+row+'">'+'<'+options.titletag+'><a href="'+entry.link+'" title="View this feed at '+feeds.title+'" target="'+options.linktarget+'">'+entry.title+'</a></'+options.titletag+'>'
+if(options.date)html+='<div>'+pubDate+'</div>'
+if(options.content){if(options.snippet&&entry.contentSnippet!=''){var content=entry.contentSnippet;}else{var content=entry.content;}
+html+='<p>'+content+'</p>'}
+if(xmlEntries.length>0){var xmlMedia=xmlEntries[i].getElementsByTagName('enclosure');if(xmlMedia.length>0){html+='<div class="rssMedia"><div>Media files</div><ul>'
+for(var m=0;m<xmlMedia.length;m++){var xmlUrl=xmlMedia[m].getAttribute("url");var xmlType=xmlMedia[m].getAttribute("type");var xmlSize=xmlMedia[m].getAttribute("length");html+='<li><a href="'+xmlUrl+'" title="Download this media">'+xmlUrl.split('/').pop()+'</a> ('+xmlType+', '+formatFilesize(xmlSize)+')</li>';}
+html+='</ul></div>'}
+html+='</li>';}
+if(row=='odd'){row='even';}else{row='odd';}}
+html+='</ul>'+'</div>'
+$(e).html(html);};function formatFilesize(bytes){var s=['bytes','kb','MB','GB','TB','PB'];var e=Math.floor(Math.log(bytes)/Math.log(1024));return(bytes/Math.pow(1024,Math.floor(e))).toFixed(2)+" "+s[e];}
+function getXMLDocument(string){var browser=navigator.appName;var xml;if(browser=='Microsoft Internet Explorer'){xml=new ActiveXObject('Microsoft.XMLDOM');xml.async='false'
+xml.loadXML(string);}else{xml=(new DOMParser()).parseFromString(string,'text/xml');}
+return xml;}})(jQuery);
\ No newline at end of file

Added: CometVisu/trunk/visu/plugins/zweather/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/zweather/structure_plugin.js	                        (rev 0)
+++ CometVisu/trunk/visu/plugins/zweather/structure_plugin.js	2011-07-06 19:45:58 UTC (rev 383)
@@ -0,0 +1,89 @@
+/* structure_plugin.js (c) 2011 by Michael Markstaller [de...@wi...]
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+*/
+
+/**
+ * This plugins integrates jFeed to display RSS-Feeds into CometVisu.
+ */
+ 
+// $( 'head' ).append( '<link rel="stylesheet" href="plugins/zweather/zweatherfeed/jquery.zweatherfeed.css" type="text/css" />' );
+$( 'head' ).append("<script type=\"text/javascript\" src=\"plugins/zweather/zweatherfeed/jquery.zweatherfeed.min.js\"></script>");
+
+VisuDesign_Custom.prototype.addCreator("zweather", {
+    create: function( page, path ) {
+        var $p = $(page);
+
+        function uniqid() {
+            var newDate = new Date;
+            return newDate.getTime();
+        }
+
+        var id = "zweather_" + uniqid();
+
+        var ret_val = $('<div class="widget" />');
+        ret_val.addClass( 'zweather' );
+        var label = '<div class="label">' + page.textContent + '</div>';
+        var actor = $("<div class=\"actor\"><div class=\"zweather_inline\" id=\"" + id + "\"></div></div>");
+        var zweather = $("#" + id, actor);
+
+        if ($p.attr("width")) {
+            zweather.css("width", $p.attr("width"));
+        }
+        if ($p.attr("height")) {
+            zweather.css("height", $p.attr("height"));
+        }
+
+        ret_val.append(label).append(actor);
+        console.log("loaded plugin zweather");
+
+        zweather.data("id", id);
+        zweather.data("label", page.textContent);
+        zweather.data("refresh", $p.attr("refresh"));
+        zweather.data("location", $p.attr("location"));
+        console.log(zweather.data("location"));
+        refreshZWeather(zweather, {});
+
+        return ret_val;
+    },
+    attributes: {
+        width:      {type: "string", required: false},
+        height:     {type: "string", required: false},
+        refresh:    {type: "numeric", required: false},
+        location:   {type: "string", required: true}
+    },
+    content: {type: "string", required: true}
+});
+
+function refreshZWeather(zweather, data) {
+    var zweather = $(zweather);
+
+    var label = zweather.data("label");
+    var refresh = zweather.data("refresh");
+    var location = zweather.data("location");
+    console.log("refresh zweather:" + location); //DEBUG
+    //eval needed to convert string true/false to bool?
+    jQuery(function() {
+			$(zweather).weatherfeed([location]);
+	 });
+    if (typeof (refresh) != "undefined" && refresh) {
+	     // reload regularly
+	     window.setTimeout(function(zweather, data) {
+	           refreshZWeather(zweather, data)
+	         }, refresh * 1000, zweather, data);
+	 }
+
+    return false;
+}

Added: CometVisu/trunk/visu/plugins/zweather/zweatherfeed/jquery.zweatherfeed.css
===================================================================
--- CometVisu/trunk/visu/plugins/zweather/zweatherfeed/jquery.zweatherfeed.css	                        (rev 0)
+++ CometVisu/trunk/visu/plugins/zweather/zweatherfeed/jquery.zweatherfeed.css	2011-07-06 19:45:58 UTC (rev 383)
@@ -0,0 +1,44 @@
+@charset "UTF-8";
+/*
+ * Example of zWeatherFeed Styling
+ *
+ * Version: 1.0.2
+ * (c) Copyright 2010, Zazar Ltd
+ *
+ */
+
+.weatherFeed
+{
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 90%;
+	margin: 2em 3em;
+	width: 280px;
+}
+.weatherFeed a { color: #888; }
+.weatherFeed a:hover
+{
+	color: #000;
+	text-decoration: none;
+}
+.weatherItem
+{
+	padding: 0.8em;
+	text-align: right;
+}
+.weatherCity { text-transform: uppercase; }
+.weatherTemp
+{
+	font-size: 2.8em;
+	font-weight: bold;
+}
+.weatherDesc, .weatherCity { font-weight: bold; }
+.weatherDesc { margin-bottom: 0.4em; }
+.weatherRange, .weatherWind { font-size: 0.8em; }
+.weatherLink
+{
+	text-align: left;
+	font-size: 0.8em;
+}
+
+.odd { background-color: #e8e8fc; }
+.even { background-color: #d4d4e8; }
\ No newline at end of file

Added: CometVisu/trunk/visu/plugins/zweather/zweatherfeed/jquery.zweatherfeed.js
===================================================================
--- CometVisu/trunk/visu/plugins/zweather/zweatherfeed/jquery.zweatherfeed.js	                        (rev 0)
+++ CometVisu/trunk/visu/plugins/zweather/zweatherfeed/jquery.zweatherfeed.js	2011-07-06 19:45:58 UTC (rev 383)
@@ -0,0 +1,141 @@
+/**
+ * Plugin: jquery.zWeatherFeed
+ * 
+ * Version: 1.0.2
+ * (c) Copyright 2010, Zazar Ltd
+ * 
+ * Description: jQuery plugin for display of Yahoo! Weather feeds
+ * 
+ * History:
+ * 1.0.2 - Correction to options / link
+ * 1.0.1 - Added hourly caching to YQL to avoid rate limits
+ *         Uses Weather Channel location ID and not Yahoo WOEID
+ *         Displays day or night background images
+ *
+ **/
+
+(function($){
+
+	var row = 'odd';
+
+	$.fn.weatherfeed = function(locations, options) {	
+	
+		// Set pluign defaults
+		var defaults = {
+			unit: 'c',
+			image: true,
+			highlow: true,
+			wind: true,
+			link: true,
+			showerror: true
+		};  
+		var options = $.extend(defaults, options); 
+		
+		// Functions
+		return this.each(function(i, e) {
+			var $e = $(e);
+			
+			// Add feed class to user div
+			if (!$e.hasClass('weatherFeed')) $e.addClass('weatherFeed');
+
+			// Check and append locations
+			if (!$.isArray(locations)) return false;
+			var count = locations.length;
+			if (count > 10) count = 10;
+			var locationid = '';
+			for (var i=0; i<count; i++) {
+				if (locationid != '') locationid += ',';
+				locationid += "'"+ locations[i] + "'";
+			}
+
+			// Cache results for an hour to prevent overuse
+			now = new Date()
+					
+			// Create Yahoo Weather feed API address
+			var query = "select * from weather.forecast where location in ("+ locationid +") and u='"+ options.unit +"'";
+			var api = 'http://query.yahooapis.com/v1/public/yql?q='+ encodeURIComponent(query) +'&rnd='+ now.getFullYear() + now.getMonth() + now.getDay() + now.getHours() +'&format=json&callback=?';
+
+			// Send request
+			//$.getJSON(api, function(data) {
+			$.ajax({
+				type: 'GET',
+				url: api,
+				dataType: 'json',
+				success: function(data) {
+
+					if (data.query) {
+			
+						if (data.query.results.channel.length > 0 ) {
+							
+							// Multiple locations
+							var result = data.query.results.channel.length;
+							for (var i=0; i<result; i++) {
+							
+								// Create weather feed item
+								_callback(e, data.query.results.channel[i], options);
+							}
+						} else {
+
+							// Single location only
+							_callback(e, data.query.results.channel, options);
+						}
+					} else {
+						if (options.showerror) $e.html('<p>Weather information unavailable</p>');
+					}
+				},
+				error: function(data) {
+					if (options.showerror)  $e.html('<p>Weather request failed</p>');
+				}
+			});
+
+		});
+	};
+
+	// Function to each feed item
+	var _callback = function(e, feed, options) {
+		var $e = $(e);
+
+		// Format feed items
+		var wd = feed.wind.direction;
+		if (wd>=348.75&&wd<=360){wd="N"};if(wd>=0&&wd<11.25){wd="N"};if(wd>=11.25&&wd<33.75){wd="NNE"};if(wd>=33.75&&wd<56.25){wd="NE"};if(wd>=56.25&&wd<78.75){wd="ENE"};if(wd>=78.75&&wd<101.25){wd="E"};if(wd>=101.25&&wd<123.75){wd="ESE"};if(wd>=123.75&&wd<146.25){wd="SE"};if(wd>=146.25&&wd<168.75){wd="SSE"};if(wd>=168.75&&wd<191.25){wd="S"};if(wd>=191.25 && wd<213.75){wd="SSW"};if(wd>=213.75&&wd<236.25){wd="SW"};if(wd>=236.25&&wd<258.75){wd="WSW"};if(wd>=258.75 && wd<281.25){wd="W"};if(wd>=281.25&&wd<303.75){wd="WNW"};if(wd>=303.75&&wd<326.25){wd="NW"};if(wd>=326.25&&wd<348.75){wd="NNW"};
+		var wf = feed.item.forecast[0];
+		
+		// Determine day or night image
+		wpd = feed.item.pubDate;
+		n = wpd.indexOf(":");
+		tpb = _getTimeAsDate(wpd.substr(n-2,8));
+		tsr = _getTimeAsDate(feed.astronomy.sunrise);
+		tss = _getTimeAsDate(feed.astronomy.sunset);
+
+		if (tpb>tsr && tpb<tss) { daynight = 'd'; } else { daynight = 'n'; }
+
+		// Add item container
+		var html = '<div class="weatherItem '+ row +'"';
+		if (options.image) html += ' style="background-image: url(http://l.yimg.com/a/i/us/nws/weather/gr/'+ feed.item.condition.code + daynight +'.png); background-repeat: no-repeat;"';
+		html += '>';
+		
+		// Add item data
+		html += '<div class="weatherCity">'+ feed.location.city +'</div>';
+		html += '<div class="weatherTemp">'+ feed.item.condition.temp +'&deg;</div>';
+		html += '<div class="weatherDesc">'+ feed.item.condition.text +'</div>';
+		if (options.highlow) html += '<div class="weatherRange">High: '+ wf.high +'&deg; Low: '+ wf.low +'&deg;</div>';
+		if (options.wind) html += '<div class="weatherWind">Wind: '+ wd +' '+ feed.wind.speed + feed.units.speed +'</div>';
+		if (options.link) html += '<div class="weatherLink"><a href="'+ feed.item.link +'">Read full forecast</a></div>';
+		
+		html += '</div>';
+
+		// Alternate row classes
+		if (row == 'odd') { row = 'even'; } else { row = 'odd';	}
+		
+		$e.append(html);
+	};
+
+	// Get time string as date
+	var _getTimeAsDate = function(t) {
+		
+		d = new Date();
+		r = new Date(d.toDateString() +' '+ t);
+
+		return r;
+	};
+})(jQuery);

Added: CometVisu/trunk/visu/plugins/zweather/zweatherfeed/jquery.zweatherfeed.min.js
===================================================================
--- CometVisu/trunk/visu/plugins/zweather/zweatherfeed/jquery.zweatherfeed.min.js	                        (rev 0)
+++ CometVisu/trunk/visu/plugins/zweather/zweatherfeed/jquery.zweatherfeed.min.js	2011-07-06 19:45:58 UTC (rev 383)
@@ -0,0 +1,6 @@
+
+(function($){var row='odd';$.fn.weatherfeed=function(locations,options){var defaults={unit:'c',image:true,highlow:true,wind:true,link:true,showerror:true};var options=$.extend(defaults,options);return this.each(function(i,e){var $e=$(e);if(!$e.hasClass('weatherFeed'))$e.addClass('weatherFeed');if(!$.isArray(locations))return false;var count=locations.length;if(count>10)count=10;var locationid='';for(var i=0;i<count;i++){if(locationid!='')locationid+=',';locationid+="'"+locations[i]+"'";}
+now=new Date()
+var query="select * from weather.forecast where location in ("+locationid+") and u='"+options.unit+"'";var api='http://query.yahooapis.com/v1/public/yql?q='+encodeURIComponent(query)+'&rnd='+now.getFullYear()+now.getMonth()+now.getDay()+now.getHours()+'&format=json&callback=?';$.ajax({type:'GET',url:api,dataType:'json',success:function(data){if(data.query){if(data.query.results.channel.length>0){var result=data.query.results.channel.length;for(var i=0;i<result;i++){_callback(e,data.query.results.channel[i],options);}}else{_callback(e,data.query.results.channel,options);}}else{if(options.showerror)$e.html('<p>Weather information unavailable</p>');}},error:function(data){if(options.showerror)$e.html('<p>Weather request failed</p>');}});});};var _callback=function(e,feed,options){var $e=$(e);var wd=feed.wind.direction;if(wd>=348.75&&wd<=360){wd="N"};if(wd>=0&&wd<11.25){wd="N"};if(wd>=11.25&&wd<33.75){wd="NNE"};if(wd>=33.75&&wd<56.25){wd="NE"};if(wd>=56.25&&wd<78.75){wd="ENE"};if(wd>=78.75&&wd<101.25){wd="E"};if(wd>=101.25&&wd<123.75){wd="ESE"};if(wd>=123.75&&wd<146.25){wd="SE"};if(wd>=146.25&&wd<168.75){wd="SSE"};if(wd>=168.75&&wd<191.25){wd="S"};if(wd>=191.25&&wd<213.75){wd="SSW"};if(wd>=213.75&&wd<236.25){wd="SW"};if(wd>=236.25&&wd<258.75){wd="WSW"};if(wd>=258.75&&wd<281.25){wd="W"};if(wd>=281.25&&wd<303.75){wd="WNW"};if(wd>=303.75&&wd<326.25){wd="NW"};if(wd>=326.25&&wd<348.75){wd="NNW"};var wf=feed.item.forecast[0];wpd=feed.item.pubDate;n=wpd.indexOf(":");tpb=_getTimeAsDate(wpd.substr(n-2,8));tsr=_getTimeAsDate(feed.astronomy.sunrise);tss=_getTimeAsDate(feed.astronomy.sunset);if(tpb>tsr&&tpb<tss){daynight='d';}else{daynight='n';}
+var html='<div class="weatherItem '+row+'"';if(options.image)html+=' style="background-image: url(http://l.yimg.com/a/i/us/nws/weather/gr/'+feed.item.condition.code+daynight+'.png); background-repeat: no-repeat;"';html+='>';html+='<div class="weatherCity">'+feed.location.city+'</div>';html+='<div class="weatherTemp">'+feed.item.condition.temp+'&deg;</div>';html+='<div class="weatherDesc">'+feed.item.condition.text+'</div>';if(options.highlow)html+='<div class="weatherRange">High: '+wf.high+'&deg; Low: '+wf.low+'&deg;</div>';if(options.wind)html+='<div class="weatherWind">Wind: '+wd+' '+feed.wind.speed+feed.units.speed+'</div>';if(options.link)html+='<div class="weatherLink"><a href="'+feed.item.link+'">Read full forecast</a></div>';html+='</div>';if(row=='odd'){row='even';}else{row='odd';}
+$e.append(html);};var _getTimeAsDate=function(t){d=new Date();r=new Date(d.toDateString()+' '+t);return r;};})(jQuery);
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[382] wiregate/plugin/generic/schaltuhr.pl

[<sw...@us...>]

Revision: 382
          http://openautomation.svn.sourceforge.net/openautomation/?rev=382&view=rev
Author:   swiss1
Date:     2011-07-03 19:17:27 +0000 (Sun, 03 Jul 2011)

Log Message:
-----------
Ein BUG im Plugin sorgte daf?\195?\188r, dass jeder Schaltbefehl 3 mal pro Minute ausgef?\195?\188hrt wurde. Das ist nun behoben. Es wird nurnoch gesendet wenn der Wert im Aktor nicht mit dem Wert des Schaltpunkes ?\195?\188berein stimmt. Version 0.5 BETA

Modified Paths:
--------------
    wiregate/plugin/generic/schaltuhr.pl

Modified: wiregate/plugin/generic/schaltuhr.pl
===================================================================
--- wiregate/plugin/generic/schaltuhr.pl	2011-07-03 19:14:00 UTC (rev 381)
+++ wiregate/plugin/generic/schaltuhr.pl	2011-07-03 19:17:27 UTC (rev 382)
@@ -1,5 +1,5 @@
 # Plugin zum Zeit abh\xE4ngigem schaten von GA's (Schaltuhr)
-# Version 0.4 BETA 03.07.2011
+# Version 0.5 BETA 03.07.2011
 # Copyright: swiss (http://knx-user-forum.de/members/swiss.html)
 # License: GPL (v2)
 # Aufbau m\xF6glichst so, dass man unterhalb der Einstellungen nichts ver\xE4ndern muss!
@@ -12,9 +12,9 @@
 
 #Pro Schaltpunkt einfach den unten stehenden Eintrag kopieren und anpassen.
 
-push @Schaltzeiten, { name => "bew\xE4sserung_ein", montag => 1, dienstag => 1, mittwoch => 1, donnerstag => 1, freitag => 1, samstag => 0, sonntag => 1, Stunden => 20, Minuten => 30, Wert => 1, DPT => 1, ga => '2/0/0', KW => '', Monat => '' };
+push @Schaltzeiten, { name => "bew\xE4sserung_ein", montag => 1, dienstag => 1, mittwoch => 1, donnerstag => 1, freitag => 1, samstag => 0, sonntag => 1, Stunden => 21, Minuten => 02, Wert => 1, DPT => 1, ga => '2/0/0', KW => '', Monat => '' };
 
-push @Schaltzeiten, { name => "bew\xE4sserung_aus", montag => 1, dienstag => 1, mittwoch => 1, donnerstag => 1, freitag => 1, samstag => 0, sonntag => 1, Stunden => 20, Minuten => 31, Wert => 0, DPT => 1, ga => '2/0/0', KW => '', Monat => '' };
+push @Schaltzeiten, { name => "bew\xE4sserung_aus", montag => 1, dienstag => 1, mittwoch => 1, donnerstag => 1, freitag => 1, samstag => 0, sonntag => 1, Stunden => 21, Minuten => 03, Wert => 0, DPT => 1, ga => '2/0/0', KW => '', Monat => '' };
 
 ######################
 ##ENDE Einstellungen##
@@ -44,27 +44,27 @@
 $mon += 1;
 
 my $kw = getWeekNumber($year, $mon, $mday);
-$plugin_info{$plugname.'_debug'} = $kw;
 
 foreach my $element (@Schaltzeiten) {
-
-	if ($element->{$Wochentag[$wday]} == 1 && $element->{Stunden} == $hour && $element->{Minuten} == $min && $element->{KW} ne '') {
-		if ($element->{KW} == $kw) {
+	if (knx_read($element->{ga},0,$element->{DPT}) ne $element->{Wert}) {
+		if ($element->{$Wochentag[$wday]} == 1 && $element->{Stunden} == $hour && $element->{Minuten} == $min && $element->{KW} ne '') {
+			if ($element->{KW} == $kw) {
+				knx_write($element->{ga},$element->{Wert},$element->{DPT});
+				next;
+			} else {
+				next;
+			}
+		} elsif ($element->{$Wochentag[$wday]} == 1 && $element->{Stunden} == $hour && $element->{Minuten} == $min && $element->{Monat} ne '') {
+			if ($element->{Monat} == $mon) {
+				knx_write($element->{ga},$element->{Wert},$element->{DPT});
+				next;
+			} else {
+				next;
+			}
+		} elsif ($element->{$Wochentag[$wday]} == 1 && $element->{Stunden} == $hour && $element->{Minuten} == $min && $element->{KW} eq '' && $element->{Monat} eq '') {
 			knx_write($element->{ga},$element->{Wert},$element->{DPT});
 			next;
-		} else {
-			next;
 		}
-	} elsif ($element->{$Wochentag[$wday]} == 1 && $element->{Stunden} == $hour && $element->{Minuten} == $min && $element->{Monat} ne '') {
-		if ($element->{Monat} == $mon) {
-			knx_write($element->{ga},$element->{Wert},$element->{DPT});
-			next;
-		} else {
-			next;
-		}
-	} elsif ($element->{$Wochentag[$wday]} == 1 && $element->{Stunden} == $hour && $element->{Minuten} == $min && $element->{KW} eq '' && $element->{Monat} eq '') {
-		knx_write($element->{ga},$element->{Wert},$element->{DPT});
-		next;
 	}	
 next;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[381] CometVisu/trunk

[<chr...@us...>]

Revision: 381
          http://openautomation.svn.sourceforge.net/openautomation/?rev=381&view=rev
Author:   chris_ace
Date:     2011-07-03 19:14:00 +0000 (Sun, 03 Jul 2011)

Log Message:
-----------
cleaned up frameborder and transparency (removed MS proprietary allowtransparency again and changed frameborder to yes/no-list)
also added new attributes to documentation

Modified Paths:
--------------
    CometVisu/trunk/ChangeLog
    CometVisu/trunk/documentation/widgets.htm
    CometVisu/trunk/visu/designs/structure_pure.js
    CometVisu/trunk/visu/visu_config.xsd

Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog	2011-07-03 18:35:33 UTC (rev 380)
+++ CometVisu/trunk/ChangeLog	2011-07-03 19:14:00 UTC (rev 381)
@@ -1,7 +1,7 @@
 HEAD
 ====
 
--
+- added frameborder and background to iframe
 
 0.6.0-pre1
 ==========

Modified: CometVisu/trunk/documentation/widgets.htm
===================================================================
--- CometVisu/trunk/documentation/widgets.htm	2011-07-03 18:35:33 UTC (rev 380)
+++ CometVisu/trunk/documentation/widgets.htm	2011-07-03 19:14:00 UTC (rev 381)
@@ -1,2935 +1,2935 @@
-<html xmlns:v="urn:schemas-microsoft-com:vml"
-xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 12">
-<meta name=Originator content="Microsoft Word 12">
-<link rel=File-List href="widgets-Dateien/filelist.xml">
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Author>Jan N. Klug</o:Author>
-  <o:LastAuthor>Jan N. Klug</o:LastAuthor>
-  <o:Revision>8</o:Revision>
-  <o:Created>2011-05-12T10:58:00Z</o:Created>
-  <o:LastSaved>2011-05-14T07:38:00Z</o:LastSaved>
-  <o:Pages>3</o:Pages>
-  <o:Words>409</o:Words>
-  <o:Characters>2579</o:Characters>
-  <o:Lines>21</o:Lines>
-  <o:Paragraphs>5</o:Paragraphs>
-  <o:CharactersWithSpaces>2983</o:CharactersWithSpaces>
-  <o:Version>12.00</o:Version>
- </o:DocumentProperties>
-</xml><![endif]-->
-<link rel=themeData href="widgets-Dateien/themedata.thmx">
-<link rel=colorSchemeMapping href="widgets-Dateien/colorschememapping.xml">
-<!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackMoves>false</w:TrackMoves>
-  <w:TrackFormatting/>
-  <w:HyphenationZone>21</w:HyphenationZone>
-  <w:PunctuationKerning/>
-  <w:ValidateAgainstSchemas/>
-  <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
-  <w:IgnoreMixedContent>false</w:IgnoreMixedContent>
-  <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
-  <w:DoNotPromoteQF/>
-  <w:LidThemeOther>DE</w:LidThemeOther>
-  <w:LidThemeAsian>X-NONE</w:LidThemeAsian>
-  <w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>
-  <w:Compatibility>
-   <w:BreakWrappedTables/>
-   <w:SnapToGridInCell/>
-   <w:WrapTextWithPunct/>
-   <w:UseAsianBreakRules/>
-   <w:DontGrowAutofit/>
-   <w:SplitPgBreakAndParaMark/>
-   <w:DontVertAlignCellWithSp/>
-   <w:DontBreakConstrainedForcedTables/>
-   <w:DontVertAlignInTxbx/>
-   <w:Word11KerningPairs/>
-   <w:CachedColBalance/>
-  </w:Compatibility>
-  <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
-  <m:mathPr>
-   <m:mathFont m:val="Cambria Math"/>
-   <m:brkBin m:val="before"/>
-   <m:brkBinSub m:val="&#45;-"/>
-   <m:smallFrac m:val="off"/>
-   <m:dispDef/>
-   <m:lMargin m:val="0"/>
-   <m:rMargin m:val="0"/>
-   <m:defJc m:val="centerGroup"/>
-   <m:wrapIndent m:val="1440"/>
-   <m:intLim m:val="subSup"/>
-   <m:naryLim m:val="undOvr"/>
-  </m:mathPr></w:WordDocument>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:LatentStyles DefLockedState="false" DefUnhideWhenUsed="true"
-  DefSemiHidden="true" DefQFormat="false" DefPriority="99"
-  LatentStyleCount="267">
-  <w:LsdException Locked="false" Priority="0" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="Normal"/>
-  <w:LsdException Locked="false" Priority="9" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="heading 1"/>
-  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 2"/>
-  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 3"/>
-  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 4"/>
-  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 5"/>
-  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 6"/>
-  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 7"/>
-  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 8"/>
-  <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 9"/>
-  <w:LsdException Locked="false" Priority="39" Name="toc 1"/>
-  <w:LsdException Locked="false" Priority="39" Name="toc 2"/>
-  <w:LsdException Locked="false" Priority="39" Name="toc 3"/>
-  <w:LsdException Locked="false" Priority="39" Name="toc 4"/>
-  <w:LsdException Locked="false" Priority="39" Name="toc 5"/>
-  <w:LsdException Locked="false" Priority="39" Name="toc 6"/>
-  <w:LsdException Locked="false" Priority="39" Name="toc 7"/>
-  <w:LsdException Locked="false" Priority="39" Name="toc 8"/>
-  <w:LsdException Locked="false" Priority="39" Name="toc 9"/>
-  <w:LsdException Locked="false" Priority="35" QFormat="true" Name="caption"/>
-  <w:LsdException Locked="false" Priority="10" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="Title"/>
-  <w:LsdException Locked="false" Priority="1" Name="Default Paragraph Font"/>
-  <w:LsdException Locked="false" Priority="11" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="Subtitle"/>
-  <w:LsdException Locked="false" Priority="22" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="Strong"/>
-  <w:LsdException Locked="false" Priority="20" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="Emphasis"/>
-  <w:LsdException Locked="false" Priority="59" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Table Grid"/>
-  <w:LsdException Locked="false" UnhideWhenUsed="false" Name="Placeholder Text"/>
-  <w:LsdException Locked="false" Priority="1" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="No Spacing"/>
-  <w:LsdException Locked="false" Priority="60" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light Shading"/>
-  <w:LsdException Locked="false" Priority="61" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light List"/>
-  <w:LsdException Locked="false" Priority="62" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light Grid"/>
-  <w:LsdException Locked="false" Priority="63" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Shading 1"/>
-  <w:LsdException Locked="false" Priority="64" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Shading 2"/>
-  <w:LsdException Locked="false" Priority="65" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium List 1"/>
-  <w:LsdException Locked="false" Priority="66" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium List 2"/>
-  <w:LsdException Locked="false" Priority="67" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 1"/>
-  <w:LsdException Locked="false" Priority="68" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 2"/>
-  <w:LsdException Locked="false" Priority="69" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 3"/>
-  <w:LsdException Locked="false" Priority="70" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Dark List"/>
-  <w:LsdException Locked="false" Priority="71" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful Shading"/>
-  <w:LsdException Locked="false" Priority="72" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful List"/>
-  <w:LsdException Locked="false" Priority="73" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful Grid"/>
-  <w:LsdException Locked="false" Priority="60" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light Shading Accent 1"/>
-  <w:LsdException Locked="false" Priority="61" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light List Accent 1"/>
-  <w:LsdException Locked="false" Priority="62" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light Grid Accent 1"/>
-  <w:LsdException Locked="false" Priority="63" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Shading 1 Accent 1"/>
-  <w:LsdException Locked="false" Priority="64" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Shading 2 Accent 1"/>
-  <w:LsdException Locked="false" Priority="65" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium List 1 Accent 1"/>
-  <w:LsdException Locked="false" UnhideWhenUsed="false" Name="Revision"/>
-  <w:LsdException Locked="false" Priority="34" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="List Paragraph"/>
-  <w:LsdException Locked="false" Priority="29" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="Quote"/>
-  <w:LsdException Locked="false" Priority="30" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="Intense Quote"/>
-  <w:LsdException Locked="false" Priority="66" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium List 2 Accent 1"/>
-  <w:LsdException Locked="false" Priority="67" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 1 Accent 1"/>
-  <w:LsdException Locked="false" Priority="68" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 2 Accent 1"/>
-  <w:LsdException Locked="false" Priority="69" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 3 Accent 1"/>
-  <w:LsdException Locked="false" Priority="70" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Dark List Accent 1"/>
-  <w:LsdException Locked="false" Priority="71" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful Shading Accent 1"/>
-  <w:LsdException Locked="false" Priority="72" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful List Accent 1"/>
-  <w:LsdException Locked="false" Priority="73" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful Grid Accent 1"/>
-  <w:LsdException Locked="false" Priority="60" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light Shading Accent 2"/>
-  <w:LsdException Locked="false" Priority="61" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light List Accent 2"/>
-  <w:LsdException Locked="false" Priority="62" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light Grid Accent 2"/>
-  <w:LsdException Locked="false" Priority="63" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Shading 1 Accent 2"/>
-  <w:LsdException Locked="false" Priority="64" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Shading 2 Accent 2"/>
-  <w:LsdException Locked="false" Priority="65" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium List 1 Accent 2"/>
-  <w:LsdException Locked="false" Priority="66" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium List 2 Accent 2"/>
-  <w:LsdException Locked="false" Priority="67" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 1 Accent 2"/>
-  <w:LsdException Locked="false" Priority="68" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 2 Accent 2"/>
-  <w:LsdException Locked="false" Priority="69" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 3 Accent 2"/>
-  <w:LsdException Locked="false" Priority="70" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Dark List Accent 2"/>
-  <w:LsdException Locked="false" Priority="71" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful Shading Accent 2"/>
-  <w:LsdException Locked="false" Priority="72" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful List Accent 2"/>
-  <w:LsdException Locked="false" Priority="73" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful Grid Accent 2"/>
-  <w:LsdException Locked="false" Priority="60" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light Shading Accent 3"/>
-  <w:LsdException Locked="false" Priority="61" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light List Accent 3"/>
-  <w:LsdException Locked="false" Priority="62" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light Grid Accent 3"/>
-  <w:LsdException Locked="false" Priority="63" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Shading 1 Accent 3"/>
-  <w:LsdException Locked="false" Priority="64" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Shading 2 Accent 3"/>
-  <w:LsdException Locked="false" Priority="65" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium List 1 Accent 3"/>
-  <w:LsdException Locked="false" Priority="66" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium List 2 Accent 3"/>
-  <w:LsdException Locked="false" Priority="67" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 1 Accent 3"/>
-  <w:LsdException Locked="false" Priority="68" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 2 Accent 3"/>
-  <w:LsdException Locked="false" Priority="69" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 3 Accent 3"/>
-  <w:LsdException Locked="false" Priority="70" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Dark List Accent 3"/>
-  <w:LsdException Locked="false" Priority="71" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful Shading Accent 3"/>
-  <w:LsdException Locked="false" Priority="72" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful List Accent 3"/>
-  <w:LsdException Locked="false" Priority="73" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful Grid Accent 3"/>
-  <w:LsdException Locked="false" Priority="60" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light Shading Accent 4"/>
-  <w:LsdException Locked="false" Priority="61" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light List Accent 4"/>
-  <w:LsdException Locked="false" Priority="62" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light Grid Accent 4"/>
-  <w:LsdException Locked="false" Priority="63" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Shading 1 Accent 4"/>
-  <w:LsdException Locked="false" Priority="64" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Shading 2 Accent 4"/>
-  <w:LsdException Locked="false" Priority="65" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium List 1 Accent 4"/>
-  <w:LsdException Locked="false" Priority="66" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium List 2 Accent 4"/>
-  <w:LsdException Locked="false" Priority="67" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 1 Accent 4"/>
-  <w:LsdException Locked="false" Priority="68" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 2 Accent 4"/>
-  <w:LsdException Locked="false" Priority="69" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 3 Accent 4"/>
-  <w:LsdException Locked="false" Priority="70" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Dark List Accent 4"/>
-  <w:LsdException Locked="false" Priority="71" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful Shading Accent 4"/>
-  <w:LsdException Locked="false" Priority="72" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful List Accent 4"/>
-  <w:LsdException Locked="false" Priority="73" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful Grid Accent 4"/>
-  <w:LsdException Locked="false" Priority="60" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light Shading Accent 5"/>
-  <w:LsdException Locked="false" Priority="61" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light List Accent 5"/>
-  <w:LsdException Locked="false" Priority="62" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light Grid Accent 5"/>
-  <w:LsdException Locked="false" Priority="63" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Shading 1 Accent 5"/>
-  <w:LsdException Locked="false" Priority="64" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Shading 2 Accent 5"/>
-  <w:LsdException Locked="false" Priority="65" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium List 1 Accent 5"/>
-  <w:LsdException Locked="false" Priority="66" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium List 2 Accent 5"/>
-  <w:LsdException Locked="false" Priority="67" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 1 Accent 5"/>
-  <w:LsdException Locked="false" Priority="68" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 2 Accent 5"/>
-  <w:LsdException Locked="false" Priority="69" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 3 Accent 5"/>
-  <w:LsdException Locked="false" Priority="70" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Dark List Accent 5"/>
-  <w:LsdException Locked="false" Priority="71" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful Shading Accent 5"/>
-  <w:LsdException Locked="false" Priority="72" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful List Accent 5"/>
-  <w:LsdException Locked="false" Priority="73" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful Grid Accent 5"/>
-  <w:LsdException Locked="false" Priority="60" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light Shading Accent 6"/>
-  <w:LsdException Locked="false" Priority="61" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light List Accent 6"/>
-  <w:LsdException Locked="false" Priority="62" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Light Grid Accent 6"/>
-  <w:LsdException Locked="false" Priority="63" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Shading 1 Accent 6"/>
-  <w:LsdException Locked="false" Priority="64" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Shading 2 Accent 6"/>
-  <w:LsdException Locked="false" Priority="65" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium List 1 Accent 6"/>
-  <w:LsdException Locked="false" Priority="66" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium List 2 Accent 6"/>
-  <w:LsdException Locked="false" Priority="67" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 1 Accent 6"/>
-  <w:LsdException Locked="false" Priority="68" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 2 Accent 6"/>
-  <w:LsdException Locked="false" Priority="69" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Medium Grid 3 Accent 6"/>
-  <w:LsdException Locked="false" Priority="70" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Dark List Accent 6"/>
-  <w:LsdException Locked="false" Priority="71" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful Shading Accent 6"/>
-  <w:LsdException Locked="false" Priority="72" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful List Accent 6"/>
-  <w:LsdException Locked="false" Priority="73" SemiHidden="false"
-   UnhideWhenUsed="false" Name="Colorful Grid Accent 6"/>
-  <w:LsdException Locked="false" Priority="19" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="Subtle Emphasis"/>
-  <w:LsdException Locked="false" Priority="21" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="Intense Emphasis"/>
-  <w:LsdException Locked="false" Priority="31" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="Subtle Reference"/>
-  <w:LsdException Locked="false" Priority="32" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="Intense Reference"/>
-  <w:LsdException Locked="false" Priority="33" SemiHidden="false"
-   UnhideWhenUsed="false" QFormat="true" Name="Book Title"/>
-  <w:LsdException Locked="false" Priority="37" Name="Bibliography"/>
-  <w:LsdException Locked="false" Priority="39" QFormat="true" Name="TOC Heading"/>
- </w:LatentStyles>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- @font-face
-	{font-family:"Cambria Math";
-	panose-1:2 4 5 3 5 4 6 3 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:roman;
-	mso-font-pitch:variable;
-	mso-font-signature:-536870145 1107305727 0 0 415 0;}
-@font-face
-	{font-family:Cambria;
-	panose-1:2 4 5 3 5 4 6 3 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:roman;
-	mso-font-pitch:variable;
-	mso-font-signature:-536870145 1073743103 0 0 415 0;}
-@font-face
-	{font-family:Calibri;
-	panose-1:2 15 5 2 2 2 4 3 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:-520092929 1073786111 9 0 415 0;}
- /* Style Definitions */
- p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-unhide:no;
-	mso-style-qformat:yes;
-	mso-style-parent:"";
-	margin-top:0cm;
-	margin-right:0cm;
-	margin-bottom:10.0pt;
-	margin-left:0cm;
-	line-height:115%;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:"Calibri","sans-serif";
-	mso-ascii-font-family:Calibri;
-	mso-ascii-theme-font:minor-latin;
-	mso-fareast-font-family:Calibri;
-	mso-fareast-theme-font:minor-latin;
-	mso-hansi-font-family:Calibri;
-	mso-hansi-theme-font:minor-latin;
-	mso-bidi-font-family:"Times New Roman";
-	mso-bidi-theme-font:minor-bidi;
-	mso-fareast-language:EN-US;}
-h1
-	{mso-style-priority:9;
-	mso-style-unhide:no;
-	mso-style-qformat:yes;
-	mso-style-link:"\xDCberschrift 1 Zchn";
-	mso-style-next:Standard;
-	margin-top:24.0pt;
-	margin-right:0cm;
-	margin-bottom:0cm;
-	margin-left:0cm;
-	margin-bottom:.0001pt;
-	line-height:115%;
-	mso-pagination:widow-orphan lines-together;
-	page-break-after:avoid;
-	mso-outline-level:1;
-	font-size:14.0pt;
-	font-family:"Cambria","serif";
-	mso-ascii-font-family:Cambria;
-	mso-ascii-theme-font:major-latin;
-	mso-fareast-font-family:"Times New Roman";
-	mso-fareast-theme-font:major-fareast;
-	mso-hansi-font-family:Cambria;
-	mso-hansi-theme-font:major-latin;
-	mso-bidi-font-family:"Times New Roman";
-	mso-bidi-theme-font:major-bidi;
-	color:#365F91;
-	mso-themecolor:accent1;
-	mso-themeshade:191;
-	mso-font-kerning:0pt;
-	mso-fareast-language:EN-US;}
-span.berschrift1Zchn
-	{mso-style-name:"\xDCberschrift 1 Zchn";
-	mso-style-priority:9;
-	mso-style-unhide:no;
-	mso-style-locked:yes;
-	mso-style-link:"\xDCberschrift 1";
-	mso-ansi-font-size:14.0pt;
-	mso-bidi-font-size:14.0pt;
-	font-family:"Cambria","serif";
-	mso-ascii-font-family:Cambria;
-	mso-ascii-theme-font:major-latin;
-	mso-fareast-font-family:"Times New Roman";
-	mso-fareast-theme-font:major-fareast;
-	mso-hansi-font-family:Cambria;
-	mso-hansi-theme-font:major-latin;
-	mso-bidi-font-family:"Times New Roman";
-	mso-bidi-theme-font:major-bidi;
-	color:#365F91;
-	mso-themecolor:accent1;
-	mso-themeshade:191;
-	font-weight:bold;}
-.MsoChpDefault
-	{mso-style-type:export-only;
-	mso-default-props:yes;
-	font-size:10.0pt;
-	mso-ansi-font-size:10.0pt;
-	mso-bidi-font-size:10.0pt;
-	mso-ascii-font-family:Calibri;
-	mso-ascii-theme-font:minor-latin;
-	mso-fareast-font-family:Calibri;
-	mso-fareast-theme-font:minor-latin;
-	mso-hansi-font-family:Calibri;
-	mso-hansi-theme-font:minor-latin;
-	mso-bidi-font-family:"Times New Roman";
-	mso-bidi-theme-font:minor-bidi;
-	mso-fareast-language:EN-US;}
-@page WordSection1
-	{size:595.3pt 841.9pt;
-	margin:70.85pt 70.85pt 2.0cm 70.85pt;
-	mso-header-margin:35.4pt;
-	mso-footer-margin:35.4pt;
-	mso-paper-source:0;}
-div.WordSection1
-	{page:WordSection1;}
--->
-</style>
-<!--[if gte mso 10]>
-<style>
- /* Style Definitions */
- table.MsoNormalTable
-	{mso-style-name:"Normale Tabelle";
-	mso-tstyle-rowband-size:0;
-	mso-tstyle-colband-size:0;
-	mso-style-noshow:yes;
-	mso-style-priority:99;
-	mso-style-qformat:yes;
-	mso-style-parent:"";
-	mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
-	mso-para-margin:0cm;
-	mso-para-margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:10.0pt;
-	font-family:"Calibri","sans-serif";
-	mso-ascii-font-family:Calibri;
-	mso-ascii-theme-font:minor-latin;
-	mso-hansi-font-family:Calibri;
-	mso-hansi-theme-font:minor-latin;
-	mso-bidi-font-family:"Times New Roman";
-	mso-bidi-theme-font:minor-bidi;
-	mso-fareast-language:EN-US;}
-table.MsoTableGrid
-	{mso-style-name:Tabellengitternetz;
-	mso-tstyle-rowband-size:0;
-	mso-tstyle-colband-size:0;
-	mso-style-priority:59;
-	mso-style-unhide:no;
-	border:solid windowtext 1.0pt;
-	mso-border-alt:solid windowtext .5pt;
-	mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
-	mso-border-insideh:.5pt solid windowtext;
-	mso-border-insidev:.5pt solid windowtext;
-	mso-para-margin:0cm;
-	mso-para-margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:"Calibri","sans-serif";
-	mso-ascii-font-family:Calibri;
-	mso-ascii-theme-font:minor-latin;
-	mso-hansi-font-family:Calibri;
-	mso-hansi-theme-font:minor-latin;
-	mso-bidi-font-family:"Times New Roman";
-	mso-bidi-theme-font:minor-bidi;
-	mso-fareast-language:EN-US;}
-</style>
-<![endif]--><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="5122"/>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapelayout v:ext="edit">
-  <o:idmap v:ext="edit" data="1"/>
- </o:shapelayout></xml><![endif]-->
-</head>
-
-<body lang=DE style='tab-interval:35.4pt'>
-
-<div class=WordSection1>
-
-<h1 style='margin-bottom:10.0pt'>text</h1>
-
-<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
- style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
- mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>align</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>optional</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><span style='font-family:"Courier New"'>left</span>, <span
-  style='font-family:"Courier New"'>right</span>, <span style='font-family:
-  "Courier New"'>center</span></p>
-  </td>
- </tr>
-</table>
-
-<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p>&nbsp;</o:p></p>
-
-<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
- style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
- mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><o:p>&nbsp;</o:p></p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>optional</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>string</p>
-  </td>
- </tr>
-</table>
-
-<h1 style='margin-bottom:10.0pt'>designtoggle</h1>
-
-<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
- style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
- mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>-</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><o:p>&nbsp;</o:p></p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><o:p>&nbsp;</o:p></p>
-  </td>
- </tr>
-</table>
-
-<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p>&nbsp;</o:p></p>
-
-<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
- style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
- mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'></td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>optional</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>string</p>
-  </td>
- </tr>
-</table>
-
-<h1 style='margin-bottom:10.0pt'>switch</h1>
-
-<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
- style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
- mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:1'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>styling</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>optional</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>previously defined styling</p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:2'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>mapping</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>optional</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>previously defined mapping</p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:3'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>on_value</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>optional</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>string (default: \x841\x93)</p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>off_value</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>optional</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>string (default:\x930\x93)</p>
-  </td>
- </tr>
-</table>
-
-<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p>&nbsp;</o:p></p>
-
-<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
- style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
- mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:1'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>label</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>required</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>string</p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>address</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>required</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>KNX group address</p>
-  </td>
- </tr>
-</table>
-
-<h1 style='margin-bottom:10.0pt'>trigger</h1>
-
-<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
- style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
- mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:1'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>value</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>required</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>depends on DPT</p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:2'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>styling</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>optional</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>previously defined styling</p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:3;mso-yfti-lastrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>mapping</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>optional</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>previously defined mapping</p>
-  </td>
- </tr>
-</table>
-
-<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p>&nbsp;</o:p></p>
-
-<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
- style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
- mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:1'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>label</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>required</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>string</p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:2'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>address</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>required</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>KNX group address</p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:3;mso-yfti-lastrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'></td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'></td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'></td>
- </tr>
-</table>
-
-<h1 style='margin-bottom:10.0pt'>multitrigger</h1>
-
-<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
- style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
- mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
-  border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
-  solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:1'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>styling</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>optional</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>previously defined styling</p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:2'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>mapping</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>optional</p>
-  </td>
-  <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
-  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
-  mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>previously defined mapping</p>
-  </td>
- </tr>
- <tr style='mso-yfti-irow:3'>
-  <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
-  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
-  padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-  normal'>button1label</p>
-  </td>
-  <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
-  none;border-bottom...
 
[truncated message content]