GO Contact Sync Mod

Revision: 7
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=7&view=rev
Author:   cybdis
Date:     2010-11-04 21:53:31 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
Release 2.0 Code
Last changes: Updated GPL to RTF, as text files are not displayed in installer, requires RTF
Changed Homepage URL Shortcut to Project homepage

Modified Paths:
--------------
    trunk/GoogleContactsSync/GO Contact Sync Homepage.url
    trunk/GoogleContactsSync/GoogleContactsSync.csproj
    trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj

Added Paths:
-----------
    trunk/GoogleContactsSync/COPYING.rtf

Removed Paths:
-------------
    trunk/GoogleContactsSync/COPYING

Deleted: trunk/GoogleContactsSync/COPYING
===================================================================
--- trunk/GoogleContactsSync/COPYING	2010-11-04 21:26:52 UTC (rev 6)
+++ trunk/GoogleContactsSync/COPYING	2010-11-04 21:53:31 UTC (rev 7)
@@ -1,674 +0,0 @@
-                    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: trunk/GoogleContactsSync/COPYING.rtf
===================================================================
--- trunk/GoogleContactsSync/COPYING.rtf	                        (rev 0)
+++ trunk/GoogleContactsSync/COPYING.rtf	2010-11-04 21:53:31 UTC (rev 7)
@@ -0,0 +1,839 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch31506\stshfhich31506\stshfbi31506\deflang1031\deflangfe1031\themelang1031\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}
+{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f40\fbidi \fmodern\fcharset0\fprq1{\*\panose 020b0609020204030204}Consolas;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}
+{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}
+{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f41\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f42\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\f44\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f45\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f46\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f47\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\f48\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f49\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f61\fbidi \fmodern\fcharset238\fprq1 Courier New CE;}{\f62\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}
+{\f64\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f65\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f66\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f67\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}
+{\f68\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f69\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f381\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f382\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}
+{\f384\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f385\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f388\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f389\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}
+{\f441\fbidi \fmodern\fcharset238\fprq1 Consolas CE;}{\f442\fbidi \fmodern\fcharset204\fprq1 Consolas Cyr;}{\f444\fbidi \fmodern\fcharset161\fprq1 Consolas Greek;}{\f445\fbidi \fmodern\fcharset162\fprq1 Consolas Tur;}
+{\f448\fbidi \fmodern\fcharset186\fprq1 Consolas Baltic;}{\f449\fbidi \fmodern\fcharset163\fprq1 Consolas (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;}
+{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}{\fhimajor\f31536\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}
+{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
+{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;
+\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;
+\chyperlink\ctint255\cshade255\red0\green0\blue255;}{\*\defchp \f31506\fs22\lang1031\langfe1033\langfenp1033 }{\*\defpap \ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{
+\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1031\langfe1033\cgrid\langnp1031\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\*
+\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa200\sl276\slmult1
+\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31506\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1031\langfe1033\cgrid\langnp1031\langfenp1033 \snext11 \ssemihidden \sunhideused Normal Table;}{
+\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs21\alang1025 \ltrch\fcs0 \f40\fs21\lang1031\langfe1033\cgrid\langnp1031\langfenp1033 \sbasedon0 \snext15 \slink16 \sunhideused \styrsid5718632 
+Plain Text;}{\*\cs16 \additive \rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f40\fs21 \sbasedon10 \slink15 \slocked \styrsid5718632 Nur Text Zchn;}{\*\cs17 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf17 \sbasedon10 \sunhideused \styrsid14301273 Hyperlink;}}
+{\*\rsidtbl \rsid1192270\rsid5718632\rsid6101084\rsid13771833\rsid13964911\rsid14301273\rsid15627691\rsid15860973}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info
+{\author Stefan Strube}{\operator Stefan Strube}{\creatim\yr2010\mo11\dy4\hr22\min38}{\revtim\yr2010\mo11\dy4\hr22\min48}{\version5}{\edmins0}{\nofpages12}{\nofwords4805}{\nofchars30275}{\*\company Stru.be}{\nofcharsws35010}{\vern49255}}
+{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw11906\paperh16838\margl1334\margr1335\margt1417\margb1134\gutter0\ltrsect 
+\deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0
+\showxmlerrors1\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1334\dgvorigin1417\dghshow1\dgvshow1
+\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
+\asianbrkrule\rsidroot6101084\newtblstyruls\nogrowautofit\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal \nouicompat \fet0
+{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\headery708\footery708\colsx708\endnhere\sectlinegrid360\sectdefaultcl\sectrsid5718632\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}
+{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}
+{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9
+\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\s15\qc \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid14301273 \rtlch\fcs1 \af0\afs21\alang1025 \ltrch\fcs0 
+\f40\fs21\lang1031\langfe1033\cgrid\langnp1031\langfenp1033 {\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 GNU GENERAL PUBLIC LICENSE
+\par Version 3, 29 June 2007
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5718632 {\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+\par Copyright (C) 2007 Free Software Foundation, Inc. }{\field{\*\fldinst {\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid14301273  HYPERLINK "}{\rtlch\fcs1 \af2 \ltrch\fcs0 
+\f2\lang1033\langfe1033\langnp1033\insrsid14301273\charrsid15860973 http://fsf.org/}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid14301273 " }}{\fldrslt {\rtlch\fcs1 \af2 \ltrch\fcs0 
+\cs17\f2\ul\cf17\lang1033\langfe1033\langnp1033\insrsid14301273\charrsid4198816 http://fsf.org/}}}\sectd \ltrsect\linex0\headery708\footery708\colsx708\endnhere\sectlinegrid360\sectdefaultcl\sectrsid5718632\sftnbj {\rtlch\fcs1 \af2 \ltrch\fcs0 
+\f2\lang1033\langfe1033\langnp1033\insrsid14301273 
+\par }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 Everyone is permitted to copy and distribute verbatim copies}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid14301273  }{
+\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 of this license document, but changing it is not allowed.
+\par 
+\par }\pard \ltrpar\s15\qc \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid14301273 {\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 Preamble
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5718632 {\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+\par   The GNU General Public License is a free, copyleft license for}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+software and other kinds of works.
+\par 
+\par   The licenses for most software and other practical works are designed}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+to take away your freedom to share and change the works.  By contrast,}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+the GNU General Public License is intended to guarantee your freedom to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+share and change all versions of a program--to make sure it remains free}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+software for all its users.  We, the Free Software Foundation, use the}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+GNU General Public License for most of our software; it applies also to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+any other work released this way by its authors.  You can apply it to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+your programs, too.
+\par 
+\par   When we speak of free software, we are referring to freedom, not}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+price.  Our General Public Licenses are designed to make sure that you}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+have the freedom to distribute copies of free software (and charge for}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+them if you wish), that you receive source code or can get it if you}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+want it, that you can change the software or use pieces of it in new}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+free programs, and that you know you can do these things.
+\par 
+\par   To protect your rights, we need to prevent others from denying you}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+these rights or asking you to surrender the rights.  Therefore, you have}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+certain responsibilities if you distribute copies of the software, or if}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+you modify it: responsibilities to respect the freedom of others.
+\par 
+\par   For example, if you distribute copies of such a program, whether}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+gratis or for a fee, you must pass on to the recipients the same}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+freedoms that you received.  You must make sure that they, too, receive}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+or can get the source code.  And you must show them these terms so they}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+know their rights.
+\par 
+\par   Developers that use the GNU GPL protect your rights with two steps:}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+(1) assert copyright on the software, and (2) offer you this License}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+giving you legal permission to copy, distribute and/or modify it.
+\par 
+\par   For the developers' and authors' protection, the GPL clearly explains}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+that there is no warranty for this free software.  For both users' and}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+authors' sake, the GPL requires that modified versions be marked as}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+changed, so that their problems will not be attributed erroneously to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+authors of previous versions.
+\par 
+\par   Some devices are designed to deny users access to install or run}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+modified versions of the software inside them, although the manufacturer}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+can do so.  This is fundamentally incompatible with the aim of}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 pro
+tecting users' freedom to change the software.  The systematic}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+pattern of such abuse occurs in the area of products for individuals to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+use, which is precisely where it is most unacceptable.  Therefore, we}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+have designed this version of the GPL to prohibit the practice for those}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+products.  If such problems arise substantially in other domains, we}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+stand ready to extend this provision to those domains in future versions}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+of the GPL, as needed to protect the freedom of users.
+\par 
+\par   Finally, every program is threatened constantly by software patents.}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+States should not allow patents to restrict development and use of}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+software on general-purpose computers, but in those that do, we wish to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+avoid the special danger that patents applied to a free program could}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+make it effectively proprietary.  To prevent this, the GPL assures that}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+patents cannot be used to render the program non-free.
+\par 
+\par   The precise terms and conditions for copying, distribution and}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+modification follow.
+\par 
+\par }\pard \ltrpar\s15\qc \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid1192270 {\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 TERMS AND CONDITIONS
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid5718632 {\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+\par   0. Definitions.
+\par 
+\par   "This License" refers to version 3 of the GNU General Public License.
+\par 
+\par   "Copyright" also means copyright-like laws that apply to other kinds of}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+works, such as semiconductor masks.
+\par 
+\par   "The Program" refers to any copyrightable work licensed under this}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+License.  Each licensee is addressed as "you".  "Licensees" and}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+"recipients" may be individuals or organizations.
+\par 
+\par   To "modify" a work means to copy from or adapt all or part of the work}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+in a fashion requiring copyright permission, other than the making of an}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+exact copy.  The resulting work is called a "modified version" of the}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+earlier work or a work "based on" the earlier work.
+\par 
+\par   A "covered work" means either the unmodified Program or a work based}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+on the Program.
+\par 
+\par   To "propagate" a work means to do anything with it that, without}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+permission, would make you directly or secondarily liable for}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+infringement under applicable copyright law, except executing it on a}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+computer or modifying a private copy.  Propagation includes copying,}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+distribution (with or without modification), making available to the}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+public, and in some countries other activities as well.
+\par 
+\par   To "convey" a work means any kind of propagation that enables other}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+parties to make or receive copies.  Mere interaction with a user through}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+a computer network, with no transfer of a copy, is not conveying.
+\par 
+\par   An interactive user interface displays "Appropriate Legal Notices"}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+to the extent that it includes a convenient and prominently visible}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+feature that (1) displays an appropriate copyright notice, and (2)}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+tells the user that there is no warranty for the work (except to the}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+extent that warranties are provided), that licensees may convey the}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+work under this License, and how to view a copy of this License.  If}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+the interface presents a list of user commands or options, such as a}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+menu, a prominent item in the list meets this criterion.
+\par 
+\par   1. Source Code.
+\par 
+\par   The "source code" for a work means the preferred form of the work}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+for making modifications to it.  "Object code" means any non-source}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+form of a work.
+\par 
+\par   A "Standard Interface" means an interface that either is an official}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+standard defined by a recognized standards body, or, in the case of}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+interfaces specified for a particular programming language, one that}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+is widely used among developers working in that language.
+\par 
+\par   The "System Libraries" of an executable work include anything, other}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+than the work as a whole, that (a) is included in the normal form of}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+packaging a Major Component, but which is not part of that Major}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+Component, and (b) serves only to enable use of the work with that}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+Major Component, or to implement a Standard Interface for which an}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+implementation is available to the public in source code form.  A}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+"Major Component", in this context, means a major essential component}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+(kernel, window system, and so on) of the specific operating system}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+(if any) on which the executable work runs, or a compiler used to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+produce the work, or an object code interpreter used to run it.
+\par 
+\par   The "Corresponding Source" for a work in object code form means all}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+the source code needed to generate, install, and (for an executable}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+work) run the object code and to modify the work, including scripts to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+control those activities.  However, it does not include the work's}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 Sy
+stem Libraries, or general-purpose tools or generally available free}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+programs which are used unmodified in performing those activities but}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+which are not part of the work.  For example, Corresponding Source}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+includes interface definition files associated with source files for}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+the work, and the source code for shared libraries and dynamically}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+linked subprograms that the work is specifically designed to require,}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+such as by intimate data communication or control flow between those}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+subprograms and other parts of the work.
+\par 
+\par   The Corresponding Source need not include anything that users}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+can regenerate automatically from other parts of the Corresponding}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 Source.
+
+\par 
+\par   The Corresponding Source for a work in source code form is that}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+same work.
+\par 
+\par   2. Basic Permissions.
+\par 
+\par   All rights granted under this License are granted for the term of}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+copyright on the Program, and are irrevocable provided the stated}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+conditions are met.  This License explicitly affirms your unlimited}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+permission to run the unmodified Program.  The output from running a}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+covered work is covered by this License only if the output, given its}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+content, constitutes a covered work.  This License acknowledges your}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+rights of fair use or other equivalent, as provided by copyright law.
+\par 
+\par   You may make, run and propagate covered works that you do not}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+convey, without conditions so long as your license otherwise remains}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+in force.  You may convey covered works to others for the sole purpose}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+of having them make modifications exclusively for you, or provide you}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+with facilities for running those works, provided that you comply with}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+the terms of this License in conveying all material for which you do}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+not control copyright.  Those thus making or running the covered works}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+for you must do so exclusively on your behalf, under your direction}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+and control, on terms that prohibit them from making any copies of}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+your copyrighted material outside their relationship with you.
+\par 
+\par   Conveying under any other circumstances is permitted solely under}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+the conditions stated below.  Sublicensing is not allowed; section 10}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+makes it unnecessary.
+\par 
+\par   3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+\par 
+\par   No covered work shall be deemed part of an effective technological}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+measure under any applicable law fulfilling obligations under article}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+11 of the WIPO copyright treaty adopted on 20 December 1996, or}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+similar laws prohibiting or restricting circumvention of such}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 measures.
+
+\par 
+\par   When you convey a covered work, you waive any legal power to forbid}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+circumvention of technological measures to the extent such circumvention}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+is effected by exercising rights under this License with respect to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+the covered work, and you disclaim any intention to limit operation or}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+modification of the work as a means of enforcing, against the work's}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+users, your or third parties' legal rights to forbid circumvention of}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+technological measures.
+\par 
+\par   4. Conveying Verbatim Copies.
+\par 
+\par   You may convey verbatim copies of the Program's source code as you}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+receive it, in any medium, provided that you conspicuously and}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+appropriately publish on each copy an appropriate copyright notice;}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+keep intact all notices stating that this License and any}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+non-permissive terms added in accord with section 7 apply to the code;}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+keep intact all notices of the absence of any warranty; and give all}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+recipients a copy of this License along with the Program.
+\par 
+\par   You may charge any price or no price for each copy that you convey,}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+and you may offer support or warranty protection for a fee.
+\par 
+\par   5. Conveying Modified Source Versions.
+\par 
+\par   You may convey a work based on the Program, or the modifications to}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+produce it from the Program, in the form of source code under the}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+terms of section 4, provided that you also meet all of these conditions:
+\par 
+\par     a) The work must carry prominent notices stating that you modified}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+    it, and giving a relevant date.
+\par 
+\par     b) The work must carry prominent notices stating that it is    released under this License and any conditions added under section
+\par     7.  This requirement modifies the requirement in section 4 to
+\par     "keep intact all notices".
+\par 
+\par     c) You must license the entire work, as a whole, under this
+\par     License to anyone who comes into possession of a copy.  This
+\par     License will therefore apply, along with any applicable section 7
+\par     additional terms, to the whole of the work, and all its parts,
+\par     regardless of how they are packaged.  This License gives no
+\par     permission to license the work in any other way, but it does not
+\par     invalidate such permission if you have separately received it.
+\par 
+\par     d) If the work has interactive user interfaces, each must display
+\par     Appropriate Legal Notices; however, if the Program has interactive
+\par     interfaces that do not display Appropriate Legal Notices, your
+\par     work need not make them do so.
+\par 
+\par   A compilation of a covered work with other separate and independent}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+works, which are not by their nature extensions of the covered work,}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+and which are not combined with it such as to form a larger program,}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+in or on a volume of a storage or distribution medium, is called an}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+"aggregate" if the compilation and its resulting copyright are not}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+used to limit the access or legal rights of the compilation's users}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+beyond what the individual works permit.  Inclusion of a covered work}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+in an aggregate does not cause this License to apply to the other}{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid13771833  }{\rtlch\fcs1 \af2 \ltrch\fcs0 \f2\lang1033\langfe1033\langnp1033\insrsid15627691\charrsid15860973 
+parts of the aggregate.
+\par 
+\par   6. Conveying Non-Source Forms.
+\par 
+\par   You may convey a covered work in object code form under the terms
+\par of sections 4 and 5, provided that you also convey the
+\par machine-readable Corresponding Source under the terms of this License,
+\par in one of these ways:
+\par 
+\par     a) Convey the object code in, or embodied in, a physical product
+\par     (including a physical distribution medium), accompanied by the
+\par     Corresponding Source fixed on a durable physical medium
+\par     customarily used for software interchange.
+\par 
+\par     b) Convey the object code in, or embodied in, a physical product
+\par     (including a physical distribution medium), accompanied by a
+\par     written offer, valid for at least three years and valid for as
+\par     long as you offer spare parts or customer support for that product
+\par     model, to give anyone who possesses the object code either (1) a
+\par     copy of the Corresponding Source for all the software in the
+\par     product that is covered by this License, on a durable physical
+\par     medium customarily used for software interchange, for a price no
+\par     more than your reasonable cost of physically performing this
+\par     conveying of source, or (2) access to copy the
+\par     Corresponding Source from a network server at no charge.
+\par 
+\par     c) Convey individual copies of the object code with a copy of the
+\par     written offer to provide the Corresponding Source.  This
+\par     alternative is allowed only occasionally and noncommercially, and
+\par     only if you received the object code with such an offer, in accord
+\par     with subsection 6b.
+\par 
+\par     d) Convey the object code by offering access from a designated
+\par     place (gratis or for a charge), and offer equivalent access to the
+\par     Corresponding Source in the same way through the same place at no
+\par     further charge.  You need not require recipients to copy the
+\par     Corresponding Source along with the object code.  If the place to
+\par     copy the object code is a network server, the Corresponding Source
+\par     may be on a different server (operated by you or a third party)
+\par     that supports equivalent copying facilities, provided you maintain
+\par     clear directions next to the object code saying where to find the
+\par     Corresponding Source.  Regardless of what server hosts the
+\par     Corresponding Source, you remain obligated to ensure that it is
+\par     available for as long as needed to satisfy these requirements.
+\par 
+\par     e) Convey the object code using peer-to-peer transmission, provided
+\par     you inform other peers where the object code and Corresponding
+\par     Source of the work are being offered to the general public at no
+\par     charge under subsection 6d.
+\par 
+\par   A separable portion of the object code, whose source code is excluded
+\par from the Corresponding Source as a System Library, need not be
+\par included in conveying the object code work.
+\par 
+\par   A "User Product" is either (1) a "consumer product", which means any
+\par tangible personal property which is normally used for personal, family,
+\par or household purposes, or (2) anything designed or sold for incorporation
+\par into a dwelling.  In determining whether a product is a consumer product,
+\par doubtful cases shall be resolved in favor of coverage.  For a particular
+\par product received by a particular user, "normally used" refers to a
+\par typical or common use of that class of product, regardless of the status
+\par of the particular user or of the way in which the particular user
+\par actually uses, or expects or is expected to use, the product.  A product
+\par is a consumer product regardless of whether the product has substantial
+\par commercial, industrial or non-consumer uses, unless such uses represent
+\par the only significant mode of use of the product.
+\par 
+\par   "Installation Information" for a User Product means any methods,
+\par procedures, authorization keys, or other information required to install
+\par and execute modified versions of a covered work in that User Product from
+\par a modified version of its Corresponding Source.  The information must
+\par suffice to ensure that the continued functioning of the modified object
+\par code is in no case prevented or interfered with solely because
+\par modification has been made.
+\par 
+\par   If you convey an object code work under this section in, or with, or
+\par specifically for use in, a User Product, and the conveying occurs as
+\par part of a transaction in which the right of possession and use of the
+\par User Product is transferred to the recipient in perpetuity or for a
+\par fixed term (regardless of how the transaction is characterized), the
+\par Corresponding Source conveyed under this section must be accompanied
+\par by the Installation Information.  But this requirement does not apply
+\par if neither you nor any third party retains the ability to install
+\par modified object code on the User Product (for example, the work has
+\par been installed in ROM).
+\par 
+\par   The requirement to provide Installation Information does not include a
+\par requirement to continue to provide support service, warranty, or updates
+\par for a work that has been modified or installed by the recipient, or for
+\par the User Product in which it has been modified or installed.  Access to a
+\par network may be denied when the modification itself materially and
+\par adversely affects the operation of the network or violates the rules and
+\par protocols for communication across the network.
+\par 
+\par   Corresponding Source conveyed, and Installation Information provided,
+\par in accord with this section must be in a format that is publicly
+\par documented (and with an implementation available to the public in
+\par source code form), and must require no special password or key for
+\par unpacking, reading or copying.
+\par 
+\par   7. Additional Terms.
+\par 
+\par   "Additional permissions" are terms that supplement the terms of this
+\par License by making exceptions from one or more of its conditions.
+\par Additional permissions that are applicable to the entire Program shall
+\par be treated as though they were included in this License, to the extent
+\par that they are valid under applicable law.  If additional permissions
+\par apply only to part of the Program, that part may be used separately
+\par under those permissions, but the entire Program remains governed by
+\par this License without regard to the additional permissions.
+\par 
+\par   When you convey a copy of a covered work, you may at your option
+\par remove any additional permissions from that copy, or from any part of
+\par it.  (Additional permissions may be written to require their own
+\par removal in certain cases when you modify the work.)  You may place
+\par additional permissions on material, added by you to a covered work,
+\par for which you have or can give appropriate copyright permission.
+\par 
+\par   Notwithstanding any other provision of this License, for material you
+\par add to a covered work, you may (if authorized by the copyright holders of
+\par that material) supplement the terms of this License with terms:
+\par 
+\par     a) Disclaiming warranty or limiting liability differently from the
+\par     terms of sections 15 and 16 of this License; or
+\par 
+\par     b) Requiring preservation of specified reasonable legal notices or
+\par     author attributions in that material or in the Appropriate Legal
+\par     Notices displayed by works containing it; or
+\par 
+\par     c) Prohibiting misrepresentation of the origin of that material, or
+\par     requiring that modified versions of such material be marked in
+\par     reasonable ways as different from the original version; or
+\par 
+\par     d) Limiting the use for publicity purposes of names of licensors or
+\par     authors of the material; or
+\par 
+\par     e) Declining to grant rights under trademark law for use of some
+\par     trade names, trademarks, or service marks; or
+\par 
+\par     f) Requiring indemnification of licensors and authors of that
+\par     material by anyone who conveys the material (or modified versions of
+\par     it) with contractual assumptions of liability to the recipient, for
+\par     any liability that these contractual assumptions directly impose on
+\par     those licensors and authors.
+\par 
+\par   All other non-permissive additional terms are considered "further
+\par restrictions" within the meaning of section 10.  If the Program as you
+\par received it, or any part of it, contains a notice stating that it is
+\par governed by this License along with a term that is a further
+\par restriction, you may remove that term.  If a license document contains
+\par a further restriction but permits relicensing or conveying under this
+\par License, you may add to a covered work material governed by the terms
+\par of that license document, provided that the further restriction does
+\par not survive such relicensing or conveying.
+\par 
+\par   If you add terms to a covered work in accord with this section, you
+\par must place, in the relevant source files, a statement of the
+\par additional terms that apply to those files, or a notice indicating
+\par where to find the applicable terms.
+\par 
+\par   Additional terms, permissive or non-permissive, may be stated in the
+\par form of a separately written license, or stated as exceptions;
+\par the above requirements apply either way.
+\par 
+\par   8. Termination.
+\par 
+\par   You may not propagate or modify a covered work except as expressly
+\par provided under this License.  Any attempt otherwise to propagate or
+\par modify it is void, and will automatically terminate your rights under
+\par this License (including any patent licenses granted under the third
+\par paragraph of section 11).
+\par 
+\par   However, if you cease all violation of this License, then your
+\par license from a particular copyright holder is reinstated (a)
+\par provisionally, unless and until the copyright holder explicitly and
+\par finally terminates your license, and (b) permanently, if the copyright
+\par holder fails to notify you of the violation by some reasonable means
+\par prior to 60 days after the cessation.
+\par 
+\par   Moreover, your license from a particular copyright holder is
+\par reinstated permanently if the copyright holder notifies you of the
+\par violation by some reasonable means, this is the first time you have
+\par received notice of violation of this License (for any work) from that
+\par copyright holder, and you cure the violation prior to 30 days after
+\par your receipt of the notice.
+\par 
+\par   Termination of your rights under this section does not terminate the
+\par licenses of parties who have received copies or rights from you under
+\par this License.  If your rights have been terminated and not permanently
+\par reinstated, you do not qualify to receive new licenses for the same
+\par material under section 10.
+\par 
+\par   9. Acceptance Not Required for Having Copies.
+\par 
+\par   You are not required to accept this License in order to receive or
+\par run a copy of the Program.  Ancillary propagation of a covered work
+\par occurring solely as a consequence of using peer-to-peer transmission
+\par to receive a copy likewise does not require acceptance.  However,
+\par nothing other than this License grants you permission to propagate or
+\par modify any covered work.  These actions infringe copyright if you do
+\par not accept this License.  Therefore, by modifying or propagating a
+\par covered work, you indicate your acceptance of this License to do so.
+\par 
+\par   10. Automatic Licensing of Downstream Recipients.
+\par 
+\par   Each time you convey a covered work, the recipient automatically
+\par receives a license from the original licensors, to run, modify and
+\par propagate that work, subject to this License.  You are not responsible
+\par for enforcing compliance by third parties with this License.
+\par 
+\par   An "entity transaction" is a transaction transferring control of an
+\par organization, or substantially all assets of one, or subdividing an
+\par organization, or merging organizations.  If propagation of a covered
+\par work results from an entity transaction, each party to that
+\par transaction who receives a copy of the work also receives whatever
+\par licenses to the work the party's predecessor in interest had or could
+\par give under the previous paragraph, plus a right to possession of the
+\par Corresponding Source of the work from the predecessor in interest, if
+\par the predecessor has it or can get it with reasonable efforts.
+\par 
+\par   You may not impose any further restrictions on the exercise of the
+\par rights granted or affirmed under this License.  For example, you may
+\par not impose a license fee, royalty, or other charge for exercise of
+\par rights granted under this License, and you may not initiate litigation
+\par (including a cross-claim or counterclaim in a lawsuit) alleging that
+\par any patent claim is infringed by making, using, selling, offering for

@@ Diff output truncated at 100000 characters. @@

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

Revision: 13
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=13&view=rev
Author:   cybdis
Date:     2010-11-07 21:45:41 +0000 (Sun, 07 Nov 2010)

Log Message:
-----------
Removed .user file from SVN, this is local settings file only

Removed Paths:
-------------
    trunk/GoogleContactsSync/GoogleContactsSync.csproj.user

Property Changed:
----------------
    trunk/GoogleContactsSync/


Property changes on: trunk/GoogleContactsSync
___________________________________________________________________
Modified: svn:ignore
   - obj
bin

   + *.user
bin
obj


Deleted: trunk/GoogleContactsSync/GoogleContactsSync.csproj.user
===================================================================
--- trunk/GoogleContactsSync/GoogleContactsSync.csproj.user	2010-11-07 21:44:16 UTC (rev 12)
+++ trunk/GoogleContactsSync/GoogleContactsSync.csproj.user	2010-11-07 21:45:41 UTC (rev 13)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishUrlHistory />
-    <InstallUrlHistory />
-    <SupportUrlHistory />
-    <UpdateUrlHistory />
-    <BootstrapperUrlHistory />
-    <ErrorReportUrlHistory />
-    <FallbackCulture>en-US</FallbackCulture>
-    <VerifyUploadedFiles>false</VerifyUploadedFiles>
-  </PropertyGroup>
-</Project>
\ No newline at end of file


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

Revision: 15
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=15&view=rev
Author:   createsoftware
Date:     2010-11-08 18:54:33 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
Fix a few comments (2 typos, and made indentation more consistent in App.config)

Modified Paths:
--------------
    trunk/GoogleContactsSync/App.config
    trunk/GoogleContactsSync/SettingsForm.cs

Modified: trunk/GoogleContactsSync/App.config
===================================================================
--- trunk/GoogleContactsSync/App.config	2010-11-08 00:52:52 UTC (rev 14)
+++ trunk/GoogleContactsSync/App.config	2010-11-08 18:54:33 UTC (rev 15)
@@ -8,16 +8,18 @@
 
 		<!-- Uses the configured proxy address -->
     <!-- Comment this in and comment configuration below out to bypass system configuration -->
-    <!--<defaultProxy enabled="true" useDefaultCredentials="true">
-      <proxy bypassonlocal="True" proxyaddress="http://proxy:80/"></proxy>
-    </defaultProxy>-->
+    <!--
+    <defaultProxy enabled="true" useDefaultCredentials="true">
+        <proxy bypassonlocal="True" proxyaddress="http://proxy:80/"></proxy>
+    </defaultProxy>
+    -->
 
 
 		<!-- Uses the default system proxy, usually means "none" -->
-    <!-- Comment this in to override Internet Explorer Proxy Setgings -->
+    <!-- Comment this in to override Internet Explorer Proxy Settings -->
     <!--
 		<defaultProxy enabled="true" useDefaultCredentials="true">
-      <proxy usesystemdefault="True"/>
+        <proxy usesystemdefault="True"/>
     </defaultProxy>
 		-->
   </system.net>

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2010-11-08 00:52:52 UTC (rev 14)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2010-11-08 18:54:33 UTC (rev 15)
@@ -559,7 +559,7 @@
 			try
 			{
 				if (MessageBox.Show("The proxy configuration is in beta stage, a more comfortable solution is to come. For now, you have to edit the Applications Config file with administrator privileges.\n\nOpen Configuration file now?",
-					"Googlel Contact Sync", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == System.Windows.Forms.DialogResult.OK)
+					"Google Contact Sync", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == System.Windows.Forms.DialogResult.OK)
 				{
 					StartFileSystemWatcher();
 					try


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

Revision: 16
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=16&view=rev
Author:   createsoftware
Date:     2010-11-08 19:18:12 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
Add SVG source files for the icons used.

Added Paths:
-----------
    trunk/GoogleContactsSync/contacts-sync.svg
    trunk/GoogleContactsSync/sync.ico
    trunk/GoogleContactsSync/sync.svg

Added: trunk/GoogleContactsSync/contacts-sync.svg
===================================================================
--- trunk/GoogleContactsSync/contacts-sync.svg	                        (rev 0)
+++ trunk/GoogleContactsSync/contacts-sync.svg	2010-11-08 19:18:12 UTC (rev 16)
@@ -0,0 +1,989 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg1256"
+   sodipodi:version="0.32"
+   inkscape:version="0.47+devel r9596"
+   sodipodi:docname="contacts-sync.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3964">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3966" />
+      <stop
+         style="stop-color:#c4a000;stop-opacity:0;"
+         offset="1"
+         id="stop3968" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3948">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3950" />
+      <stop
+         style="stop-color:#c4a000;stop-opacity:0;"
+         offset="1"
+         id="stop3952" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective58" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12512">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop12513" />
+      <stop
+         style="stop-color:#fff520;stop-opacity:0.89108908;"
+         offset="0.50000000"
+         id="stop12517" />
+      <stop
+         style="stop-color:#fff300;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop12514" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2116">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2118" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2120" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2094">
+      <stop
+         style="stop-color:#d6e3f0;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2096" />
+      <stop
+         style="stop-color:#95b1cf;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2098" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2803">
+      <stop
+         id="stop2805"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2807"
+         offset="1.0000000"
+         style="stop-color:#cbcbcb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2795">
+      <stop
+         id="stop2797"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.068627454;" />
+      <stop
+         id="stop2799"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="4.9530048"
+       x2="41.219128"
+       y1="4.9530050"
+       x1="35.433035"
+       gradientTransform="matrix(0.254,0,0,3.759813,0.788629,0.148567)"
+       id="linearGradient2801"
+       xlink:href="#linearGradient2795"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="84.287079"
+       x2="10.219901"
+       y1="93.338043"
+       x1="10.496115"
+       gradientTransform="matrix(2.262742,0,0,0.441942,1,-0.875)"
+       id="linearGradient2813"
+       xlink:href="#linearGradient2803"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2094"
+       id="linearGradient2100"
+       gradientTransform="matrix(0.95775,0,0,1.027989,1,-0.571911)"
+       x1="6.5871811"
+       y1="22.132999"
+       x2="14.511404"
+       y2="22.132999"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2116"
+       id="linearGradient2112"
+       gradientTransform="matrix(1.025428,0,0,0.957303,0,-0.806758)"
+       x1="73.361984"
+       y1="26.652197"
+       x2="-2.7582901"
+       y2="21.270376"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5013"
+       gradientUnits="userSpaceOnUse"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient5016"
+       gradientUnits="userSpaceOnUse"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5020"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient5027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5029"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8662"
+       id="radialGradient3756"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8662">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8664" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop8666" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831"
+       id="linearGradient3758"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.465413,-0.277593)"
+       x1="13.478554"
+       y1="10.612206"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       id="linearGradient2831">
+      <stop
+         style="stop-color:#edd400;stop-opacity:1;"
+         offset="0"
+         id="stop2833" />
+      <stop
+         style="stop-color:#edd400;stop-opacity:0;"
+         offset="1"
+         id="stop2835" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2847"
+       id="linearGradient3760"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,47.52791,45.84741)"
+       x1="37.128052"
+       y1="29.729605"
+       x2="37.065414"
+       y2="26.194071" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2847">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2849" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:0;"
+         offset="1"
+         id="stop2851" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient3766"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       id="linearGradient2380">
+      <stop
+         style="stop-color:#b9cfe7;stop-opacity:1"
+         offset="0"
+         id="stop2382" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop2384" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient3762"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       id="linearGradient3812">
+      <stop
+         style="stop-color:#b9cfe7;stop-opacity:1"
+         offset="0"
+         id="stop3814" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3816" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient3764"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2871">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2873" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop2875" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2690"
+       id="linearGradient3768"
+       gradientUnits="userSpaceOnUse"
+       x1="32.647972"
+       y1="30.748846"
+       x2="37.124462"
+       y2="24.842253" />
+    <linearGradient
+       id="linearGradient2690">
+      <stop
+         style="stop-color:#f2e045;stop-opacity:1;"
+         offset="0"
+         id="stop2692" />
+      <stop
+         style="stop-color:#f2e045;stop-opacity:0;"
+         offset="1"
+         id="stop2694" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2682"
+       id="linearGradient3770"
+       gradientUnits="userSpaceOnUse"
+       x1="36.713837"
+       y1="31.455952"
+       x2="37.124462"
+       y2="24.842253" />
+    <linearGradient
+       id="linearGradient2682">
+      <stop
+         style="stop-color:#3977c3;stop-opacity:1;"
+         offset="0"
+         id="stop2684" />
+      <stop
+         style="stop-color:#89aedc;stop-opacity:0;"
+         offset="1"
+         id="stop2686" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient3776"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588623"
+       y2="26.649363" />
+    <linearGradient
+       id="linearGradient2402">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop2404" />
+      <stop
+         style="stop-color:#528ac5;stop-opacity:1;"
+         offset="1"
+         id="stop2406" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient3778"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient3772"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588623"
+       y2="26.649363" />
+    <linearGradient
+       id="linearGradient3842">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3844" />
+      <stop
+         style="stop-color:#528ac5;stop-opacity:1;"
+         offset="1"
+         id="stop3846" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient3774"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient3780"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2797">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2799-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2801" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient3782"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2116"
+       id="linearGradient7583"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.025428,0,0,0.957303,-0.74185344,-0.96713365)"
+       x1="73.361984"
+       y1="26.652197"
+       x2="-2.7582901"
+       y2="21.270376" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2795"
+       id="linearGradient7586"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.254,0,0,3.759813,0.04102604,-0.01191168)"
+       x1="35.433035"
+       y1="4.9530050"
+       x2="41.219128"
+       y2="4.9530048" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2094"
+       id="linearGradient7589"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95775,0,0,1.027989,0.25814656,-0.73228665)"
+       x1="6.5871811"
+       y1="22.132999"
+       x2="14.511404"
+       y2="22.132999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2803"
+       id="linearGradient7592"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.262742,0,0,0.441942,0.25814656,-1.0353756)"
+       x1="10.496115"
+       y1="93.338043"
+       x2="10.219901"
+       y2="84.287079" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient7621"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient7631"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588623"
+       y2="26.649363" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient7633"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2326"
+       id="radialGradient2332"
+       cx="15.09403"
+       cy="13.282721"
+       fx="15.09403"
+       fy="13.282721"
+       r="10.16466"
+       gradientTransform="matrix(2.496031,0,0,2.300689,-25.12402,-17.82636)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2326">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2328" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2330" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831-4"
+       id="linearGradient3832-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26320782,0,0,0.26320782,66.552256,44.4379)"
+       x1="13.478554"
+       y1="10.612206"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       id="linearGradient2831-4">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2833-1" />
+      <stop
+         id="stop2855"
+         offset="0.33333334"
+         style="stop-color:#5b86be;stop-opacity:1;" />
+      <stop
+         style="stop-color:#83a8d8;stop-opacity:0;"
+         offset="1"
+         id="stop2835-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2847-9"
+       id="linearGradient3834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.26320782,0,0,-0.26320782,78.939474,56.578362)"
+       x1="37.128052"
+       y1="29.729605"
+       x2="37.065414"
+       y2="26.194071" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2847-9">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2849-3" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:0;"
+         offset="1"
+         id="stop2851-6" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8662"
+       id="radialGradient3987"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831"
+       id="linearGradient3989"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26320782,0,0,0.26320782,66.552256,44.4379)"
+       x1="13.359826"
+       y1="10.374751"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3948"
+       id="linearGradient3991"
+       gradientUnits="userSpaceOnUse"
+       x1="69.3125"
+       y1="48.837837"
+       x2="69.3125"
+       y2="49.751732" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2690"
+       id="linearGradient3993"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26320782,0,0,0.26320782,66.429756,44.510965)"
+       x1="32.647972"
+       y1="30.748846"
+       x2="37.124462"
+       y2="24.842253" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3964"
+       id="linearGradient3995"
+       gradientUnits="userSpaceOnUse"
+       x1="76.625"
+       y1="51.78125"
+       x2="76.625"
+       y2="50.905693" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient3997"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient3999"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2116"
+       id="linearGradient4003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.025428,0,0,0.957303,-0.74185344,-0.96713365)"
+       x1="73.361984"
+       y1="26.652197"
+       x2="-2.7582901"
+       y2="21.270376" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2094"
+       id="linearGradient4006"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95775,0,0,1.027989,0.25814656,-0.73228665)"
+       x1="6.5871811"
+       y1="22.132999"
+       x2="14.511404"
+       y2="22.132999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2803"
+       id="linearGradient4009"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.262742,0,0,0.441942,0.25814656,-1.0353756)"
+       x1="10.496115"
+       y1="93.338043"
+       x2="10.219901"
+       y2="84.287079" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.27843137"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="-0.53007968"
+     inkscape:cy="16.408999"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="838"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     fill="#ef2929"
+     stroke="#cc0000"
+     inkscape:showpageshadow="false"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:date />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>address</rdf:li>
+            <rdf:li>contact</rdf:li>
+            <rdf:li>book</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 32.354603,4.4916445 7.424621,0 c 0.707107,0 1.237436,0.1767768 1.414213,1.0606598 l 0.883884,6.8942917 c 0.08839,1.06066 -0.375651,1.414213 -1.325825,1.414213 l -8.57367,0 0.176777,-9.3691645 z"
+       id="path21630"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       id="path21632"
+       d="m 33.361097,5.4784993 6.360557,0 c 0.308149,0 0.476759,0.030162 0.522547,0.321598 l 0.791435,6.3839757 c 0.06977,0.430972 0.182408,0.675355 -0.140278,0.689892 l -7.673799,0 0.139538,-7.3954657 z"
+       style="opacity:0.48538011;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       id="path21634"
+       d="m 34.854603,12.241644 7.424621,0 c 0.707107,0 1.237436,0.176777 1.414213,1.06066 l 0.883884,6.894292 c 0.08839,1.06066 -0.375651,1.414213 -1.325825,1.414213 l -8.57367,0 0.176777,-9.369165 z"
+       style="color:#000000;fill:#9db029;fill-opacity:1;fill-rule:evenodd;stroke:#727e0a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.48538011;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 35.861097,13.228499 6.360557,0 c 0.308149,0 0.476759,0.03016 0.522547,0.321598 l 0.791435,6.383976 c 0.06977,0.430972 0.182408,0.675355 -0.140278,0.689892 l -7.673799,0 0.139538,-7.395466 z"
+       id="path21636"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:#cc0000;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 35.322657,20.616122 8.44541,0 c 0.804325,0 1.407567,0.219398 1.608649,1.316384 l 1.005406,8.556499 c 0.10054,1.316384 -0.427298,1.755179 -1.508109,1.755179 l -9.752438,0 0.201082,-11.628062 z"
+       id="path21638"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       id="path21640"
+       d="m 36.467531,21.603198 7.235051,0 c 0.350515,0 0.542307,0.03835 0.59439,0.408939 l 0.900247,8.117754 c 0.07936,0.548017 0.207487,0.858771 -0.159564,0.877255 l -8.728847,0 0.158723,-9.403948 z"
+       style="opacity:0.48538011;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.00000072;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <g
+       id="g5022"
+       transform="matrix(0.02165152,0,0,0.04307902,42.344397,33.884714)">
+      <rect
+         y="-150.69685"
+         x="-1559.2523"
+         height="478.35718"
+         width="1339.6335"
+         id="rect4173"
+         style="opacity:0.40206185;color:#000000;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc"
+         id="path5058"
+         d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+         id="path5018"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#5b6b94;fill-opacity:1;fill-rule:nonzero;stroke:#364878;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="M 5.6224688,5.358214 C 5.7132515,3.4432247 6.6301224,2.3939057 8.337025,2.3886683 L 37.663923,2.298682 c 0.246585,-7.566e-4 0.568541,0.2001494 0.593236,0.4499311 l 3.258479,32.9582389 -1.315302,0.05663 0.62924,6.445654 c 0.06101,0.624987 -0.18137,1.159308 -1.071429,1.163523 L 9.0474512,43.518098 C 6.5149066,43.530092 3.911992,41.439384 4.0340803,38.864027 L 5.6224688,5.358214 z"
+       id="rect1408"
+       sodipodi:nodetypes="csssccsssss" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path2489"
+       d="m 39.383147,34.714624 -29.1875,0.125 c -1.5565185,0.177868 -2.8125004,1.39612 -2.8125004,3 0,1.60388 1.2559819,2.822132 2.8125004,3 l 29.1875,0.125 0,-0.0625 c -1.655622,-0.07815 -3,-1.387649 -3,-3.0625 0,-1.674851 1.344378,-2.984348 3,-3.0625 l 0,-0.0625 z"
+       style="color:#000000;fill:url(#linearGradient4009);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccssc"
+       id="path2784"
+       d="m 8.9456466,2.6521243 c -1.7069103,0 -2.637397,1.0090062 -2.71875,2.8613658 l -1.65625,32.1519059 c -0.09196,3.078427 1.8268732,4.828713 3.8125,5.330478 -4.25,-1.630671 -3.6875,-8.991795 1.6250004,-8.961028 l 30.898286,0 -3.3125,-30.9519784 C 37.568172,2.8421547 37.246025,2.6521243 37.000183,2.6521243 l -28.0545364,0 z"
+       style="color:#000000;fill:url(#linearGradient4006);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:none;stroke:url(#linearGradient4003);stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 9.1332474,3.1733074 c -1.6838994,0 -2.3366772,0.7321629 -2.4169335,2.554148 L 5.4174099,35.616822 c 0.9333283,-1.606747 2.4395958,-2.182761 4.8524021,-2.182761 l 29.951416,0 -2.825902,-29.8370736 c -0.02245,-0.2370539 -0.343218,-0.42368 -0.585745,-0.42368 l -27.6763336,0 z"
+       id="path2104"
+       sodipodi:nodetypes="cccscssc" />
+    <g
+       id="g3972"
+       transform="matrix(2.0943988,0,0,2.0943988,-130.06776,-88.516531)">
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:type="arc"
+         style="opacity:0.38333333;color:#000000;fill:url(#radialGradient3987);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         id="path8660"
+         sodipodi:cx="24.837126"
+         sodipodi:cy="36.421127"
+         sodipodi:rx="15.644737"
+         sodipodi:ry="8.3968935"
+         d="m 40.481863,36.421127 c 0,4.637477 -7.004387,8.396894 -15.644737,8.396894 -8.64035,0 -15.6447375,-3.759417 -15.6447375,-8.396894 0,-4.637476 7.0043875,-8.396893 15.6447375,-8.396893 8.64035,0 15.644737,3.759417 15.644737,8.396893 z"
+         transform="matrix(-0.39211016,0,0,-0.26353736,82.540351,64.32575)" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="path2865"
+         d="m 71.73416,47.250933 c 0,0 -2.35242,-0.164505 -1.628598,2.599177 l -2.02341,0 c 0,0 0.131604,-3.125593 3.652008,-2.599177 z"
+         style="color:#000000;fill:url(#linearGradient3989);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3991);stroke-width:0.2632077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+         inkscape:connector-curvature="0" />
+      <g
+         style="fill:#edd400;fill-opacity:1;stroke:#c4a000;stroke-opacity:1"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         transform="matrix(-0.15241075,-0.12876864,-0.12876864,0.15241075,81.410453,48.030414)"
+         id="g1878">
+        <path
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:1.31916928;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+           d="M 44.306783,50.229694 C 62.821497,35.818859 49.664587,13.411704 22.462411,12.49765 L 22.113843,3.1515478 7.6245439,20.496754 22.714328,33.219189 c 0,0 -0.251917,-9.88122 -0.251917,-9.88122 18.82976,0.998977 32.981627,14.071729 21.844372,26.891725 z"
+           id="path1880"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         style="color:#000000;fill:url(#linearGradient3993);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3995);stroke-width:0.2632077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+         d="m 73.898278,53.311976 c 0,0 2.35242,0.164505 1.628598,-2.599177 l 2.046675,0 c 0,0.395497 -0.154869,3.125593 -3.675273,2.599177 z"
+         id="path2839"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+      <g
+         id="g2779"
+         transform="matrix(0.15241075,0.12876864,0.12876864,-0.15241075,64.344881,52.548276)"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:1.31916928;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path2781"
+           d="M 44.306783,50.229694 C 62.821497,35.818859 49.664587,13.411704 22.462411,12.49765 L 22.399432,3.0690297 7.793943,20.424005 22.462411,33.006349 c 0,0 0,-9.66838 0,-9.66838 18.82976,0.998977 32.981627,14.071729 21.844372,26.891725 z"
+           style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:1.31916928;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccccccc"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="path2791"
+         d="m 68.288661,54.562214 0.01645,-3.915217 3.405251,-0.0987 -1.155186,1.363106 1.017884,0.624644 c -0.789623,0.592218 -1.197477,0.637523 -1.460684,1.311993 L 69.370957,53.2926 68.28866,54.562217 z"
+         style="opacity:0.27222224;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:connector-curvature="0" />
+      <g
+         style="opacity:0.5;fill:none;stroke:#ffffff;stroke-opacity:1"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         transform="matrix(0.13385065,0.1130875,0.1130875,-0.13385065,65.383982,52.549645)"
+         id="g2793">
+        <path
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           style="color:#000000;fill:none;stroke:url(#linearGradient3997);stroke-width:1.50208926;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+           d="M 51.090265,45.943705 C 60.210465,30.723955 46.631614,12.20113 19.485058,11.948579 L 19.513464,3.7032834 6.5341979,19.296639 19.367661,30.26876 c 0,0 0.05562,-9.006878 0.05562,-9.006878 17.527815,-0.223909 35.195185,10.103372 31.666984,24.681823 z"
+           id="path2795"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         id="g2805"
+         transform="matrix(-0.13385065,-0.1130875,-0.1130875,0.13385065,80.392668,48.028864)"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         style="opacity:0.5;fill:none;stroke:#ffffff;stroke-opacity:1">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path2807"
+           d="M 51.389927,46.505946 C 60.510127,31.286196 47.050763,12.432359 19.628482,12.069755 L 19.342824,4.0507204 6.3413093,19.379475 19.809059,30.764589 c 0,0 -0.181765,-9.453243 -0.181765,-9.453243 18.244937,0.381972 34.783881,10.925246 31.762633,25.1946 z"
+           style="color:#000000;fill:none;stroke:url(#linearGradient3999);stroke-width:1.50208926;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="path2811"
+         d="m 68.222859,48.853894 c 0.94582,-2.748225 4.328132,-1.617309 5.313508,-1.184435 1.098974,0.05566 1.493635,-0.746195 2.368871,-0.789624 -3.698001,-2.576803 -7.583676,-1.71085 -7.682379,1.974059 z"
+         style="opacity:0.27222224;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

Added: trunk/GoogleContactsSync/sync.ico
===================================================================
(Binary files differ)


Property changes on: trunk/GoogleContactsSync/sync.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/GoogleContactsSync/sync.svg
===================================================================
--- trunk/GoogleContactsSync/sync.svg	                        (rev 0)
+++ trunk/GoogleContactsSync/sync.svg	2010-11-08 19:18:12 UTC (rev 16)
@@ -0,0 +1,864 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg1256"
+   sodipodi:version="0.32"
+   inkscape:version="0.47+devel r9596"
+   sodipodi:docname="sync.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="D:\Images\Icônes\sync.png"
+   inkscape:export-xdpi="30"
+   inkscape:export-ydpi="30">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3964">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3966" />
+      <stop
+         style="stop-color:#c4a000;stop-opacity:0;"
+         offset="1"
+         id="stop3968" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3948">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3950" />
+      <stop
+         style="stop-color:#c4a000;stop-opacity:0;"
+         offset="1"
+         id="stop3952" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective58" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12512">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop12513" />
+      <stop
+         style="stop-color:#fff520;stop-opacity:0.89108908;"
+         offset="0.50000000"
+         id="stop12517" />
+      <stop
+         style="stop-color:#fff300;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop12514" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2116">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2118" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2120" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2094">
+      <stop
+         style="stop-color:#d6e3f0;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2096" />
+      <stop
+         style="stop-color:#95b1cf;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2098" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2803">
+      <stop
+         id="stop2805"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2807"
+         offset="1.0000000"
+         style="stop-color:#cbcbcb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2795">
+      <stop
+         id="stop2797"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.068627454;" />
+      <stop
+         id="stop2799"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="4.9530048"
+       x2="41.219128"
+       y1="4.9530050"
+       x1="35.433035"
+       gradientTransform="matrix(0.254,0,0,3.759813,0.788629,0.148567)"
+       id="linearGradient2801"
+       xlink:href="#linearGradient2795"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="84.287079"
+       x2="10.219901"
+       y1="93.338043"
+       x1="10.496115"
+       gradientTransform="matrix(2.262742,0,0,0.441942,1,-0.875)"
+       id="linearGradient2813"
+       xlink:href="#linearGradient2803"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2094"
+       id="linearGradient2100"
+       gradientTransform="matrix(0.95775,0,0,1.027989,1,-0.571911)"
+       x1="6.5871811"
+       y1="22.132999"
+       x2="14.511404"
+       y2="22.132999"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2116"
+       id="linearGradient2112"
+       gradientTransform="matrix(1.025428,0,0,0.957303,0,-0.806758)"
+       x1="73.361984"
+       y1="26.652197"
+       x2="-2.7582901"
+       y2="21.270376"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5013"
+       gradientUnits="userSpaceOnUse"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient5016"
+       gradientUnits="userSpaceOnUse"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5020"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8662"
+       id="radialGradient3756"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8662">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8664" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop8666" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831"
+       id="linearGradient3758"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.465413,-0.277593)"
+       x1="13.478554"
+       y1="10.612206"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       id="linearGradient2831">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.33333334;"
+         offset="0"
+         id="stop2833" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2835" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2847"
+       id="linearGradient3760"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,47.52791,45.84741)"
+       x1="37.128052"
+       y1="29.729605"
+       x2="37.065414"
+       y2="26.194071" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2847">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2849" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:0;"
+         offset="1"
+         id="stop2851" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient3766"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       id="linearGradient2380">
+      <stop
+         style="stop-color:#b9cfe7;stop-opacity:1"
+         offset="0"
+         id="stop2382" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop2384" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient3762"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       id="linearGradient3812">
+      <stop
+         style="stop-color:#b9cfe7;stop-opacity:1"
+         offset="0"
+         id="stop3814" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3816" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient3764"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2871">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2873" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop2875" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2690"
+       id="linearGradient3768"
+       gradientUnits="userSpaceOnUse"
+       x1="32.647972"
+       y1="30.748846"
+       x2="37.124462"
+       y2="24.842253" />
+    <linearGradient
+       id="linearGradient2690">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.33333334;"
+         offset="0"
+         id="stop2692" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2694" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2682"
+       id="linearGradient3770"
+       gradientUnits="userSpaceOnUse"
+       x1="36.713837"
+       y1="31.455952"
+       x2="37.124462"
+       y2="24.842253" />
+    <linearGradient
+       id="linearGradient2682">
+      <stop
+         style="stop-color:#3977c3;stop-opacity:1;"
+         offset="0"
+         id="stop2684" />
+      <stop
+         style="stop-color:#89aedc;stop-opacity:0;"
+         offset="1"
+         id="stop2686" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient3776"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588623"
+       y2="26.649363" />
+    <linearGradient
+       id="linearGradient2402">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop2404" />
+      <stop
+         style="stop-color:#528ac5;stop-opacity:1;"
+         offset="1"
+         id="stop2406" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient3778"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient3772"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588623"
+       y2="26.649363" />
+    <linearGradient
+       id="linearGradient3842">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3844" />
+      <stop
+         style="stop-color:#528ac5;stop-opacity:1;"
+         offset="1"
+         id="stop3846" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient3774"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient3780"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2797">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2799-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2801" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient3782"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2116"
+       id="linearGradient7583"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.025428,0,0,0.957303,-0.74185344,-0.96713365)"
+       x1="73.361984"
+       y1="26.652197"
+       x2="-2.7582901"
+       y2="21.270376" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2795"
+       id="linearGradient7586"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.254,0,0,3.759813,0.04102604,-0.01191168)"
+       x1="35.433035"
+       y1="4.9530050"
+       x2="41.219128"
+       y2="4.9530048" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2094"
+       id="linearGradient7589"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95775,0,0,1.027989,0.25814656,-0.73228665)"
+       x1="6.5871811"
+       y1="22.132999"
+       x2="14.511404"
+       y2="22.132999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2803"
+       id="linearGradient7592"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.262742,0,0,0.441942,0.25814656,-1.0353756)"
+       x1="10.496115"
+       y1="93.338043"
+       x2="10.219901"
+       y2="84.287079" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient7621"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient7631"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588623"
+       y2="26.649363" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient7633"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2326"
+       id="radialGradient2332"
+       cx="15.09403"
+       cy="13.282721"
+       fx="15.09403"
+       fy="13.282721"
+       r="10.16466"
+       gradientTransform="matrix(2.496031,0,0,2.300689,-25.12402,-17.82636)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2326">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2328" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2330" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831-4"
+       id="linearGradient3832-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26320782,0,0,0.26320782,66.552256,44.4379)"
+       x1="13.478554"
+       y1="10.612206"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       id="linearGradient2831-4">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2833-1" />
+      <stop
+         id="stop2855"
+         offset="0.33333334"
+         style="stop-color:#5b86be;stop-opacity:1;" />
+      <stop
+         style="stop-color:#83a8d8;stop-opacity:0;"
+         offset="1"
+         id="stop2835-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2847-9"
+       id="linearGradient3834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.26320782,0,0,-0.26320782,78.939474,56.578362)"
+       x1="37.128052"
+       y1="29.729605"
+       x2="37.065414"
+       y2="26.194071" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2847-9">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2849-3" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:0;"
+         offset="1"
+         id="stop2851-6" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8662"
+       id="radialGradient3987"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831"
+       id="linearGradient3989"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26320782,0,0,0.26320782,66.552256,44.4379)"
+       x1="13.359826"
+       y1="10.374751"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3948"
+       id="linearGradient3991"
+       gradientUnits="userSpaceOnUse"
+       x1="69.3125"
+       y1="48.837837"
+       x2="69.3125"
+       y2="49.751732" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2690"
+       id="linearGradient3993"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26320782,0,0,0.26320782,66.429756,44.510965)"
+       x1="32.647972"
+       y1="30.748846"
+       x2="37.124462"
+       y2="24.842253" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3964"
+       id="linearGradient3995"
+       gradientUnits="userSpaceOnUse"
+       x1="76.625"
+       y1="51.78125"
+       x2="76.625"
+       y2="50.905693" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient3997"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient3999"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2690"
+       id="linearGradient3254"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0297544,0,0,1.0716977,-0.92817807,-2.6136219)"
+       x1="32.647972"
+       y1="30.748846"
+       x2="37.124462"
+       y2="24.842253" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831"
+       id="linearGradient3261"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0297544,0,0,1.0716977,-0.44891832,-2.9111191)"
+       x1="13.359826"
+       y1="10.374751"
+       x2="15.419417"
+       y2="19.115122" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.27843137"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="36.776675"
+     inkscape:cy="26.361333"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="838"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     fill="#ef2929"
+     stroke="#cc0000"
+     inkscape:showpageshadow="false"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:date />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>address</rdf:li>
+            <rdf:li>contact</rdf:li>
+            <rdf:li>book</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       transform="matrix(-1.5340622,0,0,-1.0730395,62.101697,78.065816)"
+       d="m 40.481863,36.421127 a 15.644737,8.3968935 0 1 1 -31.2894745,0 15.644737,8.3968935 0 1 1 31.2894745,0 z"
+       sodipodi:ry="8.3968935"
+       sodipodi:rx="15.644737"
+       sodipodi:cy="36.421127"
+       sodipodi:cx="24.837126"
+       id="path8660"
+       style="opacity:0.38333333;color:#000000;fill:url(#radialGradient3987);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:url(#linearGradient3261);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.05051625000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+       d="m 19.824372,8.5426475 c 0,0 -9.203431,-0.6698116 -6.371604,10.5830135 l -7.9162367,0 c 0,0 0.5148775,-12.7264104 14.2878407,-10.5830135 z"
+       id="path2865"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true"
+       sodipodi:nodetypes="cccc" />
+    <g
+       id="g1878"
+       transform="matrix(-0.59628031,-0.52430453,-0.50378471,0.6205676,57.68117,11.716444)"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true"
+       style="fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-opacity:1">
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc"
+         id="path1880"
+         d="M 44.306783,50.229694 C 62.821497,35.818859 49.664587,13.411704 22.462411,12.49765 L 22.113843,3.1515478 7.6245439,20.496754 22.714328,33.219189 c 0,0 -0.251917,-9.88122 -0.251917,-9.88122 18.82976,0.998977 32.981627,14.071729 21.844372,26.891725 z"
+         style="color:#000000;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.31916928000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       inkscape:r_cy="true"
+       inkscape:r_cx="true"
+       id="path2839"
+       d="m 28.291104,33.221267 c 0,0 9.20343,0.669812 6.371603,-10.583013 l 8.007257,0 c 0,1.610336 -0.605898,12.72641 -14.37886,10.583013 z"
+       style="color:#000000;fill:url(#linearGradient3254);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.05051625000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible" />
+    <g
+       style="color:#000000;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.31916928000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+       inkscape:r_cy="true"
+       inkscape:r_cx="true"
+       transform="matrix(0.59628031,0.52430453,0.50378471,-0.6205676,-9.0848856,30.111726)"
+       id="g2779">
+      <path
+         inkscape:connector-curvature="0"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="color:#000000;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.31916928000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+         d="M 44.306783,50.229694 C 62.821497,35.818859 49.664587,13.411704 22.462411,12.49765 L 22.399432,3.0690297 7.793943,20.424005 22.462411,33.006349 c 0,0 0,-9.66838 0,-9.66838 18.82976,0.998977 32.981627,14.071729 21.844372,26.891725 z"
+         id="path2781"
+         sodipodi:nodetypes="ccccccc" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.27222224;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 6.3444615,38.311835 0.064358,-15.941506 13.3224468,-0.401875 -4.519462,5.55013 3.982292,2.54335 c -3.089261,2.411321 -4.684918,2.595788 -5.71467,5.342014 l -2.900671,-2.261574 -4.2342974,5.169473 z"
+       id="path2791"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true"
+       sodipodi:nodetypes="cccccccc" />
+    <g
+       id="g2793"
+       transform="matrix(0.52366718,0.46045596,0.442435,-0.54499684,-5.0195853,30.1173)"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true"
+       style="opacity:0.50000000000000000;fill:#ffffff;stroke:#ffffff;stroke-opacity:1">
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc"
+         id="path2795"
+         d="M 51.090265,45.943705 C 60.210465,30.723955 46.631614,12.20113 19.485058,11.948579 L 19.513464,3.7032834 6.5341979,19.296639 19.367661,30.26876 c 0,0 0.05562,-9.006878 0.05562,-9.006878 17.527815,-0.223909 35.195185,10.103372 31.666984,24.681823 z"
+         style="color:#000000;fill:#ffffff;stroke:url(#linearGradient3997);stroke-width:1.50208926000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+    </g>
+    <g
+       style="opacity:0.50000000000000000;fill:#ffffff;stroke:#ffffff;stroke-opacity:1"
+       inkscape:r_cy="true"
+       inkscape:r_cx="true"
+       transform="matrix(-0.52366718,-0.46045596,-0.442435,0.54499684,53.699265,11.710133)"
+       id="g2805">
+      <path
+         inkscape:connector-curvature="0"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="color:#000000;fill:#ffffff;stroke:url(#linearGradient3999);stroke-width:1.50208926000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+         d="M 51.389927,46.505946 C 60.510127,31.286196 47.050763,12.432359 19.628482,12.069755 L 19.342824,4.0507204 6.3413093,19.379475 19.809059,30.764589 c 0,0 -0.181765,-9.453243 -0.181765,-9.453243 18.244937,0.381972 34.783881,10.925246 31.762633,25.1946 z"
+         id="path2807"
+         sodipodi:nodetypes="ccccccc" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.27222224;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="M 6.0870227,15.06939 C 9.7873775,3.8795004 23.02008,8.484227 26.87519,10.246751 31.174733,10.47338 32.718775,7.2084846 36.142982,7.0316556 21.675202,-3.4602583 6.4731809,0.06562413 6.0870227,15.06939 z"
+       id="path2811"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>


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

Revision: 17
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=17&view=rev
Author:   createsoftware
Date:     2010-11-08 19:41:30 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
Greatly simplify the install header, and bring it in line with the other icons.

Modified Paths:
--------------
    trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj

Added Paths:
-----------
    trunk/GoogleContactsSyncSetup/install-banner.jpg
    trunk/GoogleContactsSyncSetup/install-banner.png
    trunk/GoogleContactsSyncSetup/install-banner.svg

Removed Paths:
-------------
    trunk/GoogleContactsSync/Banner.jpg

Deleted: trunk/GoogleContactsSync/Banner.jpg
===================================================================
(Binary files differ)

Modified: trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj
===================================================================
--- trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2010-11-08 19:18:12 UTC (rev 16)
+++ trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2010-11-08 19:41:30 UTC (rev 17)
@@ -27,31 +27,31 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_2637681C5175679288AE622AD5F3D073"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "MsmKey" = "8:_449A09D626FD4A6C9AEE1F387A23D13C"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_2637681C5175679288AE622AD5F3D073"
-        "OwnerKey" = "8:_7B3493E4F508AD39B56225A3A22A7CA1"
+        "MsmKey" = "8:_730D6DEA499B401A2283E3653AC03CE8"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_449A09D626FD4A6C9AEE1F387A23D13C"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_740487AA23916DBCC9045185B95148DB"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_4A752224454C3423EB491D7F591A0BE3"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "MsmKey" = "8:_8981E31E50DC3B8FEAB88F42E1BB388C"
+        "OwnerKey" = "8:_730D6DEA499B401A2283E3653AC03CE8"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_7B3493E4F508AD39B56225A3A22A7CA1"
+        "MsmKey" = "8:_8981E31E50DC3B8FEAB88F42E1BB388C"
         "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -63,38 +63,38 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_8D4B2A1AFD772DFFD6856F4F74B6186B"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "MsmKey" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_8D4B2A1AFD772DFFD6856F4F74B6186B"
-        "OwnerKey" = "8:_7B3493E4F508AD39B56225A3A22A7CA1"
+        "MsmKey" = "8:_BF84F1B768F89CCE751595364D3CAE52"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_8D4B2A1AFD772DFFD6856F4F74B6186B"
-        "OwnerKey" = "8:_2637681C5175679288AE622AD5F3D073"
+        "MsmKey" = "8:_BF84F1B768F89CCE751595364D3CAE52"
+        "OwnerKey" = "8:_8981E31E50DC3B8FEAB88F42E1BB388C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_99EAEC2297604A77A19F0CC551717209"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_BF84F1B768F89CCE751595364D3CAE52"
+        "OwnerKey" = "8:_730D6DEA499B401A2283E3653AC03CE8"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C5EC5372C42568A29DB2B96D648F4D25"
+        "MsmKey" = "8:_C2DF290608F576F4E43F5F21D80261EF"
         "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C5EC5372C42568A29DB2B96D648F4D25"
-        "OwnerKey" = "8:_4A752224454C3423EB491D7F591A0BE3"
+        "MsmKey" = "8:_C2DF290608F576F4E43F5F21D80261EF"
+        "OwnerKey" = "8:_F196B0156F31F4FC5E7668FD0C3AA9A0"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -105,6 +105,18 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_F196B0156F31F4FC5E7668FD0C3AA9A0"
+        "OwnerKey" = "8:_740487AA23916DBCC9045185B95148DB"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_F196B0156F31F4FC5E7668FD0C3AA9A0"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
@@ -112,33 +124,39 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_C5EC5372C42568A29DB2B96D648F4D25"
+        "OwnerKey" = "8:_740487AA23916DBCC9045185B95148DB"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_4A752224454C3423EB491D7F591A0BE3"
+        "OwnerKey" = "8:_F196B0156F31F4FC5E7668FD0C3AA9A0"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_2637681C5175679288AE622AD5F3D073"
+        "OwnerKey" = "8:_730D6DEA499B401A2283E3653AC03CE8"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_7B3493E4F508AD39B56225A3A22A7CA1"
+        "OwnerKey" = "8:_8981E31E50DC3B8FEAB88F42E1BB388C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_8D4B2A1AFD772DFFD6856F4F74B6186B"
+        "OwnerKey" = "8:_BF84F1B768F89CCE751595364D3CAE52"
         "MsmSig" = "8:_UNDEFINED"
         }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_C2DF290608F576F4E43F5F21D80261EF"
+        "MsmSig" = "8:_UNDEFINED"
+        }
     }
     "Configurations"
     {
@@ -269,20 +287,40 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2637681C5175679288AE622AD5F3D073"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_449A09D626FD4A6C9AEE1F387A23D13C"
             {
+            "SourcePath" = "8:..\\GoogleContactsSync\\contacts-sync.ico"
+            "TargetName" = "8:contacts-sync.ico"
+            "Tag" = "8:"
+            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_730D6DEA499B401A2283E3653AC03CE8"
+            {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Extensions, Version=1.2.0.0, Culture=neutral, PublicKeyToken=0b4c5df2ebf20876, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Contacts, Version=1.2.0.0, Culture=neutral, PublicKeyToken=7e065189dd4b982f, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_2637681C5175679288AE622AD5F3D073"
+                    "_730D6DEA499B401A2283E3653AC03CE8"
                     {
-                    "Name" = "8:Google.GData.Extensions.dll"
+                    "Name" = "8:Google.GData.Contacts.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Google.GData.Extensions.dll"
+            "SourcePath" = "8:Google.GData.Contacts.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -300,10 +338,21 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_449A09D626FD4A6C9AEE1F387A23D13C"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_740487AA23916DBCC9045185B95148DB"
             {
-            "SourcePath" = "8:..\\GoogleContactsSync\\contacts-sync.ico"
-            "TargetName" = "8:contacts-sync.ico"
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Microsoft.Office.Interop.Outlook, Version=11.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c"
+                "ScatterAssemblies"
+                {
+                    "_740487AA23916DBCC9045185B95148DB"
+                    {
+                    "Name" = "8:Microsoft.Office.Interop.Outlook.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Microsoft.Office.Interop.Outlook.dll"
+            "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
             "Condition" = "8:"
@@ -316,24 +365,24 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:TRUE"
-            "IsDependency" = "11:FALSE"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4A752224454C3423EB491D7F591A0BE3"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8981E31E50DC3B8FEAB88F42E1BB388C"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Microsoft.Office.Interop.Outlook, Version=11.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Extensions, Version=1.2.0.0, Culture=neutral, PublicKeyToken=0b4c5df2ebf20876, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_4A752224454C3423EB491D7F591A0BE3"
+                    "_8981E31E50DC3B8FEAB88F42E1BB388C"
                     {
-                    "Name" = "8:Microsoft.Office.Interop.Outlook.dll"
+                    "Name" = "8:Google.GData.Extensions.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Microsoft.Office.Interop.Outlook.dll"
+            "SourcePath" = "8:Google.GData.Extensions.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -351,20 +400,40 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7B3493E4F508AD39B56225A3A22A7CA1"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A131A9765CDF4FB18FC170D9BCFC2F20"
             {
+            "SourcePath" = "8:install-banner.jpg"
+            "TargetName" = "8:install-banner.jpg"
+            "Tag" = "8:"
+            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BF84F1B768F89CCE751595364D3CAE52"
+            {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Contacts, Version=1.2.0.0, Culture=neutral, PublicKeyToken=7e065189dd4b982f, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Client, Version=1.2.0.0, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_7B3493E4F508AD39B56225A3A22A7CA1"
+                    "_BF84F1B768F89CCE751595364D3CAE52"
                     {
-                    "Name" = "8:Google.GData.Contacts.dll"
+                    "Name" = "8:Google.GData.Client.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Google.GData.Contacts.dll"
+            "SourcePath" = "8:Google.GData.Client.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -382,20 +451,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8D4B2A1AFD772DFFD6856F4F74B6186B"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C2DF290608F576F4E43F5F21D80261EF"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Client, Version=1.2.0.0, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
                 "ScatterAssemblies"
                 {
-                    "_8D4B2A1AFD772DFFD6856F4F74B6186B"
+                    "_C2DF290608F576F4E43F5F21D80261EF"
                     {
-                    "Name" = "8:Google.GData.Client.dll"
+                    "Name" = "8:stdole.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Google.GData.Client.dll"
+            "SourcePath" = "8:stdole.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -413,10 +482,10 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_99EAEC2297604A77A19F0CC551717209"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EEF5B1E061E94324A394BC6D6E07F65D"
             {
-            "SourcePath" = "8:..\\GoogleContactsSync\\Banner.jpg"
-            "TargetName" = "8:Banner.jpg"
+            "SourcePath" = "8:..\\GoogleContactsSync\\COPYING.rtf"
+            "TargetName" = "8:COPYING.rtf"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
             "Condition" = "8:"
@@ -433,14 +502,14 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C5EC5372C42568A29DB2B96D648F4D25"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F196B0156F31F4FC5E7668FD0C3AA9A0"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
             "AssemblyAsmDisplayName" = "8:office, Version=11.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c"
                 "ScatterAssemblies"
                 {
-                    "_C5EC5372C42568A29DB2B96D648F4D25"
+                    "_F196B0156F31F4FC5E7668FD0C3AA9A0"
                     {
                     "Name" = "8:Office.dll"
                     "Attributes" = "3:512"
@@ -464,26 +533,6 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EEF5B1E061E94324A394BC6D6E07F65D"
-            {
-            "SourcePath" = "8:..\\GoogleContactsSync\\COPYING.rtf"
-            "TargetName" = "8:COPYING.rtf"
-            "Tag" = "8:"
-            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:TRUE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
         }
         "FileType"
         {
@@ -552,7 +601,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:GO Contact Sync Mod"
         "ProductCode" = "8:{DA6A4E27-24FB-425B-814F-4EDD81547F25}"
-        "PackageCode" = "8:{99140BC6-DEA3-4F0F-830B-B1DA87BAB4C4}"
+        "PackageCode" = "8:{7DDAD184-3745-4B5C-A2C8-61965C7774A3}"
         "UpgradeCode" = "8:{170B4620-F5BB-4D2E-97A1-239D79030F20}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
@@ -728,7 +777,7 @@
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
                             "Setting" = "3:2"
-                            "Value" = "8:_99EAEC2297604A77A19F0CC551717209"
+                            "Value" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
                             "UsePlugInResources" = "11:TRUE"
                             }
                             "ShowProgress"
@@ -773,7 +822,7 @@
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
                             "Setting" = "3:2"
-                            "Value" = "8:_99EAEC2297604A77A19F0CC551717209"
+                            "Value" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
                             "UsePlugInResources" = "11:TRUE"
                             }
                             "CopyrightWarning"
@@ -784,8 +833,8 @@
                             "Type" = "3:3"
                             "ContextData" = "8:"
                             "Attributes" = "3:0"
-                            "Setting" = "3:1"
-                            "Value" = "8:#1202"
+                            "Setting" = "3:2"
+                            "Value" = "8:"
                             "DefaultValue" = "8:#1202"
                             "UsePlugInResources" = "11:TRUE"
                             }
@@ -822,7 +871,7 @@
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
                             "Setting" = "3:2"
-                            "Value" = "8:_99EAEC2297604A77A19F0CC551717209"
+                            "Value" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
                             "UsePlugInResources" = "11:TRUE"
                             }
                         }
@@ -845,7 +894,7 @@
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
                             "Setting" = "3:2"
-                            "Value" = "8:_99EAEC2297604A77A19F0CC551717209"
+                            "Value" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
                             "UsePlugInResources" = "11:TRUE"
                             }
                         }
@@ -868,7 +917,7 @@
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
                             "Setting" = "3:2"
-                            "Value" = "8:_99EAEC2297604A77A19F0CC551717209"
+                            "Value" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
                             "UsePlugInResources" = "11:TRUE"
                             }
                             "EulaText"
@@ -925,7 +974,7 @@
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
                             "Setting" = "3:2"
-                            "Value" = "8:_99EAEC2297604A77A19F0CC551717209"
+                            "Value" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
                             "UsePlugInResources" = "11:TRUE"
                             }
                         }
@@ -957,7 +1006,7 @@
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
                             "Setting" = "3:2"
-                            "Value" = "8:_99EAEC2297604A77A19F0CC551717209"
+                            "Value" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
                             "UsePlugInResources" = "11:TRUE"
                             }
                             "EulaText"
@@ -1005,7 +1054,7 @@
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
                             "Setting" = "3:2"
-                            "Value" = "8:_99EAEC2297604A77A19F0CC551717209"
+                            "Value" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
                             "UsePlugInResources" = "11:TRUE"
                             }
                             "InstallAllUsersVisible"
@@ -1041,7 +1090,7 @@
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
                             "Setting" = "3:2"
-                            "Value" = "8:_99EAEC2297604A77A19F0CC551717209"
+                            "Value" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
                             "UsePlugInResources" = "11:TRUE"
                             }
                         }
@@ -1064,7 +1113,7 @@
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
                             "Setting" = "3:2"
-                            "Value" = "8:_99EAEC2297604A77A19F0CC551717209"
+                            "Value" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
                             "UsePlugInResources" = "11:TRUE"
                             }
                             "CopyrightWarning"
@@ -1128,7 +1177,7 @@
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
                             "Setting" = "3:2"
-                            "Value" = "8:_99EAEC2297604A77A19F0CC551717209"
+                            "Value" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
                             "UsePlugInResources" = "11:TRUE"
                             }
                             "UpdateText"
@@ -1173,7 +1222,7 @@
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
                             "Setting" = "3:2"
-                            "Value" = "8:_99EAEC2297604A77A19F0CC551717209"
+                            "Value" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
                             "UsePlugInResources" = "11:TRUE"
                             }
                             "ShowProgress"
@@ -1207,7 +1256,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8A4A20DC9841455BB5FD97B9DF38A24E"
             {
-            "SourcePath" = "8:..\\GoogleContactsSync\\obj\\Debug\\GOContactSync.exe"
+            "SourcePath" = "8:..\\GoogleContactsSync\\obj\\Release\\GOContactSync.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"

Added: trunk/GoogleContactsSyncSetup/install-banner.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/GoogleContactsSyncSetup/install-banner.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/GoogleContactsSyncSetup/install-banner.png
===================================================================
(Binary files differ)


Property changes on: trunk/GoogleContactsSyncSetup/install-banner.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/GoogleContactsSyncSetup/install-banner.svg
===================================================================
--- trunk/GoogleContactsSyncSetup/install-banner.svg	                        (rev 0)
+++ trunk/GoogleContactsSyncSetup/install-banner.svg	2010-11-08 19:41:30 UTC (rev 17)
@@ -0,0 +1,1011 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="500"
+   height="70"
+   id="svg1256"
+   sodipodi:version="0.32"
+   inkscape:version="0.47+devel r9596"
+   sodipodi:docname="install-banner.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="D:\Images\Icônes\install-banner.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3964">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3966" />
+      <stop
+         style="stop-color:#c4a000;stop-opacity:0;"
+         offset="1"
+         id="stop3968" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3948">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3950" />
+      <stop
+         style="stop-color:#c4a000;stop-opacity:0;"
+         offset="1"
+         id="stop3952" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective58" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12512">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop12513" />
+      <stop
+         style="stop-color:#fff520;stop-opacity:0.89108908;"
+         offset="0.50000000"
+         id="stop12517" />
+      <stop
+         style="stop-color:#fff300;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop12514" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2116">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2118" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2120" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2094">
+      <stop
+         style="stop-color:#d6e3f0;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2096" />
+      <stop
+         style="stop-color:#95b1cf;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2098" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2803">
+      <stop
+         id="stop2805"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2807"
+         offset="1.0000000"
+         style="stop-color:#cbcbcb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2795">
+      <stop
+         id="stop2797"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.068627454;" />
+      <stop
+         id="stop2799"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="4.9530048"
+       x2="41.219128"
+       y1="4.9530048"
+       x1="35.433037"
+       gradientTransform="matrix(0.254,0,0,3.759813,0.788629,0.148567)"
+       id="linearGradient2801"
+       xlink:href="#linearGradient2795"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="84.287079"
+       x2="10.219901"
+       y1="93.338043"
+       x1="10.496115"
+       gradientTransform="matrix(2.262742,0,0,0.441942,1,-0.875)"
+       id="linearGradient2813"
+       xlink:href="#linearGradient2803"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2094"
+       id="linearGradient2100"
+       gradientTransform="matrix(0.95775,0,0,1.027989,1,-0.571911)"
+       x1="6.5871811"
+       y1="22.132999"
+       x2="14.511404"
+       y2="22.132999"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2116"
+       id="linearGradient2112"
+       gradientTransform="matrix(1.025428,0,0,0.957303,0,-0.806758)"
+       x1="73.361984"
+       y1="26.652197"
+       x2="-2.7582901"
+       y2="21.270376"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5013"
+       gradientUnits="userSpaceOnUse"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient5016"
+       gradientUnits="userSpaceOnUse"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5020"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8662"
+       id="radialGradient3756"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8662">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8664" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop8666" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831"
+       id="linearGradient3758"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.465413,-0.277593)"
+       x1="13.478554"
+       y1="10.612206"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       id="linearGradient2831">
+      <stop
+         style="stop-color:#edd400;stop-opacity:1;"
+         offset="0"
+         id="stop2833" />
+      <stop
+         style="stop-color:#edd400;stop-opacity:0;"
+         offset="1"
+         id="stop2835" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2847"
+       id="linearGradient3760"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,47.52791,45.84741)"
+       x1="37.128052"
+       y1="29.729605"
+       x2="37.065414"
+       y2="26.194071" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2847">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2849" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:0;"
+         offset="1"
+         id="stop2851" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient3766"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       id="linearGradient2380">
+      <stop
+         style="stop-color:#6f74e0;stop-opacity:0.58035713;"
+         offset="0"
+         id="stop2382" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2384" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient3762"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       id="linearGradient3812">
+      <stop
+         style="stop-color:#b9cfe7;stop-opacity:1"
+         offset="0"
+         id="stop3814" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3816" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient3764"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2871">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2873" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop2875" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2690"
+       id="linearGradient3768"
+       gradientUnits="userSpaceOnUse"
+       x1="32.647972"
+       y1="30.748846"
+       x2="37.124462"
+       y2="24.842253" />
+    <linearGradient
+       id="linearGradient2690">
+      <stop
+         style="stop-color:#f2e045;stop-opacity:1;"
+         offset="0"
+         id="stop2692" />
+      <stop
+         style="stop-color:#f2e045;stop-opacity:0;"
+         offset="1"
+         id="stop2694" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2682"
+       id="linearGradient3770"
+       gradientUnits="userSpaceOnUse"
+       x1="36.713837"
+       y1="31.455952"
+       x2="37.124462"
+       y2="24.842253" />
+    <linearGradient
+       id="linearGradient2682">
+      <stop
+         style="stop-color:#3977c3;stop-opacity:1;"
+         offset="0"
+         id="stop2684" />
+      <stop
+         style="stop-color:#89aedc;stop-opacity:0;"
+         offset="1"
+         id="stop2686" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient3776"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588623"
+       y2="26.649363" />
+    <linearGradient
+       id="linearGradient2402">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop2404" />
+      <stop
+         style="stop-color:#528ac5;stop-opacity:1;"
+         offset="1"
+         id="stop2406" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient3778"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient3772"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588623"
+       y2="26.649363" />
+    <linearGradient
+       id="linearGradient3842">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3844" />
+      <stop
+         style="stop-color:#528ac5;stop-opacity:1;"
+         offset="1"
+         id="stop3846" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient3774"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient3780"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2797">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2799-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2801" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient3782"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2116"
+       id="linearGradient7583"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.025428,0,0,0.957303,-0.74185344,-0.96713365)"
+       x1="73.361984"
+       y1="26.652197"
+       x2="-2.7582901"
+       y2="21.270376" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2795"
+       id="linearGradient7586"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.254,0,0,3.759813,0.04102604,-0.01191168)"
+       x1="35.433037"
+       y1="4.9530048"
+       x2="41.219128"
+       y2="4.9530048" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2094"
+       id="linearGradient7589"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95775,0,0,1.027989,0.25814656,-0.73228665)"
+       x1="6.5871811"
+       y1="22.132999"
+       x2="14.511404"
+       y2="22.132999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2803"
+       id="linearGradient7592"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.262742,0,0,0.441942,0.25814656,-1.0353756)"
+       x1="10.496115"
+       y1="93.338043"
+       x2="10.219901"
+       y2="84.287079" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient7621"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient7631"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588623"
+       y2="26.649363" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient7633"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2326"
+       id="radialGradient2332"
+       cx="15.09403"
+       cy="13.282721"
+       fx="15.09403"
+       fy="13.282721"
+       r="10.16466"
+       gradientTransform="matrix(2.496031,0,0,2.300689,-25.12402,-17.82636)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2326">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2328" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2330" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831-4"
+       id="linearGradient3832-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26320782,0,0,0.26320782,66.552256,44.4379)"
+       x1="13.478554"
+       y1="10.612206"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       id="linearGradient2831-4">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2833-1" />
+      <stop
+         id="stop2855"
+         offset="0.33333334"
+         style="stop-color:#5b86be;stop-opacity:1;" />
+      <stop
+         style="stop-color:#83a8d8;stop-opacity:0;"
+         offset="1"
+         id="stop2835-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2847-9"
+       id="linearGradient3834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.26320782,0,0,-0.26320782,78.939474,56.578362)"
+       x1="37.128052"
+       y1="29.729605"
+       x2="37.065414"
+       y2="26.194071" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2847-9">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2849-3" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:0;"
+         offset="1"
+         id="stop2851-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3315"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3317"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3319"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2803"
+       id="linearGradient3321"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.262742,0,0,0.441942,441.25815,-6.0353756)"
+       x1="10.496115"
+       y1="93.338043"
+       x2="10.219901"
+       y2="84.287079" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2094"
+       id="linearGradient3323"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95775,0,0,1.027989,441.25815,-5.7322867)"
+       x1="6.5871811"
+       y1="22.132999"
+       x2="14.511404"
+       y2="22.132999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2116"
+       id="linearGradient3325"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.025428,0,0,0.957303,440.25815,-5.9671337)"
+       x1="73.361984"
+       y1="26.652197"
+       x2="-2.7582901"
+       y2="21.270376" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8662"
+       id="radialGradient3327"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831"
+       id="linearGradient3329"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26320782,0,0,0.26320782,66.552256,44.4379)"
+       x1="13.359826"
+       y1="10.374751"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3948"
+       id="linearGradient3331"
+       gradientUnits="userSpaceOnUse"
+       x1="69.3125"
+       y1="48.837837"
+       x2="69.3125"
+       y2="49.751732" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2690"
+       id="linearGradient3333"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26320782,0,0,0.26320782,66.429756,44.510965)"
+       x1="32.647972"
+       y1="30.748846"
+       x2="37.124462"
+       y2="24.842253" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3964"
+       id="linearGradient3335"
+       gradientUnits="userSpaceOnUse"
+       x1="76.625"
+       y1="51.78125"
+       x2="76.625"
+       y2="50.905693" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient3337"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2797"
+       id="linearGradient3339"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient4113"
+       x1="0.4520874"
+       y1="18.5"
+       x2="494.54791"
+       y2="18.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0119494,0,0,1.2082485,-2.9408559,-8.8469657)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.27843137"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="158.61271"
+     inkscape:cy="21.110706"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="838"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     fill="#ef2929"
+     stroke="#cc0000"
+     inkscape:showpageshadow="false"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:date />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>address</rdf:li>
+            <rdf:li>contact</rdf:li>
+            <rdf:li>book</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(2.4833663,21.494368)">
+    <g
+       id="g3285"
+       transform="matrix(1.1849215,0,0,1.1900363,-88.22543,-10.181018)">
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path21630"
+         d="m 473.35461,-0.50835554 7.42462,0 c 0.7071,0 1.23743,0.1767768 1.41421,1.0606598 l 0.88388,6.89429174 c 0.0884,1.06066 -0.37565,1.414213 -1.32582,1.414213 l -8.57367,0 0.17678,-9.36916454 z"
+         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.48538011;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="m 474.3611,0.47849926 6.36056,0 c 0.30815,0 0.47676,0.030162 0.52254,0.321598 l 0.79144,6.38397574 c 0.0698,0.430972 0.18241,0.675355 -0.14028,0.689892 l -7.6738,0 0.13954,-7.39546574 z"
+         id="path21632"
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#9db029;fill-opacity:1;fill-rule:evenodd;stroke:#727e0a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="m 475.85461,7.241644 7.42462,0 c 0.7071,0 1.23743,0.176777 1.41421,1.06066 l 0.88388,6.894292 c 0.0884,1.06066 -0.37565,1.414213 -1.32582,1.414213 l -8.57367,0 0.17678,-9.369165 z"
+         id="path21634"
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path21636"
+         d="m 476.8611,8.228499 6.36056,0 c 0.30815,0 0.47676,0.03016 0.52254,0.321598 l 0.79144,6.383976 c 0.0698,0.430972 0.18241,0.675355 -0.14028,0.689892 l -7.6738,0 0.13954,-7.395466 z"
+         style="opacity:0.48538011;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path21638"
+         d="m 476.32266,15.616122 8.44541,0 c 0.80433,0 1.40757,0.219398 1.60865,1.316384 l 1.00541,8.556499 c 0.10054,1.316384 -0.4273,1.755179 -1.50811,1.755179 l -9.75244,0 0.20108,-11.628062 z"
+         style="color:#000000;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:#cc0000;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.48538011;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.00000072;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="m 477.46753,16.603198 7.23506,0 c 0.35051,0 0.5423,0.03835 0.59439,0.408939 l 0.90024,8.117754 c 0.0794,0.548017 0.20749,0.858771 -0.15956,0.877255 l -8.72885,0 0.15872,-9.403948 z"
+         id="path21640"
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="matrix(0.02165152,0,0,0.04307902,483.3444,28.884714)"
+         id="g5022">
+        <rect
+           style="opacity:0.40206185;color:#000000;fill:url(#linearGradient3315);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+           id="rect4173"
+           width="1339.6335"
+           height="478.35718"
+           x="-1559.2523"
+           y="-150.69685" />
+        <path
+           style="opacity:0.40206185;color:#000000;fill:url(#radialGradient3317);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+           d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+           id="path5058"
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cccc"
+           id="path5018"
+           d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+           style="opacity:0.40206185;color:#000000;fill:url(#radialGradient3319);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         sodipodi:nodetypes="csssccsssss"
+         id="rect1408"
+         d="m 446.62247,0.35821396 c 0.0908,-1.91498926 1.00766,-2.96430826 2.71456,-2.96954566 l 29.3269,-0.089986 c 0.24658,-7.566e-4 0.56854,0.2001494 0.59323,0.4499311 l 3.25848,32.9582386 -1.3153,0.05663 0.62924,6.445654 c 0.061,0.624987 -0.18137,1.159308 -1.07143,1.163523 l -30.7107,0.145439 c -2.53254,0.01199 -5.13545,-2.078714 -5.01337,-4.654071 l 1.58839,-33.50581274 z"
+         style="color:#000000;fill:#5b6b94;fill-opacity:1;fill-rule:nonzero;stroke:#364878;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:url(#linearGradient3321);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="m 480.38315,29.714624 -29.1875,0.125 c -1.55652,0.177868 -2.8125,1.39612 -2.8125,3 0,1.60388 1.25598,2.822132 2.8125,3 l 29.1875,0.125 0,-0.0625 c -1.65562,-0.07815 -3,-1.387649 -3,-3.0625 0,-1.674851 1.34438,-2.984348 3,-3.0625 l 0,-0.0625 z"
+         id="path2489"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:url(#linearGradient3323);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="m 449.94565,-2.3478757 c -1.70691,0 -2.6374,1.0090062 -2.71875,2.86136576 L 445.57065,32.665396 c -0.092,3.078427 1.82687,4.828713 3.8125,5.330478 -4.25,-1.630671 -3.6875,-8.991795 1.625,-8.961028 l 30.89829,0 -3.3125,-30.9519784 c -0.0258,-0.2407129 -0.34791,-0.4307433 -0.59375,-0.4307433 l -28.05454,0 z"
+         id="path2784"
+         sodipodi:nodetypes="ccccccssc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccscssc"
+         id="path2104"
+         d="m 450.13325,-1.8266926 c -1.6839,0 -2.33668,0.7321629 -2.41693,2.55414796 L 446.41741,30.616822 c 0.93333,-1.606747 2.4396,-2.182761 4.85241,-2.182761 l 29.95141,0 -2.8259,-29.8370736 c -0.0224,-0.2370539 -0.34322,-0.42368 -0.58575,-0.42368 l -27.67633,0 z"
+         style="color:#000000;fill:none;stroke:url(#linearGradient3325);stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:20;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="matrix(2.0943988,0,0,2.0943988,310.93224,-93.516531)"
+         id="g3972">
+        <path
+           transform="matrix(-0.39211016,0,0,-0.26353736,82.540351,64.32575)"
+           d="m 40.481863,36.421127 c 0,4.637477 -7.004387,8.396894 -15.644737,8.396894 -8.64035,0 -15.6447375,-3.759417 -15.6447375,-8.396894 0,-4.637476 7.0043875,-8.396893 15.6447375,-8.396893 8.64035,0 15.644737,3.759417 15.644737,8.396893 z"
+           sodipodi:ry="8.3968935"
+           sodipodi:rx="15.644737"
+           sodipodi:cy="36.421127"
+           sodipodi:cx="24.837126"
+           id="path8660"
+           style="opacity:0.38333333;color:#000000;fill:url(#radialGradient3327);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+           sodipodi:type="arc"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient3329);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3331);stroke-width:0.2632077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+           d="m 71.73416,47.250933 c 0,0 -2.35242,-0.164505 -1.628598,2.599177 l -2.02341,0 c 0,0 0.131604,-3.125593 3.652008,-2.599177 z"
+           id="path2865"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           sodipodi:nodetypes="cccc" />
+        <g
+           id="g1878"
+           transform="matrix(-0.15241075,-0.12876864,-0.12876864,0.15241075,81.410453,48.030414)"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           style="fill:#edd400;fill-opacity:1;stroke:#c4a000;stroke-opacity:1">
+          <path
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccc"
+             id="path1880"
+             d="M 44.306783,50.229694 C 62.821497,35.818859 49.664587,13.411704 22.462411,12.49765 L 22.113843,3.1515478 7.6245439,20.496754 22.714328,33.219189 c 0,0 -0.251917,-9.88122 -0.251917,-9.88122 18.82976,0.998977 32.981627,14.071729 21.844372,26.891725 z"
+             style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:1.31916928;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+             inkscape:r_cx="true"
+             inkscape:r_cy="true" />
+        </g>
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="path2839"
+           d="m 73.898278,53.311976 c 0,0 2.35242,0.164505 1.628598,-2.599177 l 2.046675,0 c 0,0.395497 -0.154869,3.125593 -3.675273,2.599177 z"
+           style="color:#000000;fill:url(#linearGradient3333);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3335);stroke-width:0.2632077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible" />
+        <g
+           style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:1.31916928;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           transform="matrix(0.15241075,0.12876864,0.12876864,-0.15241075,64.344881,52.548276)"
+           id="g2779">
+          <path
+             inkscape:connector-curvature="0"
+             inkscape:r_cy="true"
+             inkscape:r_cx="true"
+             style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#c4a000;stroke-width:1.31916928;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+             d="M 44.306783,50.229694 C 62.821497,35.818859 49.664587,13.411704 22.462411,12.49765 L 22.399432,3.0690297 7.793943,20.424005 22.462411,33.006349 c 0,0 0,-9.66838 0,-9.66838 18.82976,0.998977 32.981627,14.071729 21.844372,26.891725 z"
+             id="path2781"
+             sodipodi:nodetypes="ccccccc" />
+        </g>
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.27222224;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none;visibility:visible;display:inline;overflow:visible"
+           d="m 68.288661,54.562214 0.01645,-3.915217 3.405251,-0.0987 -1.155186,1.363106 1.017884,0.624644 c -0.789623,0.592218 -1.197477,0.637523 -1.460684,1.311993 L 69.370957,53.2926 68.28866,54.562217 z"
+           id="path2791"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           sodipodi:nodetypes="cccccccc" />
+        <g
+           id="g2793"
+           transform="matrix(0.13385065,0.1130875,0.1130875,-0.13385065,65.383982,52.549645)"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           style="opacity:0.5;fill:none;stroke:#ffffff;stroke-opacity:1">
+          <path
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccc"
+             id="path2795"
+             d="M 51.090265,45.943705 C 60.210465,30.723955 46.631614,12.20113 19.485058,11.948579 L 19.513464,3.7032834 6.5341979,19.296639 19.367661,30.26876 c 0,0 0.05562,-9.006878 0.05562,-9.006878 17.527815,-0.223909 35.195185,10.103372 31.666984,24.681823 z"
+             style="color:#000000;fill:none;stroke:url(#linearGradient3337);stroke-width:1.50208926;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+             inkscape:r_cx="true"
+             inkscape:r_cy="true" />
+        </g>
+        <g
+           style="opacity:0.5;fill:none;stroke:#ffffff;stroke-opacity:1"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           transform="matrix(-0.13385065,-0.1130875,-0.1130875,0.13385065,80.392668,48.028864)"
+           id="g2805">
+          <path
+             inkscape:connector-curvature="0"
+             inkscape:r_cy="true"
+             inkscape:r_cx="true"
+             style="color:#000000;fill:none;stroke:url(#linearGradient3339);stroke-width:1.50208926;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+             d="M 51.389927,46.505946 C 60.510127,31.286196 47.050763,12.432359 19.628482,12.069755 L 19.342824,4.0507204 6.3413093,19.379475 19.809059,30.764589 c 0,0 -0.181765,-9.453243 -0.181765,-9.453243 18.244937,0.381972 34.783881,10.925246 31.762633,25.1946 z"
+             id="path2807"
+             sodipodi:nodetypes="ccccccc" />
+        </g>
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:0.27222224;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none;visibility:visible;display:inline;overflow:visible"
+           d="m 68.222859,48.853894 c 0.94582,-2.748225 4.328132,-1.617309 5.313508,-1.184435 1.098974,0.05566 1.493635,-0.746195 2.368871,-0.789624 -3.698001,-2.576803 -7.583676,-1.71085 -7.682379,1.974059 z"
+           id="path2811"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+  </g>
+</svg>


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

Revision: 19
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=19&view=rev
Author:   cybdis
Date:     2010-11-08 21:15:55 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
Updated to Release 2.1.1
Fixed "Reset MAtches" label behavior, to deactivate form
Changed MSI name to reflect version number
Removed obsolete header from csproj file

Modified Paths:
--------------
    trunk/GoogleContactsSync/GoogleContactsSync.csproj
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs
    trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj

Modified: trunk/GoogleContactsSync/GoogleContactsSync.csproj
===================================================================
--- trunk/GoogleContactsSync/GoogleContactsSync.csproj	2010-11-08 19:47:17 UTC (rev 18)
+++ trunk/GoogleContactsSync/GoogleContactsSync.csproj	2010-11-08 21:15:55 UTC (rev 19)
@@ -173,7 +173,6 @@
     <Compile Include="Utilities.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Banner.jpg" />
     <Content Include="contacts-sync.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2010-11-08 19:47:17 UTC (rev 18)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2010-11-08 21:15:55 UTC (rev 19)
@@ -206,12 +206,15 @@
 				}
 				lastSync = DateTime.Now;
 				TimerSwitch(true);
-				SetFormEnabled(true);
 			}
 			catch (Exception ex)
 			{
 				ErrorHandler.Handle(ex);
 			}
+			finally
+			{
+				SetFormEnabled(true);
+			}
 		}
 
 		void Logger_LogUpdated(string Message)
@@ -411,6 +414,9 @@
 
 		private void resetMatchesLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
 		{
+			SetFormEnabled(false);
+			// force deactivation to show up
+			Application.DoEvents();
 			try
 			{
 				if (_sync == null)
@@ -431,6 +437,10 @@
 			{
 				ErrorHandler.Handle(ex);
 			}
+			finally
+			{
+				SetFormEnabled(true);
+			}
 		}
 
 		private void ShowForm()

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2010-11-08 19:47:17 UTC (rev 18)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2010-11-08 21:15:55 UTC (rev 19)
@@ -864,6 +864,8 @@
 		/// </summary>
 		public void ResetMatches()
 		{
+			Debug.Assert(Contacts != null, "Contacts object is null - this should not happen");
+
 			foreach (ContactMatch match in Contacts)
 			{
 				ResetMatch(match);

Modified: trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj
===================================================================
--- trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2010-11-08 19:47:17 UTC (rev 18)
+++ trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2010-11-08 21:15:55 UTC (rev 19)
@@ -21,37 +21,31 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_17C96A08C0C04AB99C55461B72206B9C"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_0E19A2583DD5A5B7DE413C9D5170375F"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_449A09D626FD4A6C9AEE1F387A23D13C"
+        "MsmKey" = "8:_17C96A08C0C04AB99C55461B72206B9C"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_730D6DEA499B401A2283E3653AC03CE8"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "MsmKey" = "8:_449A09D626FD4A6C9AEE1F387A23D13C"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_740487AA23916DBCC9045185B95148DB"
+        "MsmKey" = "8:_667C28D0F864D557B5E7832929DCF384"
         "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_8981E31E50DC3B8FEAB88F42E1BB388C"
-        "OwnerKey" = "8:_730D6DEA499B401A2283E3653AC03CE8"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_8981E31E50DC3B8FEAB88F42E1BB388C"
+        "MsmKey" = "8:_842EAB7215BA9D3A9A68906AD90F2767"
         "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -69,94 +63,28 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_BF84F1B768F89CCE751595364D3CAE52"
+        "MsmKey" = "8:_CBD257D5D5ACA9C2A37435E7CCEDE5B4"
         "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_BF84F1B768F89CCE751595364D3CAE52"
-        "OwnerKey" = "8:_8981E31E50DC3B8FEAB88F42E1BB388C"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_BF84F1B768F89CCE751595364D3CAE52"
-        "OwnerKey" = "8:_730D6DEA499B401A2283E3653AC03CE8"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2DF290608F576F4E43F5F21D80261EF"
+        "MsmKey" = "8:_EBC0B4735665A481DCD0420BF1E59B69"
         "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2DF290608F576F4E43F5F21D80261EF"
-        "OwnerKey" = "8:_F196B0156F31F4FC5E7668FD0C3AA9A0"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_EEF5B1E061E94324A394BC6D6E07F65D"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_F196B0156F31F4FC5E7668FD0C3AA9A0"
-        "OwnerKey" = "8:_740487AA23916DBCC9045185B95148DB"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_F196B0156F31F4FC5E7668FD0C3AA9A0"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_740487AA23916DBCC9045185B95148DB"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_F196B0156F31F4FC5E7668FD0C3AA9A0"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_730D6DEA499B401A2283E3653AC03CE8"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_8981E31E50DC3B8FEAB88F42E1BB388C"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_BF84F1B768F89CCE751595364D3CAE52"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_C2DF290608F576F4E43F5F21D80261EF"
-        "MsmSig" = "8:_UNDEFINED"
-        }
     }
     "Configurations"
     {
@@ -165,7 +93,7 @@
         "DisplayName" = "8:Debug"
         "IsDebugOnly" = "11:TRUE"
         "IsReleaseOnly" = "11:FALSE"
-        "OutputFilename" = "8:Debug\\GOContactSyncSetup.msi"
+        "OutputFilename" = "8:Debug\\GOContactSyncSetup_v211.msi"
         "PackageFilesAs" = "3:2"
         "PackageFileSize" = "3:-2147483648"
         "CabType" = "3:1"
@@ -307,99 +235,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_730D6DEA499B401A2283E3653AC03CE8"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Contacts, Version=1.2.0.0, Culture=neutral, PublicKeyToken=7e065189dd4b982f, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_730D6DEA499B401A2283E3653AC03CE8"
-                    {
-                    "Name" = "8:Google.GData.Contacts.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Google.GData.Contacts.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_740487AA23916DBCC9045185B95148DB"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Microsoft.Office.Interop.Outlook, Version=11.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c"
-                "ScatterAssemblies"
-                {
-                    "_740487AA23916DBCC9045185B95148DB"
-                    {
-                    "Name" = "8:Microsoft.Office.Interop.Outlook.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Microsoft.Office.Interop.Outlook.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8981E31E50DC3B8FEAB88F42E1BB388C"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Extensions, Version=1.2.0.0, Culture=neutral, PublicKeyToken=0b4c5df2ebf20876, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_8981E31E50DC3B8FEAB88F42E1BB388C"
-                    {
-                    "Name" = "8:Google.GData.Extensions.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Google.GData.Extensions.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A131A9765CDF4FB18FC170D9BCFC2F20"
             {
             "SourcePath" = "8:install-banner.jpg"
@@ -420,68 +255,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BF84F1B768F89CCE751595364D3CAE52"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Client, Version=1.2.0.0, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_BF84F1B768F89CCE751595364D3CAE52"
-                    {
-                    "Name" = "8:Google.GData.Client.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Google.GData.Client.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C2DF290608F576F4E43F5F21D80261EF"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
-                "ScatterAssemblies"
-                {
-                    "_C2DF290608F576F4E43F5F21D80261EF"
-                    {
-                    "Name" = "8:stdole.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:stdole.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EEF5B1E061E94324A394BC6D6E07F65D"
             {
             "SourcePath" = "8:..\\GoogleContactsSync\\COPYING.rtf"
@@ -502,37 +275,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F196B0156F31F4FC5E7668FD0C3AA9A0"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:office, Version=11.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c"
-                "ScatterAssemblies"
-                {
-                    "_F196B0156F31F4FC5E7668FD0C3AA9A0"
-                    {
-                    "Name" = "8:Office.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Office.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
         }
         "FileType"
         {
@@ -600,15 +342,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:GO Contact Sync Mod"
-        "ProductCode" = "8:{DA6A4E27-24FB-425B-814F-4EDD81547F25}"
-        "PackageCode" = "8:{7DDAD184-3745-4B5C-A2C8-61965C7774A3}"
+        "ProductCode" = "8:{F383245B-460D-4066-89FA-36D80CCCDC69}"
+        "PackageCode" = "8:{7A77F596-B244-41F2-A2D6-8FBBFCE95581}"
         "UpgradeCode" = "8:{170B4620-F5BB-4D2E-97A1-239D79030F20}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:2.1"
+        "ProductVersion" = "8:2.1.1"
         "Manufacturer" = "8:WebGear, Create Software, Stru.be"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://googlesyncmod.sourceforge.net/"
@@ -1256,7 +998,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8A4A20DC9841455BB5FD97B9DF38A24E"
             {
-            "SourcePath" = "8:..\\GoogleContactsSync\\obj\\Release\\GOContactSync.exe"
+            "SourcePath" = "8:..\\GoogleContactsSync\\obj\\Debug\\GOContactSync.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"


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

Revision: 28
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=28&view=rev
Author:   yitzhaks
Date:     2010-12-24 12:39:56 +0000 (Fri, 24 Dec 2010)

Log Message:
-----------
Deleted unused Resource and Settings.
Fixed bug #3107439.

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactsMatcher.cs

Removed Paths:
-------------
    trunk/GoogleContactsSync/Properties/Resources.Designer.cs
    trunk/GoogleContactsSync/Properties/Resources.resx
    trunk/GoogleContactsSync/Properties/Settings.Designer.cs
    trunk/GoogleContactsSync/Properties/Settings.settings

Modified: trunk/GoogleContactsSync/ContactsMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/ContactsMatcher.cs	2010-12-24 12:22:44 UTC (rev 27)
+++ trunk/GoogleContactsSync/ContactsMatcher.cs	2010-12-24 12:39:56 UTC (rev 28)
@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Collections.ObjectModel;
 using Google.GData.Client;
 using Google.GData.Contacts;
 using Google.GData.Extensions;
 using Outlook = Microsoft.Office.Interop.Outlook;
-using System.Collections.ObjectModel;
 
 namespace WebGear.GoogleContactsSync
 {
@@ -33,11 +32,14 @@
 			//if no match - try to match by properties
 			//if no match - create a new match pair without google contact. 
 			//foreach (Outlook._ContactItem olc in outlookContacts)
+			Outlook.ContactItem olc;
 			for (int i = 1; i <= sync.OutlookContacts.Count; i++)
 			{
+				olc = null;
 				try
 				{
-					if (!(sync.OutlookContacts[i] is Outlook.ContactItem))
+					olc = sync.OutlookContacts[i] as Outlook.ContactItem;
+					if (olc == null)
 						continue;
 				}
 				catch
@@ -46,8 +48,29 @@
 					continue;
 				}
 
-				Outlook.ContactItem olc = sync.OutlookContacts[i] as Outlook.ContactItem;
+				// sometimes contacts throw Exception when accessing their properties, so we give it a controlled try first.
+				try
+				{
+					string email1Address = olc.Email1Address;
+				}
+				catch
+				{
+					string message;
+					try
+					{
+						message = string.Format("Can't access contact details for outlook contact {0}.", olc.FileAs);
+					}
+					catch
+					{
+						message = null;
+					}
 
+					if (olc != null && message != null) // it's useless to say "we couldn't access some contacts properties
+					{
+						Logger.Log(message, EventType.Warning);
+					}
+				}
+
 				// check if a duplicate
 				Collection<Outlook.ContactItem> duplicates;
 				if (!string.IsNullOrEmpty(olc.Email1Address))

Deleted: trunk/GoogleContactsSync/Properties/Resources.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/Properties/Resources.Designer.cs	2010-12-24 12:22:44 UTC (rev 27)
+++ trunk/GoogleContactsSync/Properties/Resources.Designer.cs	2010-12-24 12:39:56 UTC (rev 28)
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace WebGear.GoogleContactsSync.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WebGear.GoogleContactsSync.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}

Deleted: trunk/GoogleContactsSync/Properties/Resources.resx
===================================================================
--- trunk/GoogleContactsSync/Properties/Resources.resx	2010-12-24 12:22:44 UTC (rev 27)
+++ trunk/GoogleContactsSync/Properties/Resources.resx	2010-12-24 12:39:56 UTC (rev 28)
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-	<!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="metadata">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" />
-							<xsd:attribute name="type" type="xsd:string" />
-							<xsd:attribute name="mimetype" type="xsd:string" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="assembly">
-						<xsd:complexType>
-							<xsd:attribute name="alias" type="xsd:string" />
-							<xsd:attribute name="name" type="xsd:string" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" />
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="resmimetype">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="version">
-		<value>2.0</value>
-	</resheader>
-	<resheader name="reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-</root>
\ No newline at end of file

Deleted: trunk/GoogleContactsSync/Properties/Settings.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/Properties/Settings.Designer.cs	2010-12-24 12:22:44 UTC (rev 27)
+++ trunk/GoogleContactsSync/Properties/Settings.Designer.cs	2010-12-24 12:39:56 UTC (rev 28)
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace WebGear.GoogleContactsSync.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}

Deleted: trunk/GoogleContactsSync/Properties/Settings.settings
===================================================================
--- trunk/GoogleContactsSync/Properties/Settings.settings	2010-12-24 12:22:44 UTC (rev 27)
+++ trunk/GoogleContactsSync/Properties/Settings.settings	2010-12-24 12:39:56 UTC (rev 28)
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>


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

Revision: 34
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=34&view=rev
Author:   floriwan
Date:     2011-02-21 21:46:12 +0000 (Mon, 21 Feb 2011)

Log Message:
-----------
- Fixed some issues with the log textBox (e.g. now scrolls always to bottom not to top and is also cleared when resetting Matches)
- enhanced the NotifyIcon: Show lastSync in ToolTip and show skipped and errors in notifyIcon.BalloonTipIcon

Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.Designer.cs
    trunk/GoogleContactsSync/SettingsForm.cs

Modified: trunk/GoogleContactsSync/SettingsForm.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.Designer.cs	2011-02-21 21:38:01 UTC (rev 33)
+++ trunk/GoogleContactsSync/SettingsForm.Designer.cs	2011-02-21 21:46:12 UTC (rev 34)
@@ -28,141 +28,142 @@
         /// </summary>
         private void InitializeComponent()
         {
-			this.components = new System.ComponentModel.Container();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsForm));
-			this.Password = new System.Windows.Forms.TextBox();
-			this.UserName = new System.Windows.Forms.TextBox();
-			this.label3 = new System.Windows.Forms.Label();
-			this.label2 = new System.Windows.Forms.Label();
-			this.syncButton = new System.Windows.Forms.Button();
-			this.syncOptionBox = new System.Windows.Forms.CheckedListBox();
-			this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
-			this.systemTrayMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-			this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-			this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-			this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem();
-			this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
-			this.autoSyncInterval = new System.Windows.Forms.NumericUpDown();
-			this.autoSyncCheckBox = new System.Windows.Forms.CheckBox();
-			this.label1 = new System.Windows.Forms.Label();
-			this.label4 = new System.Windows.Forms.Label();
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.reportSyncResultCheckBox = new System.Windows.Forms.CheckBox();
-			this.runAtStartupCheckBox = new System.Windows.Forms.CheckBox();
-			this.nextSyncLabel = new System.Windows.Forms.Label();
-			this.syncTimer = new System.Windows.Forms.Timer(this.components);
-			this.groupBox2 = new System.Windows.Forms.GroupBox();
-			this.panel1 = new System.Windows.Forms.Panel();
-			this.btSyncDelete = new System.Windows.Forms.CheckBox();
-			this.tbSyncProfile = new System.Windows.Forms.TextBox();
-			this.label5 = new System.Windows.Forms.Label();
-			this.lastSyncLabel = new System.Windows.Forms.Label();
-			this.logGroupBox = new System.Windows.Forms.GroupBox();
-			this.syncConsole = new System.Windows.Forms.TextBox();
-			this.groupBox4 = new System.Windows.Forms.GroupBox();
-			this.proxySettingsLinkLabel = new System.Windows.Forms.LinkLabel();
-			this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-			this.resetMatchesLinkLabel = new System.Windows.Forms.LinkLabel();
-			this.Donate = new System.Windows.Forms.PictureBox();
-			this.settingsGroupBox = new System.Windows.Forms.GroupBox();
-			this.actionsTableLayout = new System.Windows.Forms.TableLayoutPanel();
-			this.hideButton = new System.Windows.Forms.Button();
-			this.MainPanel = new System.Windows.Forms.Panel();
-			this.MainSplitter = new System.Windows.Forms.Splitter();
-			this.systemTrayMenu.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.autoSyncInterval)).BeginInit();
-			this.groupBox1.SuspendLayout();
-			this.groupBox2.SuspendLayout();
-			this.logGroupBox.SuspendLayout();
-			this.groupBox4.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.Donate)).BeginInit();
-			this.settingsGroupBox.SuspendLayout();
-			this.actionsTableLayout.SuspendLayout();
-			this.MainPanel.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// Password
-			// 
-			this.Password.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.Password.Location = new System.Drawing.Point(100, 44);
-			this.Password.Name = "Password";
-			this.Password.PasswordChar = '*';
-			this.Password.Size = new System.Drawing.Size(191, 21);
-			this.Password.TabIndex = 3;
-			this.Password.TextChanged += new System.EventHandler(this.Password_TextChanged);
-			// 
-			// UserName
-			// 
-			this.UserName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.UserName.Location = new System.Drawing.Point(100, 18);
-			this.UserName.Name = "UserName";
-			this.UserName.Size = new System.Drawing.Size(191, 21);
-			this.UserName.TabIndex = 1;
-			this.UserName.TextChanged += new System.EventHandler(this.UserName_TextChanged);
-			// 
-			// label3
-			// 
-			this.label3.Location = new System.Drawing.Point(7, 44);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(75, 16);
-			this.label3.TabIndex = 2;
-			this.label3.Text = "&Password:";
-			// 
-			// label2
-			// 
-			this.label2.Location = new System.Drawing.Point(7, 21);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(75, 17);
-			this.label2.TabIndex = 0;
-			this.label2.Text = "&User:";
-			// 
-			// syncButton
-			// 
-			this.syncButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-						| System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.syncButton.Location = new System.Drawing.Point(3, 3);
-			this.syncButton.Name = "syncButton";
-			this.syncButton.Size = new System.Drawing.Size(98, 25);
-			this.syncButton.TabIndex = 1;
-			this.syncButton.Text = "S&ync";
-			this.syncButton.UseVisualStyleBackColor = true;
-			this.syncButton.Click += new System.EventHandler(this.button4_Click);
-			// 
-			// syncOptionBox
-			// 
-			this.syncOptionBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-						| System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.syncOptionBox.BackColor = System.Drawing.SystemColors.Control;
-			this.syncOptionBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
-			this.syncOptionBox.CheckOnClick = true;
-			this.syncOptionBox.FormattingEnabled = true;
-			this.syncOptionBox.IntegralHeight = false;
-			this.syncOptionBox.Location = new System.Drawing.Point(7, 73);
-			this.syncOptionBox.Name = "syncOptionBox";
-			this.syncOptionBox.Size = new System.Drawing.Size(285, 91);
-			this.syncOptionBox.TabIndex = 4;
-			this.toolTip.SetToolTip(this.syncOptionBox, resources.GetString("syncOptionBox.ToolTip"));
-			this.syncOptionBox.SelectedIndexChanged += new System.EventHandler(this.syncOptionBox_SelectedIndexChanged);
-			// 
-			// notifyIcon
-			// 
-			this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Warning;
-			this.notifyIcon.ContextMenuStrip = this.systemTrayMenu;
-			this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon")));
-			this.notifyIcon.Text = "GO Contact Sync Mod";
-			this.notifyIcon.Visible = true;
-			this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick);
-			// 
-			// systemTrayMenu
-			// 
-			this.systemTrayMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsForm));
+            this.Password = new System.Windows.Forms.TextBox();
+            this.UserName = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.syncButton = new System.Windows.Forms.Button();
+            this.syncOptionBox = new System.Windows.Forms.CheckedListBox();
+            this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
+            this.systemTrayMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
+            this.autoSyncInterval = new System.Windows.Forms.NumericUpDown();
+            this.autoSyncCheckBox = new System.Windows.Forms.CheckBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.reportSyncResultCheckBox = new System.Windows.Forms.CheckBox();
+            this.runAtStartupCheckBox = new System.Windows.Forms.CheckBox();
+            this.nextSyncLabel = new System.Windows.Forms.Label();
+            this.syncTimer = new System.Windows.Forms.Timer(this.components);
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.btSyncDelete = new System.Windows.Forms.CheckBox();
+            this.tbSyncProfile = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.lastSyncLabel = new System.Windows.Forms.Label();
+            this.logGroupBox = new System.Windows.Forms.GroupBox();
+            this.syncConsole = new System.Windows.Forms.TextBox();
+            this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.proxySettingsLinkLabel = new System.Windows.Forms.LinkLabel();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.resetMatchesLinkLabel = new System.Windows.Forms.LinkLabel();
+            this.Donate = new System.Windows.Forms.PictureBox();
+            this.settingsGroupBox = new System.Windows.Forms.GroupBox();
+            this.actionsTableLayout = new System.Windows.Forms.TableLayoutPanel();
+            this.hideButton = new System.Windows.Forms.Button();
+            this.MainPanel = new System.Windows.Forms.Panel();
+            this.MainSplitter = new System.Windows.Forms.Splitter();
+            this.systemTrayMenu.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.autoSyncInterval)).BeginInit();
+            this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            this.logGroupBox.SuspendLayout();
+            this.groupBox4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.Donate)).BeginInit();
+            this.settingsGroupBox.SuspendLayout();
+            this.actionsTableLayout.SuspendLayout();
+            this.MainPanel.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // Password
+            // 
+            this.Password.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.Password.Location = new System.Drawing.Point(100, 44);
+            this.Password.Name = "Password";
+            this.Password.PasswordChar = '*';
+            this.Password.Size = new System.Drawing.Size(191, 21);
+            this.Password.TabIndex = 3;
+            this.Password.TextChanged += new System.EventHandler(this.Password_TextChanged);
+            // 
+            // UserName
+            // 
+            this.UserName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.UserName.Location = new System.Drawing.Point(100, 18);
+            this.UserName.Name = "UserName";
+            this.UserName.Size = new System.Drawing.Size(191, 21);
+            this.UserName.TabIndex = 1;
+            this.UserName.TextChanged += new System.EventHandler(this.UserName_TextChanged);
+            // 
+            // label3
+            // 
+            this.label3.Location = new System.Drawing.Point(7, 44);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(75, 16);
+            this.label3.TabIndex = 2;
+            this.label3.Text = "&Password:";
+            // 
+            // label2
+            // 
+            this.label2.Location = new System.Drawing.Point(7, 21);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(75, 17);
+            this.label2.TabIndex = 0;
+            this.label2.Text = "&User:";
+            // 
+            // syncButton
+            // 
+            this.syncButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.syncButton.Location = new System.Drawing.Point(3, 3);
+            this.syncButton.Name = "syncButton";
+            this.syncButton.Size = new System.Drawing.Size(98, 25);
+            this.syncButton.TabIndex = 1;
+            this.syncButton.Text = "S&ync";
+            this.syncButton.UseVisualStyleBackColor = true;
+            this.syncButton.Click += new System.EventHandler(this.button4_Click);
+            // 
+            // syncOptionBox
+            // 
+            this.syncOptionBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.syncOptionBox.BackColor = System.Drawing.SystemColors.Control;
+            this.syncOptionBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.syncOptionBox.CheckOnClick = true;
+            this.syncOptionBox.FormattingEnabled = true;
+            this.syncOptionBox.IntegralHeight = false;
+            this.syncOptionBox.Location = new System.Drawing.Point(7, 73);
+            this.syncOptionBox.Name = "syncOptionBox";
+            this.syncOptionBox.Size = new System.Drawing.Size(285, 91);
+            this.syncOptionBox.TabIndex = 4;
+            this.toolTip.SetToolTip(this.syncOptionBox, resources.GetString("syncOptionBox.ToolTip"));
+            this.syncOptionBox.SelectedIndexChanged += new System.EventHandler(this.syncOptionBox_SelectedIndexChanged);
+            // 
+            // notifyIcon
+            // 
+            this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Warning;
+            this.notifyIcon.ContextMenuStrip = this.systemTrayMenu;
+            this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon")));
+            this.notifyIcon.Text = "GO Contact Sync Mod";
+            this.notifyIcon.Visible = true;
+            this.notifyIcon.BalloonTipClicked += new System.EventHandler(this.toolStripMenuItem1_Click);
+            this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick);
+            // 
+            // systemTrayMenu
+            // 
+            this.systemTrayMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripMenuItem4,
             this.toolStripSeparator2,
             this.toolStripMenuItem1,
@@ -170,422 +171,422 @@
             this.toolStripSeparator1,
             this.toolStripMenuItem5,
             this.toolStripMenuItem2});
-			this.systemTrayMenu.Name = "systemTrayMenu";
-			this.systemTrayMenu.Size = new System.Drawing.Size(108, 126);
-			// 
-			// toolStripMenuItem4
-			// 
-			this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-			this.toolStripMenuItem4.Size = new System.Drawing.Size(107, 22);
-			this.toolStripMenuItem4.Text = "Sync";
-			this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click);
-			// 
-			// toolStripSeparator2
-			// 
-			this.toolStripSeparator2.Name = "toolStripSeparator2";
-			this.toolStripSeparator2.Size = new System.Drawing.Size(104, 6);
-			// 
-			// toolStripMenuItem1
-			// 
-			this.toolStripMenuItem1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-			this.toolStripMenuItem1.Size = new System.Drawing.Size(107, 22);
-			this.toolStripMenuItem1.Text = "Show";
-			this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
-			// 
-			// toolStripMenuItem3
-			// 
-			this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-			this.toolStripMenuItem3.Size = new System.Drawing.Size(107, 22);
-			this.toolStripMenuItem3.Text = "Hide";
-			this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
-			// 
-			// toolStripSeparator1
-			// 
-			this.toolStripSeparator1.Name = "toolStripSeparator1";
-			this.toolStripSeparator1.Size = new System.Drawing.Size(104, 6);
-			// 
-			// toolStripMenuItem5
-			// 
-			this.toolStripMenuItem5.Name = "toolStripMenuItem5";
-			this.toolStripMenuItem5.Size = new System.Drawing.Size(107, 22);
-			this.toolStripMenuItem5.Text = "About";
-			this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
-			// 
-			// toolStripMenuItem2
-			// 
-			this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-			this.toolStripMenuItem2.Size = new System.Drawing.Size(107, 22);
-			this.toolStripMenuItem2.Text = "Exit";
-			this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
-			// 
-			// autoSyncInterval
-			// 
-			this.autoSyncInterval.Location = new System.Drawing.Point(108, 91);
-			this.autoSyncInterval.Maximum = new decimal(new int[] {
+            this.systemTrayMenu.Name = "systemTrayMenu";
+            this.systemTrayMenu.Size = new System.Drawing.Size(108, 126);
+            // 
+            // toolStripMenuItem4
+            // 
+            this.toolStripMenuItem4.Name = "toolStripMenuItem4";
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(107, 22);
+            this.toolStripMenuItem4.Text = "Sync";
+            this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click);
+            // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(104, 6);
+            // 
+            // toolStripMenuItem1
+            // 
+            this.toolStripMenuItem1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(107, 22);
+            this.toolStripMenuItem1.Text = "Show";
+            this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
+            // 
+            // toolStripMenuItem3
+            // 
+            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(107, 22);
+            this.toolStripMenuItem3.Text = "Hide";
+            this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(104, 6);
+            // 
+            // toolStripMenuItem5
+            // 
+            this.toolStripMenuItem5.Name = "toolStripMenuItem5";
+            this.toolStripMenuItem5.Size = new System.Drawing.Size(107, 22);
+            this.toolStripMenuItem5.Text = "About";
+            this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
+            // 
+            // toolStripMenuItem2
+            // 
+            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(107, 22);
+            this.toolStripMenuItem2.Text = "Exit";
+            this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
+            // 
+            // autoSyncInterval
+            // 
+            this.autoSyncInterval.Location = new System.Drawing.Point(108, 91);
+            this.autoSyncInterval.Maximum = new decimal(new int[] {
             1440,
             0,
             0,
             0});
-			this.autoSyncInterval.Minimum = new decimal(new int[] {
+            this.autoSyncInterval.Minimum = new decimal(new int[] {
             1,
             0,
             0,
             0});
-			this.autoSyncInterval.Name = "autoSyncInterval";
-			this.autoSyncInterval.Size = new System.Drawing.Size(49, 21);
-			this.autoSyncInterval.TabIndex = 3;
-			this.autoSyncInterval.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-			this.autoSyncInterval.Value = new decimal(new int[] {
+            this.autoSyncInterval.Name = "autoSyncInterval";
+            this.autoSyncInterval.Size = new System.Drawing.Size(49, 21);
+            this.autoSyncInterval.TabIndex = 3;
+            this.autoSyncInterval.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            this.autoSyncInterval.Value = new decimal(new int[] {
             120,
             0,
             0,
             0});
-			// 
-			// autoSyncCheckBox
-			// 
-			this.autoSyncCheckBox.AutoSize = true;
-			this.autoSyncCheckBox.Location = new System.Drawing.Point(14, 42);
-			this.autoSyncCheckBox.Name = "autoSyncCheckBox";
-			this.autoSyncCheckBox.Size = new System.Drawing.Size(75, 17);
-			this.autoSyncCheckBox.TabIndex = 1;
-			this.autoSyncCheckBox.Text = "&Auto Sync";
-			this.autoSyncCheckBox.UseVisualStyleBackColor = true;
-			this.autoSyncCheckBox.CheckedChanged += new System.EventHandler(this.autoSyncCheckBox_CheckedChanged);
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(10, 93);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(89, 13);
-			this.label1.TabIndex = 2;
-			this.label1.Text = "Sync &Interval:";
-			// 
-			// label4
-			// 
-			this.label4.AutoSize = true;
-			this.label4.Location = new System.Drawing.Point(164, 93);
-			this.label4.Name = "label4";
-			this.label4.Size = new System.Drawing.Size(34, 13);
-			this.label4.TabIndex = 4;
-			this.label4.Text = "mins";
-			// 
-			// groupBox1
-			// 
-			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.groupBox1.Controls.Add(this.reportSyncResultCheckBox);
-			this.groupBox1.Controls.Add(this.runAtStartupCheckBox);
-			this.groupBox1.Controls.Add(this.nextSyncLabel);
-			this.groupBox1.Controls.Add(this.autoSyncInterval);
-			this.groupBox1.Controls.Add(this.label4);
-			this.groupBox1.Controls.Add(this.autoSyncCheckBox);
-			this.groupBox1.Controls.Add(this.label1);
-			this.groupBox1.Location = new System.Drawing.Point(6, 285);
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(299, 138);
-			this.groupBox1.TabIndex = 2;
-			this.groupBox1.TabStop = false;
-			this.groupBox1.Text = "Automization";
-			// 
-			// reportSyncResultCheckBox
-			// 
-			this.reportSyncResultCheckBox.AutoSize = true;
-			this.reportSyncResultCheckBox.Location = new System.Drawing.Point(14, 65);
-			this.reportSyncResultCheckBox.Name = "reportSyncResultCheckBox";
-			this.reportSyncResultCheckBox.Size = new System.Drawing.Size(190, 17);
-			this.reportSyncResultCheckBox.TabIndex = 6;
-			this.reportSyncResultCheckBox.Text = "Re&port Sync Result in System Tray";
-			this.reportSyncResultCheckBox.UseVisualStyleBackColor = true;
-			// 
-			// runAtStartupCheckBox
-			// 
-			this.runAtStartupCheckBox.AutoSize = true;
-			this.runAtStartupCheckBox.Location = new System.Drawing.Point(14, 21);
-			this.runAtStartupCheckBox.Name = "runAtStartupCheckBox";
-			this.runAtStartupCheckBox.Size = new System.Drawing.Size(134, 17);
-			this.runAtStartupCheckBox.TabIndex = 0;
-			this.runAtStartupCheckBox.Text = "&Run program at startup";
-			this.runAtStartupCheckBox.UseVisualStyleBackColor = true;
-			this.runAtStartupCheckBox.CheckedChanged += new System.EventHandler(this.runAtStartupCheckBox_CheckedChanged);
-			// 
-			// nextSyncLabel
-			// 
-			this.nextSyncLabel.AutoSize = true;
-			this.nextSyncLabel.Location = new System.Drawing.Point(10, 117);
-			this.nextSyncLabel.Name = "nextSyncLabel";
-			this.nextSyncLabel.Size = new System.Drawing.Size(79, 13);
-			this.nextSyncLabel.TabIndex = 5;
-			this.nextSyncLabel.Text = "Next Sync in";
-			// 
-			// syncTimer
-			// 
-			this.syncTimer.Interval = 1000;
-			this.syncTimer.Tick += new System.EventHandler(this.syncTimer_Tick);
-			// 
-			// groupBox2
-			// 
-			this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-						| System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.groupBox2.Controls.Add(this.panel1);
-			this.groupBox2.Controls.Add(this.btSyncDelete);
-			this.groupBox2.Controls.Add(this.tbSyncProfile);
-			this.groupBox2.Controls.Add(this.label5);
-			this.groupBox2.Controls.Add(this.syncOptionBox);
-			this.groupBox2.Location = new System.Drawing.Point(6, 115);
-			this.groupBox2.Name = "groupBox2";
-			this.groupBox2.Size = new System.Drawing.Size(299, 170);
-			this.groupBox2.TabIndex = 1;
-			this.groupBox2.TabStop = false;
-			this.groupBox2.Text = "Sync Options";
-			// 
-			// panel1
-			// 
-			this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-			this.panel1.Location = new System.Drawing.Point(7, 67);
-			this.panel1.Name = "panel1";
-			this.panel1.Size = new System.Drawing.Size(282, 1);
-			this.panel1.TabIndex = 3;
-			// 
-			// btSyncDelete
-			// 
-			this.btSyncDelete.AutoSize = true;
-			this.btSyncDelete.Location = new System.Drawing.Point(8, 46);
-			this.btSyncDelete.Name = "btSyncDelete";
-			this.btSyncDelete.Size = new System.Drawing.Size(92, 17);
-			this.btSyncDelete.TabIndex = 2;
-			this.btSyncDelete.Text = "Sync &Deletion";
-			this.toolTip.SetToolTip(this.btSyncDelete, "This specifies whether deletions are\r\nsynchronized. Enabling this option\r\nmeans i" +
-					"f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
-					"ice versa.");
-			this.btSyncDelete.UseVisualStyleBackColor = true;
-			this.btSyncDelete.CheckedChanged += new System.EventHandler(this.btSyncDelete_CheckedChanged);
-			// 
-			// tbSyncProfile
-			// 
-			this.tbSyncProfile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.tbSyncProfile.Location = new System.Drawing.Point(100, 19);
-			this.tbSyncProfile.Name = "tbSyncProfile";
-			this.tbSyncProfile.Size = new System.Drawing.Size(191, 21);
-			this.tbSyncProfile.TabIndex = 1;
-			this.toolTip.SetToolTip(this.tbSyncProfile, "This is a profile name of your choice.\r\nIt must be unique in each computer\r\nand a" +
-					"ccount you intend to sync with\r\nyour Google Mail account.");
-			this.tbSyncProfile.TextChanged += new System.EventHandler(this.tbSyncProfile_TextChanged);
-			// 
-			// label5
-			// 
-			this.label5.AutoSize = true;
-			this.label5.Location = new System.Drawing.Point(7, 22);
-			this.label5.Name = "label5";
-			this.label5.Size = new System.Drawing.Size(80, 13);
-			this.label5.TabIndex = 0;
-			this.label5.Text = "&Sync Profile:";
-			// 
-			// lastSyncLabel
-			// 
-			this.lastSyncLabel.AutoSize = true;
-			this.lastSyncLabel.Location = new System.Drawing.Point(7, 16);
-			this.lastSyncLabel.Name = "lastSyncLabel";
-			this.lastSyncLabel.Size = new System.Drawing.Size(80, 13);
-			this.lastSyncLabel.TabIndex = 0;
-			this.lastSyncLabel.Text = "Last Sync on";
-			// 
-			// logGroupBox
-			// 
-			this.logGroupBox.Controls.Add(this.syncConsole);
-			this.logGroupBox.Controls.Add(this.lastSyncLabel);
-			this.logGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.logGroupBox.Location = new System.Drawing.Point(316, 0);
-			this.logGroupBox.Name = "logGroupBox";
-			this.logGroupBox.Size = new System.Drawing.Size(369, 429);
-			this.logGroupBox.TabIndex = 2;
-			this.logGroupBox.TabStop = false;
-			this.logGroupBox.Text = "Sync Details && Log";
-			// 
-			// syncConsole
-			// 
-			this.syncConsole.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-						| System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.syncConsole.BackColor = System.Drawing.SystemColors.Info;
-			this.syncConsole.Location = new System.Drawing.Point(6, 33);
-			this.syncConsole.Multiline = true;
-			this.syncConsole.Name = "syncConsole";
-			this.syncConsole.ReadOnly = true;
-			this.syncConsole.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-			this.syncConsole.Size = new System.Drawing.Size(357, 390);
-			this.syncConsole.TabIndex = 1;
-			this.toolTip.SetToolTip(this.syncConsole, "This window shows information\r\n from the last sync.");
-			// 
-			// groupBox4
-			// 
-			this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.groupBox4.Controls.Add(this.proxySettingsLinkLabel);
-			this.groupBox4.Controls.Add(this.label2);
-			this.groupBox4.Controls.Add(this.label3);
-			this.groupBox4.Controls.Add(this.UserName);
-			this.groupBox4.Controls.Add(this.Password);
-			this.groupBox4.Location = new System.Drawing.Point(6, 20);
-			this.groupBox4.Name = "groupBox4";
-			this.groupBox4.Size = new System.Drawing.Size(299, 92);
-			this.groupBox4.TabIndex = 0;
-			this.groupBox4.TabStop = false;
-			this.groupBox4.Text = "Google Account";
-			// 
-			// proxySettingsLinkLabel
-			// 
-			this.proxySettingsLinkLabel.AutoSize = true;
-			this.proxySettingsLinkLabel.Location = new System.Drawing.Point(7, 69);
-			this.proxySettingsLinkLabel.Name = "proxySettingsLinkLabel";
-			this.proxySettingsLinkLabel.Size = new System.Drawing.Size(90, 13);
-			this.proxySettingsLinkLabel.TabIndex = 4;
-			this.proxySettingsLinkLabel.TabStop = true;
-			this.proxySettingsLinkLabel.Text = "Proxy Settings";
-			this.toolTip.SetToolTip(this.proxySettingsLinkLabel, resources.GetString("proxySettingsLinkLabel.ToolTip"));
-			this.proxySettingsLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.proxySettingsLinkLabel_LinkClicked);
-			// 
-			// resetMatchesLinkLabel
-			// 
-			this.resetMatchesLinkLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.resetMatchesLinkLabel.AutoSize = true;
-			this.resetMatchesLinkLabel.Location = new System.Drawing.Point(52, 447);
-			this.resetMatchesLinkLabel.Name = "resetMatchesLinkLabel";
-			this.resetMatchesLinkLabel.Size = new System.Drawing.Size(89, 13);
-			this.resetMatchesLinkLabel.TabIndex = 2;
-			this.resetMatchesLinkLabel.TabStop = true;
-			this.resetMatchesLinkLabel.Text = "&Reset Matches";
-			this.toolTip.SetToolTip(this.resetMatchesLinkLabel, "This unlinks Outlook contacts with their\r\ncorresponding Google contatcs. If you\r\n" +
-					"accidentaly delete a contact and you\r\ndont want the deletion to be synchronised," +
-					"\r\nclick  this link.");
-			this.resetMatchesLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.resetMatchesLinkLabel_LinkClicked);
-			// 
-			// Donate
-			// 
-			this.Donate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.Donate.BackColor = System.Drawing.Color.Transparent;
-			this.Donate.Image = ((System.Drawing.Image)(resources.GetObject("Donate.Image")));
-			this.Donate.Location = new System.Drawing.Point(12, 447);
-			this.Donate.Name = "Donate";
-			this.Donate.Size = new System.Drawing.Size(34, 34);
-			this.Donate.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
-			this.Donate.TabIndex = 4;
-			this.Donate.TabStop = false;
-			this.toolTip.SetToolTip(this.Donate, resources.GetString("Donate.ToolTip"));
-			this.Donate.Click += new System.EventHandler(this.Donate_Click);
-			this.Donate.MouseEnter += new System.EventHandler(this.Donate_MouseEnter);
-			this.Donate.MouseLeave += new System.EventHandler(this.Donate_MouseLeave);
-			// 
-			// settingsGroupBox
-			// 
-			this.settingsGroupBox.Controls.Add(this.groupBox1);
-			this.settingsGroupBox.Controls.Add(this.groupBox4);
-			this.settingsGroupBox.Controls.Add(this.groupBox2);
-			this.settingsGroupBox.Dock = System.Windows.Forms.DockStyle.Left;
-			this.settingsGroupBox.Location = new System.Drawing.Point(0, 0);
-			this.settingsGroupBox.Name = "settingsGroupBox";
-			this.settingsGroupBox.Size = new System.Drawing.Size(311, 429);
-			this.settingsGroupBox.TabIndex = 0;
-			this.settingsGroupBox.TabStop = false;
-			this.settingsGroupBox.Text = "Program Settings";
-			// 
-			// actionsTableLayout
-			// 
-			this.actionsTableLayout.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.actionsTableLayout.ColumnCount = 2;
-			this.actionsTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-			this.actionsTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-			this.actionsTableLayout.Controls.Add(this.hideButton, 0, 0);
-			this.actionsTableLayout.Controls.Add(this.syncButton, 0, 0);
-			this.actionsTableLayout.Location = new System.Drawing.Point(488, 447);
-			this.actionsTableLayout.Name = "actionsTableLayout";
-			this.actionsTableLayout.RowCount = 1;
-			this.actionsTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-			this.actionsTableLayout.Size = new System.Drawing.Size(209, 31);
-			this.actionsTableLayout.TabIndex = 1;
-			// 
-			// hideButton
-			// 
-			this.hideButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-						| System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.hideButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.hideButton.Location = new System.Drawing.Point(107, 3);
-			this.hideButton.Name = "hideButton";
-			this.hideButton.Size = new System.Drawing.Size(99, 25);
-			this.hideButton.TabIndex = 2;
-			this.hideButton.Text = "&Hide";
-			this.hideButton.UseVisualStyleBackColor = true;
-			this.hideButton.Click += new System.EventHandler(this.hideButton_Click);
-			// 
-			// MainPanel
-			// 
-			this.MainPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-						| System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.MainPanel.Controls.Add(this.logGroupBox);
-			this.MainPanel.Controls.Add(this.MainSplitter);
-			this.MainPanel.Controls.Add(this.settingsGroupBox);
-			this.MainPanel.Location = new System.Drawing.Point(12, 12);
-			this.MainPanel.Name = "MainPanel";
-			this.MainPanel.Size = new System.Drawing.Size(685, 429);
-			this.MainPanel.TabIndex = 0;
-			// 
-			// MainSplitter
-			// 
-			this.MainSplitter.Location = new System.Drawing.Point(311, 0);
-			this.MainSplitter.Name = "MainSplitter";
-			this.MainSplitter.Size = new System.Drawing.Size(5, 429);
-			this.MainSplitter.TabIndex = 5;
-			this.MainSplitter.TabStop = false;
-			// 
-			// SettingsForm
-			// 
-			this.AcceptButton = this.syncButton;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.hideButton;
-			this.ClientSize = new System.Drawing.Size(709, 490);
-			this.Controls.Add(this.Donate);
-			this.Controls.Add(this.MainPanel);
-			this.Controls.Add(this.resetMatchesLinkLabel);
-			this.Controls.Add(this.actionsTableLayout);
-			this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.HelpButton = true;
-			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.MinimumSize = new System.Drawing.Size(725, 528);
-			this.Name = "SettingsForm";
-			this.Text = "GO Contact Sync Mod - Settings";
-			this.WindowState = System.Windows.Forms.FormWindowState.Minimized;
-			this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.SettingsForm_HelpButtonClicked);
-			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SettingsForm_FormClosing);
-			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.SettingsForm_FormClosed);
-			this.Load += new System.EventHandler(this.SettingsForm_Load);
-			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.SettingsForm_HelpRequested);
-			this.Resize += new System.EventHandler(this.SettingsForm_Resize);
-			this.systemTrayMenu.ResumeLayout(false);
-			((System.ComponentModel.ISupportInitialize)(this.autoSyncInterval)).EndInit();
-			this.groupBox1.ResumeLayout(false);
-			this.groupBox1.PerformLayout();
-			this.groupBox2.ResumeLayout(false);
-			this.groupBox2.PerformLayout();
-			this.logGroupBox.ResumeLayout(false);
-			this.logGroupBox.PerformLayout();
-			this.groupBox4.ResumeLayout(false);
-			this.groupBox4.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)(this.Donate)).EndInit();
-			this.settingsGroupBox.ResumeLayout(false);
-			this.actionsTableLayout.ResumeLayout(false);
-			this.MainPanel.ResumeLayout(false);
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            // 
+            // autoSyncCheckBox
+            // 
+            this.autoSyncCheckBox.AutoSize = true;
+            this.autoSyncCheckBox.Location = new System.Drawing.Point(14, 42);
+            this.autoSyncCheckBox.Name = "autoSyncCheckBox";
+            this.autoSyncCheckBox.Size = new System.Drawing.Size(75, 17);
+            this.autoSyncCheckBox.TabIndex = 1;
+            this.autoSyncCheckBox.Text = "&Auto Sync";
+            this.autoSyncCheckBox.UseVisualStyleBackColor = true;
+            this.autoSyncCheckBox.CheckedChanged += new System.EventHandler(this.autoSyncCheckBox_CheckedChanged);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(10, 93);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(89, 13);
+            this.label1.TabIndex = 2;
+            this.label1.Text = "Sync &Interval:";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(164, 93);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(34, 13);
+            this.label4.TabIndex = 4;
+            this.label4.Text = "mins";
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox1.Controls.Add(this.reportSyncResultCheckBox);
+            this.groupBox1.Controls.Add(this.runAtStartupCheckBox);
+            this.groupBox1.Controls.Add(this.nextSyncLabel);
+            this.groupBox1.Controls.Add(this.autoSyncInterval);
+            this.groupBox1.Controls.Add(this.label4);
+            this.groupBox1.Controls.Add(this.autoSyncCheckBox);
+            this.groupBox1.Controls.Add(this.label1);
+            this.groupBox1.Location = new System.Drawing.Point(6, 285);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(299, 138);
+            this.groupBox1.TabIndex = 2;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Automization";
+            // 
+            // reportSyncResultCheckBox
+            // 
+            this.reportSyncResultCheckBox.AutoSize = true;
+            this.reportSyncResultCheckBox.Location = new System.Drawing.Point(14, 65);
+            this.reportSyncResultCheckBox.Name = "reportSyncResultCheckBox";
+            this.reportSyncResultCheckBox.Size = new System.Drawing.Size(190, 17);
+            this.reportSyncResultCheckBox.TabIndex = 6;
+            this.reportSyncResultCheckBox.Text = "Re&port Sync Result in System Tray";
+            this.reportSyncResultCheckBox.UseVisualStyleBackColor = true;
+            // 
+            // runAtStartupCheckBox
+            // 
+            this.runAtStartupCheckBox.AutoSize = true;
+            this.runAtStartupCheckBox.Location = new System.Drawing.Point(14, 21);
+            this.runAtStartupCheckBox.Name = "runAtStartupCheckBox";
+            this.runAtStartupCheckBox.Size = new System.Drawing.Size(134, 17);
+            this.runAtStartupCheckBox.TabIndex = 0;
+            this.runAtStartupCheckBox.Text = "&Run program at startup";
+            this.runAtStartupCheckBox.UseVisualStyleBackColor = true;
+            this.runAtStartupCheckBox.CheckedChanged += new System.EventHandler(this.runAtStartupCheckBox_CheckedChanged);
+            // 
+            // nextSyncLabel
+            // 
+            this.nextSyncLabel.AutoSize = true;
+            this.nextSyncLabel.Location = new System.Drawing.Point(10, 117);
+            this.nextSyncLabel.Name = "nextSyncLabel";
+            this.nextSyncLabel.Size = new System.Drawing.Size(79, 13);
+            this.nextSyncLabel.TabIndex = 5;
+            this.nextSyncLabel.Text = "Next Sync in";
+            // 
+            // syncTimer
+            // 
+            this.syncTimer.Interval = 1000;
+            this.syncTimer.Tick += new System.EventHandler(this.syncTimer_Tick);
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox2.Controls.Add(this.panel1);
+            this.groupBox2.Controls.Add(this.btSyncDelete);
+            this.groupBox2.Controls.Add(this.tbSyncProfile);
+            this.groupBox2.Controls.Add(this.label5);
+            this.groupBox2.Controls.Add(this.syncOptionBox);
+            this.groupBox2.Location = new System.Drawing.Point(6, 115);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(299, 170);
+            this.groupBox2.TabIndex = 1;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "Sync Options";
+            // 
+            // panel1
+            // 
+            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel1.Location = new System.Drawing.Point(7, 67);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(282, 1);
+            this.panel1.TabIndex = 3;
+            // 
+            // btSyncDelete
+            // 
+            this.btSyncDelete.AutoSize = true;
+            this.btSyncDelete.Location = new System.Drawing.Point(8, 46);
+            this.btSyncDelete.Name = "btSyncDelete";
+            this.btSyncDelete.Size = new System.Drawing.Size(92, 17);
+            this.btSyncDelete.TabIndex = 2;
+            this.btSyncDelete.Text = "Sync &Deletion";
+            this.toolTip.SetToolTip(this.btSyncDelete, "This specifies whether deletions are\r\nsynchronized. Enabling this option\r\nmeans i" +
+                    "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
+                    "ice versa.");
+            this.btSyncDelete.UseVisualStyleBackColor = true;
+            this.btSyncDelete.CheckedChanged += new System.EventHandler(this.btSyncDelete_CheckedChanged);
+            // 
+            // tbSyncProfile
+            // 
+            this.tbSyncProfile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.tbSyncProfile.Location = new System.Drawing.Point(100, 19);
+            this.tbSyncProfile.Name = "tbSyncProfile";
+            this.tbSyncProfile.Size = new System.Drawing.Size(191, 21);
+            this.tbSyncProfile.TabIndex = 1;
+            this.toolTip.SetToolTip(this.tbSyncProfile, "This is a profile name of your choice.\r\nIt must be unique in each computer\r\nand a" +
+                    "ccount you intend to sync with\r\nyour Google Mail account.");
+            this.tbSyncProfile.TextChanged += new System.EventHandler(this.tbSyncProfile_TextChanged);
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(7, 22);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(80, 13);
+            this.label5.TabIndex = 0;
+            this.label5.Text = "&Sync Profile:";
+            // 
+            // lastSyncLabel
+            // 
+            this.lastSyncLabel.AutoSize = true;
+            this.lastSyncLabel.Location = new System.Drawing.Point(7, 16);
+            this.lastSyncLabel.Name = "lastSyncLabel";
+            this.lastSyncLabel.Size = new System.Drawing.Size(80, 13);
+            this.lastSyncLabel.TabIndex = 0;
+            this.lastSyncLabel.Text = "Last Sync on";
+            // 
+            // logGroupBox
+            // 
+            this.logGroupBox.Controls.Add(this.syncConsole);
+            this.logGroupBox.Controls.Add(this.lastSyncLabel);
+            this.logGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.logGroupBox.Location = new System.Drawing.Point(316, 0);
+            this.logGroupBox.Name = "logGroupBox";
+            this.logGroupBox.Size = new System.Drawing.Size(369, 429);
+            this.logGroupBox.TabIndex = 2;
+            this.logGroupBox.TabStop = false;
+            this.logGroupBox.Text = "Sync Details && Log";
+            // 
+            // syncConsole
+            // 
+            this.syncConsole.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.syncConsole.BackColor = System.Drawing.SystemColors.Info;
+            this.syncConsole.Location = new System.Drawing.Point(6, 33);
+            this.syncConsole.Multiline = true;
+            this.syncConsole.Name = "syncConsole";
+            this.syncConsole.ReadOnly = true;
+            this.syncConsole.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.syncConsole.Size = new System.Drawing.Size(357, 390);
+            this.syncConsole.TabIndex = 1;
+            this.toolTip.SetToolTip(this.syncConsole, "This window shows information\r\n from the last sync.");
+            // 
+            // groupBox4
+            // 
+            this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox4.Controls.Add(this.proxySettingsLinkLabel);
+            this.groupBox4.Controls.Add(this.label2);
+            this.groupBox4.Controls.Add(this.label3);
+            this.groupBox4.Controls.Add(this.UserName);
+            this.groupBox4.Controls.Add(this.Password);
+            this.groupBox4.Location = new System.Drawing.Point(6, 20);
+            this.groupBox4.Name = "groupBox4";
+            this.groupBox4.Size = new System.Drawing.Size(299, 92);
+            this.groupBox4.TabIndex = 0;
+            this.groupBox4.TabStop = false;
+            this.groupBox4.Text = "Google Account";
+            // 
+            // proxySettingsLinkLabel
+            // 
+            this.proxySettingsLinkLabel.AutoSize = true;
+            this.proxySettingsLinkLabel.Location = new System.Drawing.Point(7, 69);
+            this.proxySettingsLinkLabel.Name = "proxySettingsLinkLabel";
+            this.proxySettingsLinkLabel.Size = new System.Drawing.Size(90, 13);
+            this.proxySettingsLinkLabel.TabIndex = 4;
+            this.proxySettingsLinkLabel.TabStop = true;
+            this.proxySettingsLinkLabel.Text = "Proxy Settings";
+            this.toolTip.SetToolTip(this.proxySettingsLinkLabel, resources.GetString("proxySettingsLinkLabel.ToolTip"));
+            this.proxySettingsLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.proxySettingsLinkLabel_LinkClicked);
+            // 
+            // resetMatchesLinkLabel
+            // 
+            this.resetMatchesLinkLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.resetMatchesLinkLabel.AutoSize = true;
+            this.resetMatchesLinkLabel.Location = new System.Drawing.Point(52, 447);
+            this.resetMatchesLinkLabel.Name = "resetMatchesLinkLabel";
+            this.resetMatchesLinkLabel.Size = new System.Drawing.Size(89, 13);
+            this.resetMatchesLinkLabel.TabIndex = 2;
+            this.resetMatchesLinkLabel.TabStop = true;
+            this.resetMatchesLinkLabel.Text = "&Reset Matches";
+            this.toolTip.SetToolTip(this.resetMatchesLinkLabel, "This unlinks Outlook contacts with their\r\ncorresponding Google contatcs. If you\r\n" +
+                    "accidentaly delete a contact and you\r\ndont want the deletion to be synchronised," +
+                    "\r\nclick  this link.");
+            this.resetMatchesLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.resetMatchesLinkLabel_LinkClicked);
+            // 
+            // Donate
+            // 
+            this.Donate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.Donate.BackColor = System.Drawing.Color.Transparent;
+            this.Donate.Image = ((System.Drawing.Image)(resources.GetObject("Donate.Image")));
+            this.Donate.Location = new System.Drawing.Point(12, 447);
+            this.Donate.Name = "Donate";
+            this.Donate.Size = new System.Drawing.Size(34, 34);
+            this.Donate.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+            this.Donate.TabIndex = 4;
+            this.Donate.TabStop = false;
+            this.toolTip.SetToolTip(this.Donate, resources.GetString("Donate.ToolTip"));
+            this.Donate.Click += new System.EventHandler(this.Donate_Click);
+            this.Donate.MouseEnter += new System.EventHandler(this.Donate_MouseEnter);
+            this.Donate.MouseLeave += new System.EventHandler(this.Donate_MouseLeave);
+            // 
+            // settingsGroupBox
+            // 
+            this.settingsGroupBox.Controls.Add(this.groupBox1);
+            this.settingsGroupBox.Controls.Add(this.groupBox4);
+            this.settingsGroupBox.Controls.Add(this.groupBox2);
+            this.settingsGroupBox.Dock = System.Windows.Forms.DockStyle.Left;
+            this.settingsGroupBox.Location = new System.Drawing.Point(0, 0);
+            this.settingsGroupBox.Name = "settingsGroupBox";
+            this.settingsGroupBox.Size = new System.Drawing.Size(311, 429);
+            this.settingsGroupBox.TabIndex = 0;
+            this.settingsGroupBox.TabStop = false;
+            this.settingsGroupBox.Text = "Program Settings";
+            // 
+            // actionsTableLayout
+            // 
+            this.actionsTableLayout.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.actionsTableLayout.ColumnCount = 2;
+            this.actionsTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.actionsTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.actionsTableLayout.Controls.Add(this.hideButton, 0, 0);
+            this.actionsTableLayout.Controls.Add(this.syncButton, 0, 0);
+            this.actionsTableLayout.Location = new System.Drawing.Point(488, 447);
+            this.actionsTableLayout.Name = "actionsTableLayout";
+            this.actionsTableLayout.RowCount = 1;
+            this.actionsTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.actionsTableLayout.Size = new System.Drawing.Size(209, 31);
+            this.actionsTableLayout.TabIndex = 1;
+            // 
+            // hideButton
+            // 
+            this.hideButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.hideButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.hideButton.Location = new System.Drawing.Point(107, 3);
+            this.hideButton.Name = "hideButton";
+            this.hideButton.Size = new System.Drawing.Size(99, 25);
+            this.hideButton.TabIndex = 2;
+            this.hideButton.Text = "&Hide";
+            this.hideButton.UseVisualStyleBackColor = true;
+            this.hideButton.Click += new System.EventHandler(this.hideButton_Click);
+            // 
+            // MainPanel
+            // 
+            this.MainPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.MainPanel.Controls.Add(this.logGroupBox);
+            this.MainPanel.Controls.Add(this.MainSplitter);
+            this.MainPanel.Controls.Add(this.settingsGroupBox);
+            this.MainPanel.Location = new System.Drawing.Point(12, 12);
+            this.MainPanel.Name = "MainPanel";
+            this.MainPanel.Size = new System.Drawing.Size(685, 429);
+            this.MainPanel.TabIndex = 0;
+            // 
+            // MainSplitter
+            // 
+            this.MainSplitter.Location = new System.Drawing.Point(311, 0);
+            this.MainSplitter.Name = "MainSplitter";
+            this.MainSplitter.Size = new System.Drawing.Size(5, 429);
+            this.MainSplitter.TabIndex = 5;
+            this.MainSplitter.TabStop = false;
+            // 
+            // SettingsForm
+            // 
+            this.AcceptButton = this.syncButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.hideButton;
+            this.ClientSize = new System.Drawing.Size(709, 490);
+            this.Controls.Add(this.Donate);
+            this.Controls.Add(this.MainPanel);
+            this.Controls.Add(this.resetMatchesLinkLabel);
+            this.Controls.Add(this.actionsTableLayout);
+            this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.HelpButton = true;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(725, 528);
+            this.Name = "SettingsForm";
+            this.Text = "GO Contact Sync Mod - Settings";
+            this.WindowState = System.Windows.Forms.FormWindowState.Minimized;
+            this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.SettingsForm_HelpButtonClicked);
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SettingsForm_FormClosing);
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.SettingsForm_FormClosed);
+            this.Load += new System.EventHandler(this.SettingsForm_Load);
+            this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.SettingsForm_HelpRequested);
+            this.Resize += new System.EventHandler(this.SettingsForm_Resize);
+            this.systemTrayMenu.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.autoSyncInterval)).EndInit();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
+            this.logGroupBox.ResumeLayout(false);
+            this.logGroupBox.PerformLayout();
+            this.groupBox4.ResumeLayout(false);
+            this.groupBox4.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.Donate)).EndInit();
+            this.settingsGroupBox.ResumeLayout(false);
+            this.actionsTableLayout.ResumeLayout(false);
+            this.MainPanel.ResumeLayout(false);
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-02-21 21:38:01 UTC (rev 33)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-02-21 21:46:12 UTC (rev 34)
@@ -169,6 +169,7 @@
 			{
 				TimerSwitch(false);
 				SetLastSyncText("Syncing...");
+                notifyIcon.Text = "Go Contact Sync Mod\nSyncing...";
 				SetFormEnabled(false);
 
 				if (_sync == null)
@@ -192,6 +193,7 @@
 
 					_sync.Sync();
 
+                    lastSync = DateTime.Now;
 					SetLastSyncText("Last synced at " + lastSync.ToString());
 					Logger.Log("Sync complete.", EventType.Information);
 					//SetSyncConsoleText(Logger.GetText());
@@ -199,8 +201,18 @@
 					if (reportSyncResultCheckBox.Checked)
 					{
 						notifyIcon.BalloonTipTitle = "Complete";
-						notifyIcon.BalloonTipText = string.Format("{0}. Sync complete.\n Synced: {2} out of {1}.\n Deleted: {3}.", DateTime.Now, _sync.TotalCount, _sync.SyncedCount, _sync.DeletedCount);
-						notifyIcon.BalloonTipIcon = ToolTipIcon.Info;
+                        notifyIcon.BalloonTipText = string.Format("{0}. Sync complete.\n Synced: {2} out of {1}.\n Deleted: {3}.\n Skipped: {4}.\n Errors: {5}.", DateTime.Now, _sync.TotalCount, _sync.SyncedCount, _sync.DeletedCount, _sync.SkippedCount, _sync.ErrorCount);
+                        Logger.Log(notifyIcon.BalloonTipText, EventType.Information);
+                        string toolTip = string.Format("Go Contact Sync Mod\nLast sync completed: {0}\nWarnings: {1}.", DateTime.Now.ToString("HH:mm"), _sync.ErrorCount + _sync.SkippedCount);
+                        if (toolTip.Length >= 64)
+                            toolTip = toolTip.Substring(0,63);
+                        notifyIcon.Text = toolTip;
+                        if (_sync.ErrorCount > 0)
+                            notifyIcon.BalloonTipIcon = ToolTipIcon.Error;
+                        else if (_sync.SkippedCount > 0)
+                            notifyIcon.BalloonTipIcon = ToolTipIcon.Warning;
+                        else
+						    notifyIcon.BalloonTipIcon = ToolTipIcon.Info;
 						notifyIcon.ShowBalloonTip(5000);
 					}
 				}
@@ -219,7 +231,7 @@
 				{
 					ErrorHandler.Handle(ex);
 				}
-				lastSync = DateTime.Now;
+				
 				TimerSwitch(true);
 			}
 			catch (Exception ex)
@@ -289,7 +301,13 @@
 				this.Invoke(h, new object[] { text });
 			}
 			else
+            {
 				syncConsole.Text = text;
+                //Scroll to bottom to always see the last log entry
+                syncConsole.SelectionStart = syncConsole.TextLength;
+                syncConsole.ScrollToCaret();
+            }
+
 		}
 		public void AppendSyncConsoleText(string text)
 		{
@@ -299,7 +317,12 @@
 				this.Invoke(h, new object[] { text });
 			}
 			else
+            {
 				syncConsole.Text += text;
+                //Scroll to bottom to always see the last log entry
+                syncConsole.SelectionStart = syncConsole.TextLength;
+                syncConsole.ScrollToCaret();
+            }
 		}
 		public void TimerSwitch(bool value)
 		{
@@ -439,7 +462,10 @@
 		}
 
 		private void resetMatchesLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-		{
+        {
+            Logger.ClearLog();
+            SetSyncConsoleText("");
+
 			SetFormEnabled(false);
 			// force deactivation to show up
 			Application.DoEvents();
@@ -452,7 +478,9 @@
 
 				_sync.LoginToGoogle(UserName.Text, Password.Text);
 				_sync.LoginToOutlook();
+                _sync.SyncProfile = tbSyncProfile.Text;
 
+                //Load matches, but match them by properties, not sync id
 				_sync.Load();
 
 				_sync.ResetMatches();
@@ -469,11 +497,11 @@
 			}
 		}
 
-		private void ShowForm()
-		{
-			Show();
-			WindowState = FormWindowState.Normal;
-		}
+        private void ShowForm()
+        {
+            Show();
+            WindowState = FormWindowState.Normal;
+        }
 		private void HideForm()
 		{
 			WindowState = FormWindowState.Minimized;
@@ -483,6 +511,7 @@
 		private void toolStripMenuItem1_Click(object sender, EventArgs e)
 		{
 			ShowForm();
+            this.Activate();
 		}
 		private void toolStripMenuItem3_Click(object sender, EventArgs e)
 		{
@@ -661,6 +690,7 @@
 			// go to the page showing the help and howto instructions
 			Process.Start("http://googlesyncmod.sourceforge.net/");
 		}
+     
 
 	}
 


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

Revision: 38
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=38&view=rev
Author:   floriwan
Date:     2011-02-22 06:57:47 +0000 (Tue, 22 Feb 2011)

Log Message:
-----------
Checked also OutlookContacts without Match, if they are already in the GoogleDuplicates and skip them then with an Error message

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactsMatcher.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/ContactsMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/ContactsMatcher.cs	2011-02-21 21:57:02 UTC (rev 37)
+++ trunk/GoogleContactsSync/ContactsMatcher.cs	2011-02-22 06:57:47 UTC (rev 38)
@@ -25,9 +25,11 @@
 		{
             Logger.Log("Matching Outlook and Google contacts...", EventType.Information);
 			ContactMatchList result = new ContactMatchList(Math.Max(sync.OutlookContacts.Count, sync.GoogleContacts.Capacity));
-            string duplicateGoogleMatches = "";         
-
+            
+            string duplicateGoogleMatches = "";
+            string duplicateOutlookContacts = "";
             sync.GoogleContactDuplicates = new Collection<ContactMatch>();
+            sync.OutlookContactDuplicates = new Collection<ContactMatch>();
 
 			//for each outlook contact try to get google contact id from user properties
 			//if no match - try to match by properties
@@ -276,7 +278,40 @@
 
                 if (match.AllGoogleContactMatches == null || match.AllGoogleContactMatches.Count == 0)
                 {
-                    Logger.Log(string.Format("No match found for outlook contact ({0})", olc.FileAs), EventType.Information);
+                    //Check, if this Outlook contact has a match in the google duplicates
+                    bool duplicateFound = false;
+                    foreach (ContactMatch duplicate in sync.GoogleContactDuplicates)
+                    {
+                        if (!string.IsNullOrEmpty(olc.FileAs) && olc.FileAs.Equals(duplicate.OutlookContact.FileAs, StringComparison.InvariantCultureIgnoreCase) ||
+                        !string.IsNullOrEmpty(olc.FullName) && olc.FullName.Equals(duplicate.OutlookContact.FullName, StringComparison.InvariantCultureIgnoreCase) ||
+                        !string.IsNullOrEmpty(olc.Email1Address) &&  (olc.Email1Address.Equals(duplicate.OutlookContact.Email1Address, StringComparison.InvariantCultureIgnoreCase) ||
+                                                                      olc.Email1Address.Equals(duplicate.OutlookContact.Email2Address, StringComparison.InvariantCultureIgnoreCase) ||
+                                                                      olc.Email1Address.Equals(duplicate.OutlookContact.Email3Address, StringComparison.InvariantCultureIgnoreCase)
+                                                                      ) ||
+                        !string.IsNullOrEmpty(olc.Email2Address) && (olc.Email2Address.Equals(duplicate.OutlookContact.Email1Address, StringComparison.InvariantCultureIgnoreCase) ||
+                                                                      olc.Email2Address.Equals(duplicate.OutlookContact.Email2Address, StringComparison.InvariantCultureIgnoreCase) ||
+                                                                      olc.Email2Address.Equals(duplicate.OutlookContact.Email3Address, StringComparison.InvariantCultureIgnoreCase)
+                                                                      ) ||
+                        !string.IsNullOrEmpty(olc.Email3Address) && (olc.Email3Address.Equals(duplicate.OutlookContact.Email1Address, StringComparison.InvariantCultureIgnoreCase) ||
+                                                                      olc.Email3Address.Equals(duplicate.OutlookContact.Email2Address, StringComparison.InvariantCultureIgnoreCase) ||
+                                                                      olc.Email3Address.Equals(duplicate.OutlookContact.Email3Address, StringComparison.InvariantCultureIgnoreCase)
+                                                                      ) ||
+                        olc.MobileTelephoneNumber != null && olc.MobileTelephoneNumber.Equals(duplicate.OutlookContact.MobileTelephoneNumber)
+                        )
+                        {
+                            duplicateFound = true;
+                            sync.OutlookContactDuplicates.Add(match);
+                            if (string.IsNullOrEmpty(duplicateOutlookContacts))
+                                duplicateOutlookContacts = "Outlook contacts matching with duplicate Google contacts have been found (either same email, Mobile or FullName) and cannot be synchronized. Please delete duplicates of:";
+
+                            string str = olc.FileAs + " (" + olc.Email1Address + ", " + olc.MobileTelephoneNumber + ")";
+                            if (!duplicateOutlookContacts.Contains(str))
+                                duplicateOutlookContacts += Environment.NewLine + str;
+                        }
+                    }
+
+                    if (!duplicateFound)
+                        Logger.Log(string.Format("No match found for outlook contact ({0})", olc.FileAs), EventType.Information);
                 }
                 else
                 {
@@ -311,8 +346,8 @@
             }
             #endregion
 
-            if (!string.IsNullOrEmpty(duplicateGoogleMatches))
-                duplicatesFound = new DuplicateDataException(duplicateGoogleMatches);
+            if (!string.IsNullOrEmpty(duplicateGoogleMatches) && !string.IsNullOrEmpty(duplicateOutlookContacts))
+                duplicatesFound = new DuplicateDataException(duplicateGoogleMatches + Environment.NewLine + Environment.NewLine + duplicateOutlookContacts);
             else
                 duplicatesFound = null;
 

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-02-21 21:57:02 UTC (rev 37)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-02-22 06:57:47 UTC (rev 38)
@@ -78,12 +78,12 @@
 			get { return _outlookContacts; }
 		}
 
-        //private Collection<Outlook.ContactItem> _outlookContactDuplicates;
-        //public Collection<Outlook.ContactItem> OutlookContactDuplicates
-        //{
-        //    get { return _outlookContactDuplicates; }
-        //    set { _outlookContactDuplicates = value; }
-        //}
+        private Collection<ContactMatch> _outlookContactDuplicates;
+        public Collection<ContactMatch> OutlookContactDuplicates
+        {
+            get { return _outlookContactDuplicates; }
+            set { _outlookContactDuplicates = value; }
+        }
 
         private Collection<ContactMatch> _googleContactDuplicates;
         public Collection<ContactMatch> GoogleContactDuplicates
@@ -418,15 +418,27 @@
 #endif
 
 				if (_matches == null)
-					return;	
-			
+					return;
+
+                _totalCount = _matches.Count;
+
                 //Remove Google duplicates from matches to be synced
                 if (_googleContactDuplicates != null)
                     foreach (ContactMatch match in _googleContactDuplicates)
                         if (_matches.Contains(match))
+                        {
+                            _skippedCount++;
                             _matches.Remove(match);
+                        }
 
-				_totalCount = _matches.Count;
+                //Remove Outlook duplicates from matches to be synced
+                if (_outlookContactDuplicates != null)
+                    foreach (ContactMatch match in _outlookContactDuplicates)
+                        if (_matches.Contains(match))
+                        {
+                            _skippedCount++;
+                            _matches.Remove(match);
+                        }
 
 				Logger.Log("Syncing groups...", EventType.Information);
 				ContactsMatcher.SyncGroups(this);


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

Revision: 40
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=40&view=rev
Author:   floriwan
Date:     2011-02-22 19:27:10 +0000 (Tue, 22 Feb 2011)

Log Message:
-----------
- Show sync result in Log TextBox also when Balloon notification is switched off (Show no sync result in system tray)
- Show Product.ApplicationName in sytem tray icon and balloong => therefore I have changed the AssemblyInfo.AssemblyProduct to "GO Contact Sync Mod"

Modified Paths:
--------------
    trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
    trunk/GoogleContactsSync/SettingsForm.cs

Modified: trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
===================================================================
--- trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-02-22 06:58:56 UTC (rev 39)
+++ trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-02-22 19:27:10 UTC (rev 40)
@@ -10,8 +10,8 @@
 [assembly: AssemblyDescription("Synchronize your Outlook and Google contacts. Visit our Project Homepage at http://googlesyncmod.sourceforge.net")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("WebGear Ltd, New Zealand + Create Software + Stru.be")]
-[assembly: AssemblyProduct("GO Contact Sync, updated by Create Software and Stru.be")]
-[assembly: AssemblyCopyright("Copyright © Mikhail Diatchenko 2009, © WebGear Ltd, New Zealand 2009, parts © Create Software (Clément Pit--Claudel), parts © Stru.be (Stefan Strube) ")]
+[assembly: AssemblyProduct("GO Contact Sync Mod")] //forked from GO Contact Sync, updated by Create Software and Stru.be and floriwan
+[assembly: AssemblyCopyright("Copyright © Mikhail Diatchenko 2009, © WebGear Ltd, New Zealand 2009, parts © Create Software (Clément Pit--Claudel), parts © Stru.be (Stefan Strube), , parts © floriwan (Florian Saller) ")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 //[assembly: InternalsVisibleTo("WebGear.GOContactSync.UnitTests")]

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-02-22 06:58:56 UTC (rev 39)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-02-22 19:27:10 UTC (rev 40)
@@ -169,7 +169,7 @@
 			{
 				TimerSwitch(false);
 				SetLastSyncText("Syncing...");
-                notifyIcon.Text = "Go Contact Sync Mod\nSyncing...";
+                notifyIcon.Text = Application.ProductName + "\nSyncing...";
 				SetFormEnabled(false);
 
 				if (_sync == null)
@@ -186,7 +186,6 @@
 				_sync.SyncProfile = tbSyncProfile.Text;
 				_sync.SyncOption = _syncOption;
                 
-                string toolTip = "Go Contact Sync Mod\n";
 				try
 				{
 					_sync.LoginToGoogle(UserName.Text, Password.Text);
@@ -199,17 +198,11 @@
 					Logger.Log("Sync complete.", EventType.Information);
 					//SetSyncConsoleText(Logger.GetText());
 
-					if (reportSyncResultCheckBox.Checked)
+                    if (reportSyncResultCheckBox.Checked)
 					{
-						notifyIcon.BalloonTipTitle = "Complete";
+                        notifyIcon.BalloonTipTitle = Application.ProductName;
                         notifyIcon.BalloonTipText = string.Format("{0}. Sync complete.\n Synced: {2} out of {1}.\n Deleted: {3}.\n Skipped: {4}.\n Errors: {5}.", DateTime.Now, _sync.TotalCount, _sync.SyncedCount, _sync.DeletedCount, _sync.SkippedCount, _sync.ErrorCount);
-                        Logger.Log(notifyIcon.BalloonTipText, EventType.Information);
-                        toolTip += string.Format("Last sync completed: {0}", DateTime.Now.ToString("HH:mm"));
-                        if (_sync.ErrorCount + _sync.SkippedCount > 0)
-                            toolTip+= string.Format("\nWarnings: {0}.",  _sync.ErrorCount + _sync.SkippedCount);
-                        if (toolTip.Length >= 64)
-                            toolTip = toolTip.Substring(0,63);
-                        notifyIcon.Text = toolTip;
+                        
                         if (_sync.ErrorCount > 0)
                             notifyIcon.BalloonTipIcon = ToolTipIcon.Error;
                         else if (_sync.SkippedCount > 0)
@@ -218,10 +211,18 @@
 						    notifyIcon.BalloonTipIcon = ToolTipIcon.Info;
 						notifyIcon.ShowBalloonTip(5000);
 					}
+                    Logger.Log(notifyIcon.BalloonTipText, EventType.Information);
+                    string toolTip = string.Format("{0}\nLast sync completed: {1}", Application.ProductName, DateTime.Now.ToString("HH:mm"));
+                    if (_sync.ErrorCount + _sync.SkippedCount > 0)
+                        toolTip += string.Format("\nWarnings: {0}.", _sync.ErrorCount + _sync.SkippedCount);
+                    if (toolTip.Length >= 64)
+                        toolTip = toolTip.Substring(0, 63);
+                    notifyIcon.Text = toolTip;
+
 				}
 				catch (Google.GData.Client.GDataRequestException ex)
 				{
-                    notifyIcon.Text = toolTip + "Sync failed";
+                    notifyIcon.Text = Application.ProductName + "\nSync failed";
 					if (ex.InnerException is System.Net.WebException)
 					{
 						Logger.Log("Cannot connect to Google, please check if for available internet connection and proxy settings if applicable: "+((System.Net.WebException)ex.InnerException).Message, EventType.Warning);
@@ -233,7 +234,7 @@
 				}
 				catch (Exception ex)
 				{
-                    notifyIcon.Text = toolTip + "Sync failed";
+                    notifyIcon.Text = Application.ProductName + "\nSync failed";
 					ErrorHandler.Handle(ex);
 				}
 				


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

Revision: 51
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=51&view=rev
Author:   floriwan
Date:     2011-02-23 21:50:15 +0000 (Wed, 23 Feb 2011)

Log Message:
-----------
Fixed several issues regarding timing problem and contacts that are updated again and again (e.g. by setting a TimeTolerance to 60 seconds, because lastSync is saved without seconds anyway

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactPropertiesUtils.cs
    trunk/GoogleContactsSync/ContactsMatcher.cs
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs
    trunk/GoogleContactsSync/Utilities.cs

Modified: trunk/GoogleContactsSync/ContactPropertiesUtils.cs
===================================================================
--- trunk/GoogleContactsSync/ContactPropertiesUtils.cs	2011-02-23 09:13:18 UTC (rev 50)
+++ trunk/GoogleContactsSync/ContactPropertiesUtils.cs	2011-02-23 21:50:15 UTC (rev 51)
@@ -73,6 +73,13 @@
             }
         }
 
+        /// <summary>
+        /// Sets the syncId of the Outlook contact and the last sync date. 
+        /// Please assure to always call this function when saving OutlookItem
+        /// </summary>
+        /// <param name="sync"></param>
+        /// <param name="outlookContact"></param>
+        /// <param name="googleContact"></param>
         public static void SetOutlookGoogleContactId(Syncronizer sync, Outlook.ContactItem outlookContact, ContactEntry googleContact)
         {
             if (googleContact.Id.Uri == null)
@@ -90,12 +97,26 @@
                 prop = outlookContact.UserProperties.Add(OutlookPropertyNameUpdated, Outlook.OlUserPropertyType.olDateTime, null, null);
             prop.Value = googleContact.Updated;*/
 
+            //Also set the OutlookLastSync date when setting a match between Outlook and Google to assure the lastSync updated when Outlook contact is saved afterwards
+            SetOutlookLastSync(sync, outlookContact);
+        }
+
+        public static void SetOutlookLastSync(Syncronizer sync, Outlook.ContactItem outlookContact)
+        {
             //save sync datetime
-            prop = outlookContact.UserProperties[sync.OutlookPropertyNameSynced];
+            Outlook.UserProperty prop = outlookContact.UserProperties[sync.OutlookPropertyNameSynced];
             if (prop == null)
                 prop = outlookContact.UserProperties.Add(sync.OutlookPropertyNameSynced, Outlook.OlUserPropertyType.olDateTime, null, null);
             prop.Value = DateTime.Now;
         }
+
+        public static DateTime? GetOutlookLastSync(Syncronizer sync, Outlook.ContactItem outlookContact)
+        {
+            Outlook.UserProperty prop = outlookContact.UserProperties[sync.OutlookPropertyNameSynced];
+            if (prop != null)
+                return (DateTime)prop.Value;
+            return null;
+        }
         public static string GetOutlookGoogleContactId(Syncronizer sync, Outlook.ContactItem outlookContact)
         {
             Outlook.UserProperty idProp = outlookContact.UserProperties[sync.OutlookPropertyNameId];
@@ -114,19 +135,24 @@
             if (idProp == null && lastSyncProp == null)
                 return;
 
+            List<int> indexesToBeRemoved = new List<int>();
             IEnumerator en = outlookContact.UserProperties.GetEnumerator();
-            int index = 1; // 1 based collection
-            while (en.MoveNext())
+            en.Reset();
+            int index = 1; // 1 based collection            
+            while (en.MoveNext())            
             {
                 if (en.Current as Outlook.UserProperty == idProp || en.Current as Outlook.UserProperty == lastSyncProp)
                 {
-                    outlookContact.UserProperties.Remove(index);
+                    indexesToBeRemoved.Add(index);
+                    //outlookContact.UserProperties.Remove(index);
                     //Don't return to remove both properties, googleId and lastSynced
                     //return;
                 }
                 index++;
             }
 
+            for (int i = indexesToBeRemoved.Count-1; i>=0 ; i--)
+                outlookContact.UserProperties.Remove(indexesToBeRemoved[i]);
             //throw new Exception("Did not find prop.");
         }
     }

Modified: trunk/GoogleContactsSync/ContactsMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/ContactsMatcher.cs	2011-02-23 09:13:18 UTC (rev 50)
+++ trunk/GoogleContactsSync/ContactsMatcher.cs	2011-02-23 21:50:15 UTC (rev 51)
@@ -12,8 +12,11 @@
 	{
 		/// <summary>
 		/// Time tolerance in seconds - used when comparing date modified.
+        /// Less than 60 seconds doesn't make sense, as the lastSync is saved without seconds and if it is compared
+        /// with the LastUpdate dates of Google and Outlook, in the worst case you compare e.g. 15:59 with 16:00 and 
+        /// after truncating to minutes you compare 15:00 wiht 16:00
 		/// </summary>
-		public static int TimeTolerance = 20;
+		public static int TimeTolerance = 60 ;
 
 		/// <summary>
 		/// Matches outlook and google contact by a) google id b) properties.
@@ -530,7 +533,7 @@
 
                 //determine if this contact pair were syncronized
                 //DateTime? lastUpdated = GetOutlookPropertyValueDateTime(match.OutlookContact, sync.OutlookPropertyNameUpdated);
-                DateTime? lastSynced = GetOutlookPropertyValueDateTime(match.OutlookContact, sync.OutlookPropertyNameSynced);
+                DateTime? lastSynced = ContactPropertiesUtils.GetOutlookLastSync(sync,  match.OutlookContact);
                 if (lastSynced.HasValue)
                 {
                     //contact pair was syncronysed before.
@@ -542,8 +545,8 @@
                     DateTime lastUpdatedGoogle = match.GoogleContact.Updated.AddSeconds(-match.GoogleContact.Updated.Second);
 
                     //check if both outlok and google contacts where updated sync last sync
-                    if (lastUpdatedOutlook.Subtract(lastSynced.Value).TotalSeconds >= TimeTolerance
-                        && lastUpdatedGoogle.Subtract(lastSynced.Value).TotalSeconds >= TimeTolerance)
+                    if (lastUpdatedOutlook.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance
+                        && lastUpdatedGoogle.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance)
                     {
                         //both contacts were updated.
                         //options: 1) ignore 2) loose one based on SyncOption
@@ -596,15 +599,15 @@
 
                     //check if outlook contact was updated (with X second tolerance)
                     if (sync.SyncOption != SyncOption.GoogleToOutlookOnly &&
-                        (lastUpdatedOutlook.Subtract(lastSynced.Value).TotalSeconds >= TimeTolerance ||
-                         lastUpdatedGoogle.Subtract(lastSynced.Value).TotalSeconds >= TimeTolerance &&
+                        (lastUpdatedOutlook.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance ||
+                         lastUpdatedGoogle.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance &&
                          sync.SyncOption == SyncOption.OutlookToGoogleOnly
                         )
                        )
                     {
                         //outlook contact was changed or changed Google contact will be overwritten
 
-                        if (lastUpdatedGoogle.Subtract(lastSynced.Value).TotalSeconds >= TimeTolerance && 
+                        if (lastUpdatedGoogle.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance && 
                             sync.SyncOption == SyncOption.OutlookToGoogleOnly)
                             Logger.Log("Google contact has been updated since last sync, but Outlook contact is overwriting Google because of SyncOption " + sync.SyncOption + ": " + match.OutlookContact.FileAs + ".", EventType.Information);
 
@@ -618,15 +621,15 @@
 
                     //check if google contact was updated (with X second tolerance)
                     if (sync.SyncOption != SyncOption.OutlookToGoogleOnly &&
-                        (lastUpdatedGoogle.Subtract(lastSynced.Value).TotalSeconds >= TimeTolerance ||
-                         lastUpdatedOutlook.Subtract(lastSynced.Value).TotalSeconds >= TimeTolerance &&
+                        (lastUpdatedGoogle.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance ||
+                         lastUpdatedOutlook.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance &&
                          sync.SyncOption == SyncOption.GoogleToOutlookOnly
                         )
                        )
                     {
                         //google contact was changed or changed Outlook contact will be overwritten
 
-                        if (lastUpdatedOutlook.Subtract(lastSynced.Value).TotalSeconds >= TimeTolerance &&
+                        if (lastUpdatedOutlook.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance &&
                             sync.SyncOption == SyncOption.GoogleToOutlookOnly)
                             Logger.Log("Outlook contact has been updated since last sync, but Google contact is overwriting Outlook because of SyncOption " + sync.SyncOption + ": " + match.OutlookContact.FileAs + ".", EventType.Information);
                         
@@ -713,18 +716,9 @@
 			}
 
 			return null;
-		}
+		}       
 
-		public static DateTime? GetOutlookPropertyValueDateTime(Outlook.ContactItem outlookContact, string propertyName)
-		{
-			Outlook.UserProperty prop = outlookContact.UserProperties[propertyName];
-			if (prop != null)
-				return (DateTime)prop.Value;
-			return null;
-		}
-        
 
-
 		/// <summary>
 		/// Adds new Google Groups to the Google account.
 		/// </summary>

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-02-23 09:13:18 UTC (rev 50)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-02-23 21:50:15 UTC (rev 51)
@@ -482,6 +482,7 @@
                 SetLastSyncText("Resetting matches...");
                 notifyIcon.Text = Application.ProductName + "\nResetting matches...";
                 SetFormEnabled(false);
+                this.hideButton.Enabled = false;
 
 				if (_sync == null)
 				{
@@ -513,6 +514,7 @@
 			finally
 			{
 				SetFormEnabled(true);
+                this.hideButton.Enabled = true;
 			}
 		}
 

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-02-23 09:13:18 UTC (rev 50)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-02-23 21:50:15 UTC (rev 51)
@@ -557,6 +557,7 @@
 
         private void SaveOutlookContact(ContactMatch match)
         {
+            ContactPropertiesUtils.SetOutlookGoogleContactId(this, match.OutlookContact, match.GoogleContact);
             match.OutlookContact.Save();
             ContactPropertiesUtils.SetGoogleOutlookContactId(SyncProfile, match.GoogleContact, match.OutlookContact);
 
@@ -693,7 +694,7 @@
 					throw;
 				}
 			}
-		}
+		}         
 
         //public void SaveContactPhotos(ContactMatch match)
         //{
@@ -751,6 +752,7 @@
                         throw new Exception("Could not save");
 
                     //Just save the Outlook Contact to have the same lastUpdate date as Google
+                    ContactPropertiesUtils.SetOutlookGoogleContactId(this, match.OutlookContact, match.GoogleContact);
                     match.OutlookContact.Save();
                     outlookPhoto.Dispose();
                 }
@@ -774,6 +776,7 @@
                 // add google photo to outlook
                 Image googlePhoto = Utilities.GetGooglePhoto(this, match.GoogleContact);
                 Utilities.SetOutlookPhoto(match.OutlookContact, googlePhoto);
+                ContactPropertiesUtils.SetOutlookGoogleContactId(this, match.OutlookContact, match.GoogleContact);
                 match.OutlookContact.Save();
 
                 googlePhoto.Dispose();
@@ -781,6 +784,7 @@
             else if (hasOutlookPhoto)
             {
                 match.OutlookContact.RemovePicture();
+                ContactPropertiesUtils.SetOutlookGoogleContactId(this, match.OutlookContact, match.GoogleContact);
                 match.OutlookContact.Save();
             }
         }

Modified: trunk/GoogleContactsSync/Utilities.cs
===================================================================
--- trunk/GoogleContactsSync/Utilities.cs	2011-02-23 09:13:18 UTC (rev 50)
+++ trunk/GoogleContactsSync/Utilities.cs	2011-02-23 21:50:15 UTC (rev 51)
@@ -94,7 +94,7 @@
             try
             {
                 outlookContact.AddPicture(fullImagePath);
-                outlookContact.Save();
+                //outlookContact.Save();
                 return true;
             }
             catch


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

Revision: 80
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=80&view=rev
Author:   floriwan
Date:     2011-03-01 19:11:21 +0000 (Tue, 01 Mar 2011)

Log Message:
-----------
stopped recreating birthdays in calendar

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactSync.cs
    trunk/GoogleContactsSync/ContactsMatcher.cs

Modified: trunk/GoogleContactsSync/ContactSync.cs
===================================================================
--- trunk/GoogleContactsSync/ContactSync.cs	2011-03-01 00:55:33 UTC (rev 79)
+++ trunk/GoogleContactsSync/ContactSync.cs	2011-03-01 19:11:21 UTC (rev 80)
@@ -597,8 +597,10 @@
             DateTime.TryParse(master.ContactEntry.Birthday, out birthday);
 
             if (birthday != DateTime.MinValue)
+            {
                 if (!birthday.Date.Equals(slave.Birthday.Date)) //Only update if not already equal to avoid recreating the calendar item again and again
                     slave.Birthday = birthday.Date;
+            }
             else
                 slave.Birthday = outlookDateNone;
             #endregion birthday

Modified: trunk/GoogleContactsSync/ContactsMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/ContactsMatcher.cs	2011-03-01 00:55:33 UTC (rev 79)
+++ trunk/GoogleContactsSync/ContactsMatcher.cs	2011-03-01 19:11:21 UTC (rev 80)
@@ -89,6 +89,7 @@
                 if (!IsContactValid(olc))
 				{
 					Logger.Log(string.Format("Invalid outlook contact ({0}). Skipping", olc.FileAs), EventType.Warning);
+                    sync.SkippedCount++;
 					continue;
 				}
 


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

Revision: 82
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=82&view=rev
Author:   floriwan
Date:     2011-03-01 22:36:30 +0000 (Tue, 01 Mar 2011)

Log Message:
-----------
Removed unnecessary outcommented code and not yet synced properties (RadioTelephoneNumber and Language are not properly synced)

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactSync.cs
    trunk/GoogleContactsSync/ContactsMatcher.cs

Modified: trunk/GoogleContactsSync/ContactSync.cs
===================================================================
--- trunk/GoogleContactsSync/ContactSync.cs	2011-03-01 19:15:02 UTC (rev 81)
+++ trunk/GoogleContactsSync/ContactSync.cs	2011-03-01 22:36:30 UTC (rev 82)
@@ -280,13 +280,14 @@
 				destination.Phonenumbers.Add(phoneNumber);
 			}
 
-			if (!string.IsNullOrEmpty(source.RadioTelephoneNumber))
-			{
-				PhoneNumber phoneNumber = new PhoneNumber(source.RadioTelephoneNumber);
-				phoneNumber.Primary = destination.Phonenumbers.Count == 0;
-				phoneNumber.Rel = ContactsRelationships.IsMobile;
-				destination.Phonenumbers.Add(phoneNumber);
-			}
+            //ToDo: Currently IsSatellite is returned as invalid Rel value
+            //if (!string.IsNullOrEmpty(source.RadioTelephoneNumber))
+            //{
+            //    PhoneNumber phoneNumber = new PhoneNumber(source.RadioTelephoneNumber);
+            //    phoneNumber.Primary = destination.Phonenumbers.Count == 0;
+            //    phoneNumber.Rel = ContactsRelationships.IsSatellite;
+            //    destination.Phonenumbers.Add(phoneNumber);
+            //}
 
 			if (!string.IsNullOrEmpty(source.PagerNumber))
 			{
@@ -367,8 +368,8 @@
 				destination.HomeFaxNumber = phone.Value;
             else if (phone.Rel == ContactsRelationships.IsPager)
 				destination.PagerNumber = phone.Value;
-			else if (phone.Rel == ContactsRelationships.IsSatellite)
-				destination.RadioTelephoneNumber = phone.Value;
+            //else if (phone.Rel == ContactsRelationships.IsSatellite)
+            //    destination.RadioTelephoneNumber = phone.Value;
 			else if (phone.Rel == ContactsRelationships.IsOther)
 				destination.OtherTelephoneNumber = phone.Value;
 			else if (phone.Rel == ContactsRelationships.IsCar)
@@ -472,7 +473,7 @@
             slave.Location = master.OfficeLocation;
             //Categories are synced separately in Syncronizer.OverwriteContactGroups: slave.Categories = master.Categories;
             slave.ContactEntry.Initials = master.Initials;
-            slave.ContactEntry.Language = master.Language;
+            //slave.ContactEntry.Language = master.Language;
 
 			SetEmails(master, slave);
 
@@ -609,7 +610,7 @@
             slave.OfficeLocation = master.Location;
             //Categories are synced separately in Syncronizer.OverwriteContactGroups: slave.Categories = master.Categories;
             slave.Initials = master.ContactEntry.Initials;
-            slave.Language = master.ContactEntry.Language;
+            //slave.Language = master.ContactEntry.Language; //ToDo: Doesn't work yet with the Google API
             
 			SetEmails(master, slave);
 
@@ -623,7 +624,7 @@
             slave.BusinessFaxNumber = string.Empty;
             slave.HomeFaxNumber = string.Empty;
             slave.PagerNumber = string.Empty;
-            slave.RadioTelephoneNumber = string.Empty;
+            //slave.RadioTelephoneNumber = string.Empty;
             slave.OtherTelephoneNumber = string.Empty;
             slave.CarTelephoneNumber = string.Empty;
             

Modified: trunk/GoogleContactsSync/ContactsMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/ContactsMatcher.cs	2011-03-01 19:15:02 UTC (rev 81)
+++ trunk/GoogleContactsSync/ContactsMatcher.cs	2011-03-01 22:36:30 UTC (rev 82)
@@ -769,43 +769,5 @@
 				OutlookContact.Delete();
 		}
 	}
-
-	//public class GroupMatchList : List<GroupMatch>
-	//{
-	//    public GroupMatchList(int capacity) : base(capacity) { }
-	//}
-
-	//public class GroupMatch
-	//{
-	//    public string OutlookGroup;
-	//    public Group GoogleGroup;
-	//    public readonly List<Group> AllGoogleGroupMatches = new List<Group>(1);
-	//    public Group LastGoogleGroup;
-
-	//    public GroupMatch(string outlookGroup, Group googleGroup)
-	//    {
-	//        OutlookGroup = outlookGroup;
-	//        GoogleGroup = googleGroup;
-	//    }
-
-	//    public void AddGoogleGroup(Group googleGroup)
-	//    {
-	//        if (googleGroup == null)
-	//            return;
-	//        //throw new ArgumentNullException("googleContact must not be null.");
-
-	//        if (GoogleGroup == null)
-	//            GoogleGroup = googleGroup;
-
-	//        //this to avoid searching the entire collection. 
-	//        //if last contact it what we are trying to add the we have already added it earlier
-	//        if (LastGoogleGroup == googleGroup)
-	//            return;
-
-	//        if (!AllGoogleGroupMatches.Contains(googleGroup))
-	//            AllGoogleGroupMatches.Add(googleGroup);
-
-	//        LastGoogleGroup = googleGroup;
-	//    }
-	//}
+    		
 }


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

Revision: 87
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=87&view=rev
Author:   floriwan
Date:     2011-03-02 16:39:05 +0000 (Wed, 02 Mar 2011)

Log Message:
-----------
Fixed several issues with syncing Title/FileAs
Fixed PrimaryPhoneNumber sync

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactSync.cs
    trunk/GoogleContactsSync/ContactsMatcher.cs

Modified: trunk/GoogleContactsSync/ContactSync.cs
===================================================================
--- trunk/GoogleContactsSync/ContactSync.cs	2011-03-02 14:46:33 UTC (rev 86)
+++ trunk/GoogleContactsSync/ContactSync.cs	2011-03-02 16:39:05 UTC (rev 87)
@@ -208,18 +208,18 @@
 		{
             destination.Phonenumbers.Clear();
 
-			if (!string.IsNullOrEmpty(source.PrimaryTelephoneNumber))
-			{
-				PhoneNumber phoneNumber = new PhoneNumber(source.PrimaryTelephoneNumber);
-				phoneNumber.Primary = destination.Phonenumbers.Count == 0;
-				phoneNumber.Rel = ContactsRelationships.IsMobile;
-				destination.Phonenumbers.Add(phoneNumber);
-			}
+            if (!string.IsNullOrEmpty(source.PrimaryTelephoneNumber))
+            {
+                PhoneNumber phoneNumber = new PhoneNumber(source.PrimaryTelephoneNumber);
+                phoneNumber.Primary = destination.Phonenumbers.Count == 0;
+                phoneNumber.Rel = ContactsRelationships.IsMain;
+                destination.Phonenumbers.Add(phoneNumber);
+            }
 
 			if (!string.IsNullOrEmpty(source.MobileTelephoneNumber))
 			{
 				PhoneNumber phoneNumber = new PhoneNumber(source.MobileTelephoneNumber);
-				phoneNumber.Primary = destination.Phonenumbers.Count == 0;
+                phoneNumber.Primary = destination.Phonenumbers.Count == 0;
 				phoneNumber.Rel = ContactsRelationships.IsMobile;
 				destination.Phonenumbers.Add(phoneNumber);
 			}
@@ -227,7 +227,7 @@
 			if (!string.IsNullOrEmpty(source.HomeTelephoneNumber))
 			{
 				PhoneNumber phoneNumber = new PhoneNumber(source.HomeTelephoneNumber);
-				phoneNumber.Primary = destination.Phonenumbers.Count == 0;
+                phoneNumber.Primary = destination.Phonenumbers.Count == 0;
 				phoneNumber.Rel = ContactsRelationships.IsHome;
 				destination.Phonenumbers.Add(phoneNumber);
 			}
@@ -243,7 +243,7 @@
 			if (!string.IsNullOrEmpty(source.BusinessTelephoneNumber))
 			{
 				PhoneNumber phoneNumber = new PhoneNumber(source.BusinessTelephoneNumber);
-				phoneNumber.Primary = destination.Phonenumbers.Count == 0;
+                phoneNumber.Primary = destination.Phonenumbers.Count == 0;
 				phoneNumber.Rel = ContactsRelationships.IsWork;
 				destination.Phonenumbers.Add(phoneNumber);
 			}
@@ -340,10 +340,10 @@
 
 		public static void SetPhoneNumber(PhoneNumber phone, Outlook.ContactItem destination)
 		{
-            if (phone.Primary)
+            //if (phone.Primary)
+            if (phone.Rel == ContactsRelationships.IsMain)
                 destination.PrimaryTelephoneNumber = phone.Value;
-
-            if (phone.Rel == ContactsRelationships.IsHome)
+            else if (phone.Rel == ContactsRelationships.IsHome)
             {
                 if (destination.HomeTelephoneNumber == null)
                     destination.HomeTelephoneNumber = phone.Value;
@@ -567,9 +567,9 @@
 
             #region Title/FileAs
             if (!string.IsNullOrEmpty(master.Name.FullName))
-				slave.FileAs = master.Name.FullName.Replace("\r\n", "\n").Replace("\n","\r\n"); //Replace twice to not replace a \r\n by \r\r\n
+				slave.FileAs = master.Name.FullName.Replace("\r\n", "\n").Replace("\n","\r\n"); //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google
             else if (!string.IsNullOrEmpty(master.Title))
-                slave.FileAs = master.Title;
+                slave.FileAs = master.Title.Replace("\r\n", "\n").Replace("\n","\r\n"); //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google
             else if (master.Organizations.Count > 0 && !string.IsNullOrEmpty(master.Organizations[0].Name))
                 slave.FileAs = master.Organizations[0].Name;
             else if (master.Emails.Count > 0 && !string.IsNullOrEmpty(master.Emails[0].Address))

Modified: trunk/GoogleContactsSync/ContactsMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/ContactsMatcher.cs	2011-03-02 14:46:33 UTC (rev 86)
+++ trunk/GoogleContactsSync/ContactsMatcher.cs	2011-03-02 16:39:05 UTC (rev 87)
@@ -166,8 +166,9 @@
                     //1.1 try to match by FullName
                     //2. try to match by primary email
                     //3. try to match by mobile phone number, don't match by home or business bumbers, because several people may share the same home or business number
-                    if (!string.IsNullOrEmpty(olc.FileAs) && olc.FileAs.Equals(entry.Title, StringComparison.InvariantCultureIgnoreCase) ||
-                        !string.IsNullOrEmpty(olc.FullName) && olc.FullName.Equals(entry.Name.FullName, StringComparison.InvariantCultureIgnoreCase) ||                        
+                    if (!string.IsNullOrEmpty(olc.FileAs) && olc.FileAs.Equals(entry.Title.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||  //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google
+                        !string.IsNullOrEmpty(olc.FileAs) && olc.FileAs.Equals(entry.Name.FullName.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||
+                        !string.IsNullOrEmpty(olc.FullName) && olc.FullName.Equals(entry.Name.FullName.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||                        
                         !string.IsNullOrEmpty(olc.Email1Address) && entry.Emails.Count > 0 && olc.Email1Address.Equals(entry.Emails[0].Address) ||
                         //!string.IsNullOrEmpty(olc.Email2Address) && FindEmail(olc.Email2Address, entry.Emails) != null ||
                         //!string.IsNullOrEmpty(olc.Email3Address) && FindEmail(olc.Email3Address, entry.Emails) != null ||
@@ -288,8 +289,9 @@
                     foreach (ContactMatch duplicate in sync.GoogleContactDuplicates)
                     {
                         if (duplicate.AllGoogleContactMatches.Count > 0 &&
-                            (!string.IsNullOrEmpty(olc.FileAs) && olc.FileAs.Equals(duplicate.AllGoogleContactMatches[0].Title, StringComparison.InvariantCultureIgnoreCase) ||
-                             !string.IsNullOrEmpty(olc.FullName) && olc.FullName.Equals(duplicate.AllGoogleContactMatches[0].Name.FullName, StringComparison.InvariantCultureIgnoreCase) ||
+                            (!string.IsNullOrEmpty(olc.FileAs) && olc.FileAs.Equals(duplicate.AllGoogleContactMatches[0].Title.Replace("\r\n", "\n").Replace("\n","\r\n"), StringComparison.InvariantCultureIgnoreCase) ||  //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google
+                             !string.IsNullOrEmpty(olc.FileAs) && olc.FileAs.Equals(duplicate.AllGoogleContactMatches[0].Name.FullName.Replace("\r\n", "\n").Replace("\n","\r\n"), StringComparison.InvariantCultureIgnoreCase) ||
+                             !string.IsNullOrEmpty(olc.FullName) && olc.FullName.Equals(duplicate.AllGoogleContactMatches[0].Name.FullName.Replace("\r\n", "\n").Replace("\n","\r\n"), StringComparison.InvariantCultureIgnoreCase) ||
                              !string.IsNullOrEmpty(olc.Email1Address) && duplicate.AllGoogleContactMatches[0].Emails.Count > 0 && olc.Email1Address.Equals(duplicate.AllGoogleContactMatches[0].Emails[0].Address) ||
                              //!string.IsNullOrEmpty(olc.Email2Address) && FindEmail(olc.Email2Address, duplicate.AllGoogleContactMatches[0].Emails) != null ||
                              //!string.IsNullOrEmpty(olc.Email3Address) && FindEmail(olc.Email3Address, duplicate.AllGoogleContactMatches[0].Emails) != null ||


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

Revision: 91
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=91&view=rev
Author:   floriwan
Date:     2011-03-03 16:43:06 +0000 (Thu, 03 Mar 2011)

Log Message:
-----------
Fixed NullPointerExceptions when Title or FullName is null
Fixed Google UserDefinedProperty key NullPointerException

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactsMatcher.cs
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/ContactsMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/ContactsMatcher.cs	2011-03-03 10:49:04 UTC (rev 90)
+++ trunk/GoogleContactsSync/ContactsMatcher.cs	2011-03-03 16:43:06 UTC (rev 91)
@@ -166,9 +166,9 @@
                     //1.1 try to match by FullName
                     //2. try to match by primary email
                     //3. try to match by mobile phone number, don't match by home or business bumbers, because several people may share the same home or business number
-                    if (!string.IsNullOrEmpty(olc.FileAs) && olc.FileAs.Equals(entry.Title.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||  //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google
-                        !string.IsNullOrEmpty(olc.FileAs) && olc.FileAs.Equals(entry.Name.FullName.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||
-                        !string.IsNullOrEmpty(olc.FullName) && olc.FullName.Equals(entry.Name.FullName.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||                        
+                    if (!string.IsNullOrEmpty(olc.FileAs) && !string.IsNullOrEmpty(entry.Title) && olc.FileAs.Equals(entry.Title.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||  //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google
+                        !string.IsNullOrEmpty(olc.FileAs) && !string.IsNullOrEmpty(entry.Name.FullName) && olc.FileAs.Equals(entry.Name.FullName.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||
+                        !string.IsNullOrEmpty(olc.FullName) && !string.IsNullOrEmpty(entry.Name.FullName) && olc.FullName.Equals(entry.Name.FullName.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||                        
                         !string.IsNullOrEmpty(olc.Email1Address) && entry.Emails.Count > 0 && olc.Email1Address.Equals(entry.Emails[0].Address) ||
                         //!string.IsNullOrEmpty(olc.Email2Address) && FindEmail(olc.Email2Address, entry.Emails) != null ||
                         //!string.IsNullOrEmpty(olc.Email3Address) && FindEmail(olc.Email3Address, entry.Emails) != null ||
@@ -289,9 +289,9 @@
                     foreach (ContactMatch duplicate in sync.GoogleContactDuplicates)
                     {
                         if (duplicate.AllGoogleContactMatches.Count > 0 &&
-                            (!string.IsNullOrEmpty(olc.FileAs) && olc.FileAs.Equals(duplicate.AllGoogleContactMatches[0].Title.Replace("\r\n", "\n").Replace("\n","\r\n"), StringComparison.InvariantCultureIgnoreCase) ||  //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google
-                             !string.IsNullOrEmpty(olc.FileAs) && olc.FileAs.Equals(duplicate.AllGoogleContactMatches[0].Name.FullName.Replace("\r\n", "\n").Replace("\n","\r\n"), StringComparison.InvariantCultureIgnoreCase) ||
-                             !string.IsNullOrEmpty(olc.FullName) && olc.FullName.Equals(duplicate.AllGoogleContactMatches[0].Name.FullName.Replace("\r\n", "\n").Replace("\n","\r\n"), StringComparison.InvariantCultureIgnoreCase) ||
+                            (!string.IsNullOrEmpty(olc.FileAs) && !string.IsNullOrEmpty(duplicate.AllGoogleContactMatches[0].Title) && olc.FileAs.Equals(duplicate.AllGoogleContactMatches[0].Title.Replace("\r\n", "\n").Replace("\n","\r\n"), StringComparison.InvariantCultureIgnoreCase) ||  //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google
+                             !string.IsNullOrEmpty(olc.FileAs) && !string.IsNullOrEmpty(duplicate.AllGoogleContactMatches[0].Name.FullName) && olc.FileAs.Equals(duplicate.AllGoogleContactMatches[0].Name.FullName.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||
+                             !string.IsNullOrEmpty(olc.FullName) && !string.IsNullOrEmpty(duplicate.AllGoogleContactMatches[0].Name.FullName) && olc.FullName.Equals(duplicate.AllGoogleContactMatches[0].Name.FullName.Replace("\r\n", "\n").Replace("\n","\r\n"), StringComparison.InvariantCultureIgnoreCase) ||
                              !string.IsNullOrEmpty(olc.Email1Address) && duplicate.AllGoogleContactMatches[0].Emails.Count > 0 && olc.Email1Address.Equals(duplicate.AllGoogleContactMatches[0].Emails[0].Address) ||
                              //!string.IsNullOrEmpty(olc.Email2Address) && FindEmail(olc.Email2Address, duplicate.AllGoogleContactMatches[0].Emails) != null ||
                              //!string.IsNullOrEmpty(olc.Email3Address) && FindEmail(olc.Email3Address, duplicate.AllGoogleContactMatches[0].Emails) != null ||

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-03-03 10:49:04 UTC (rev 90)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-03-03 16:43:06 UTC (rev 91)
@@ -226,9 +226,11 @@
 				{
                     SetLastSyncText("Sync failed.");
                     notifyIcon.Text = Application.ProductName + "\nSync failed";
+
+                    string responseString = ex.ResponseString;
 					if (ex.InnerException is System.Net.WebException)
 					{
-						Logger.Log("Cannot connect to Google, please check if for available internet connection and proxy settings if applicable: "+((System.Net.WebException)ex.InnerException).Message, EventType.Warning);
+						Logger.Log("Cannot connect to Google, please check for available internet connection and proxy settings if applicable: "+((System.Net.WebException)ex.InnerException).Message + "\r\n" + responseString, EventType.Warning);
 					}
 					else
 					{

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-03-03 10:49:04 UTC (rev 90)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-03-03 16:43:06 UTC (rev 91)
@@ -363,8 +363,8 @@
 	
 			}
 			catch (System.Net.WebException ex)
-			{
-				string message = string.Format("Cannot connect to Google: {0}. \nPlease ensure you are connected to the internet. If you are behind a proxy, change your proxy configuration!", ex.Message);
+			{                               
+				string message = string.Format("Cannot connect to Google: {0}. \r\nPlease ensure you are connected to the internet. If you are behind a proxy, change your proxy configuration!", ex.Message);
 				Logger.Log(message, EventType.Error);
 			}
 		}
@@ -607,29 +607,30 @@
             match.OutlookContact.Save();
             ContactPropertiesUtils.SetGoogleOutlookContactId(SyncProfile, match.GoogleContact, match.OutlookContact);
 
-            Contact updatedEntry;
-            try
-            {
-                updatedEntry = _googleService.Update(match.GoogleContact);
-            }
-            catch (GDataRequestException tmpEx)
-            {
-                // check if it's the known HTCData problem, or if there is any invalid XML element or any unescaped XML sequence
-                if (tmpEx.ResponseString.Contains("HTCData") || tmpEx.ResponseString.Contains("&#39") || match.GoogleContact.Content.Contains("<"))
-                {
-                    bool wasDirty = match.GoogleContact.ContactEntry.Dirty;
-                    // XML escape the content
-                    match.GoogleContact.Content = EscapeXml(match.GoogleContact.Content);
-                    // set dirty to back, cause we don't want the changed content go back to Google without reason
-                    match.GoogleContact.ContactEntry.Content.Dirty = wasDirty;
-                    updatedEntry = _googleService.Update(match.GoogleContact);
+            Contact updatedEntry = SaveGoogleContact(match.GoogleContact);
+            //try
+            //{
+            //    updatedEntry = _googleService.Update(match.GoogleContact);
+            //}
+            //catch (GDataRequestException tmpEx)
+            //{
+            //    // check if it's the known HTCData problem, or if there is any invalid XML element or any unescaped XML sequence
+            //    //if (tmpEx.ResponseString.Contains("HTCData") || tmpEx.ResponseString.Contains("&#39") || match.GoogleContact.Content.Contains("<"))
+            //    //{
+            //    //    bool wasDirty = match.GoogleContact.ContactEntry.Dirty;
+            //    //    // XML escape the content
+            //    //    match.GoogleContact.Content = EscapeXml(match.GoogleContact.Content);
+            //    //    // set dirty to back, cause we don't want the changed content go back to Google without reason
+            //    //    match.GoogleContact.ContactEntry.Content.Dirty = wasDirty;
+            //    //    updatedEntry = _googleService.Update(match.GoogleContact);
                     
-                }
-                else if (!String.IsNullOrEmpty(tmpEx.ResponseString))
-                    throw new ApplicationException(tmpEx.ResponseString, tmpEx);
-                else
-                    throw;
-            }
+            //    //}
+            //    //else 
+            //    if (!String.IsNullOrEmpty(tmpEx.ResponseString))
+            //        throw new ApplicationException(tmpEx.ResponseString, tmpEx);
+            //    else
+            //        throw;
+            //}            
             match.GoogleContact = updatedEntry;
 
             ContactPropertiesUtils.SetOutlookGoogleContactId(this, match.OutlookContact, match.GoogleContact);
@@ -643,63 +644,8 @@
 		}
 		public void SaveGoogleContact(ContactMatch match)
 		{
-			//check if this contact was not yet inserted on google.
-			if (match.GoogleContact.ContactEntry.Id.Uri == null)
-			{
-				//insert contact.
-				Uri feedUri = new Uri(ContactsQuery.CreateContactsUri("default"));
-
-				try
-				{
-					ContactPropertiesUtils.SetGoogleOutlookContactId(SyncProfile, match.GoogleContact, match.OutlookContact);
-
-                    //ToDo: This will fail, if another account with the same email already exists
-					Contact createdEntry = _googleService.Insert(feedUri, match.GoogleContact);
-					match.GoogleContact = createdEntry;
-
-					ContactPropertiesUtils.SetOutlookGoogleContactId(this, match.OutlookContact, match.GoogleContact);
-					match.OutlookContact.Save();
-
-                    SaveGooglePhoto(match);
-				}
-				catch (Exception ex)
-				{
-                    string responseString = "";
-                    if (ex is GDataRequestException)
-                        responseString = EscapeXml(((GDataRequestException)ex).ResponseString);
-					string xml = GetContactXml(match.GoogleContact);
-                    string newEx = String.Format("Error saving NEW Google contact: {0}. \n{1}\n{2}", responseString, ex.Message, xml);
-					throw new ApplicationException(newEx, ex);
-				}
-			}
-			else
-			{
-				try
-				{
-					//contact already present in google. just update
-					ContactPropertiesUtils.SetGoogleOutlookContactId(SyncProfile, match.GoogleContact, match.OutlookContact);
-
-					//TODO: this will fail if original contact had an empty name or primary email address.
-					Contact updated = _googleService.Update(match.GoogleContact);                 
-					match.GoogleContact = updated;
-
-					ContactPropertiesUtils.SetOutlookGoogleContactId(this, match.OutlookContact, match.GoogleContact);
-					match.OutlookContact.Save();
-
-                    SaveGooglePhoto(match);
-				}
-				catch (Exception ex)
-				{
-                    string responseString = "";
-                    if (ex is GDataRequestException)
-                        responseString = EscapeXml(((GDataRequestException)ex).ResponseString);
-
-					//match.GoogleContact.Summary
-					string xml = GetContactXml(match.GoogleContact);
-					string newEx = String.Format("Error saving EXISTING Google contact: {0}. \n{1}\n{2}", responseString, ex.Message, xml);
-					throw new ApplicationException(newEx, ex);
-				}
-			}
+            SaveGoogleContact(match.GoogleContact);
+            SaveGooglePhoto(match);			
 		}
 
 		private string GetContactXml(Contact contact)
@@ -716,7 +662,7 @@
         /// Only save the google contact without photo update
         /// </summary>
         /// <param name="googleContact"></param>
-		public void SaveGoogleContact(Contact googleContact)
+		public Contact SaveGoogleContact(Contact googleContact)
 		{
 			//check if this contact was not yet inserted on google.
 			if (googleContact.ContactEntry.Id.Uri == null)
@@ -727,6 +673,7 @@
 				try
 				{
 					Contact createdEntry = _googleService.Insert(feedUri, googleContact);
+                    return createdEntry;
 				}
                 catch (Exception ex)
                 {
@@ -743,8 +690,23 @@
 				try
 				{
 					//contact already present in google. just update
-					//TODO: this will fail if original contact had an empty name or rpimary email address.
+					
+                    // User can create an empty label custom field on the web, but when I retrieve, and update, it throws this:
+                    // Data Request Error Response: [Line 12, Column 44, element gContact:userDefinedField] Missing attribute: &#39;key&#39;
+                    // Even though I didn't touch it.  So, I will search for empty keys, and give them a simple name.  Better than deleting...
+                    int fieldCount = 0;
+                    foreach (UserDefinedField userDefinedField in googleContact.ContactEntry.UserDefinedFields)
+                    {
+                        fieldCount++;
+                        if (String.IsNullOrEmpty(userDefinedField.Key))
+                        {
+                            userDefinedField.Key = "UserField" + fieldCount.ToString();
+                        }
+                    }
+
+                    //TODO: this will fail if original contact had an empty name or rpimary email address.
                     Contact updated = _googleService.Update(googleContact);
+                    return updated;
 				}
                 catch (Exception ex)
                 {
@@ -752,7 +714,7 @@
                     if (ex is GDataRequestException)
                         responseString = EscapeXml(((GDataRequestException)ex).ResponseString);
                     string xml = GetContactXml(googleContact);
-                    string newEx = String.Format("Error saving NEW Google contact: {0}. \n{1}\n{2}", responseString, ex.Message, xml);
+                    string newEx = String.Format("Error saving EXISTING Google contact: {0}. \n{1}\n{2}", responseString, ex.Message, xml);
                     throw new ApplicationException(newEx, ex);
                 }
 			}


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

Revision: 99
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=99&view=rev
Author:   floriwan
Date:     2011-03-07 13:02:46 +0000 (Mon, 07 Mar 2011)

Log Message:
-----------
Fix: Addresses didn't sync anymore, if entered on Google side (Google web interface doesn't use the structuredPostalAddress approach supported by Google Api v3.0)

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactSync.cs
    trunk/GoogleContactsSync/Properties/AssemblyInfo.cs

Modified: trunk/GoogleContactsSync/ContactSync.cs
===================================================================
--- trunk/GoogleContactsSync/ContactSync.cs	2011-03-05 16:26:19 UTC (rev 98)
+++ trunk/GoogleContactsSync/ContactSync.cs	2011-03-07 13:02:46 UTC (rev 99)
@@ -350,31 +350,46 @@
                 destination.HomeAddressPostalCode=address.Postcode;
                 destination.HomeAddressCountry=address.Country;
 
+                //Workaround because of Google bug: If a contact was created on GOOGLE side, it uses the unstructured approach
+                //Therefore we need to check, if the structure was filled, if yes it resulted in a formatted string in the Address summary field
+                //If not, the formatted string is null => overwrite it with the formmatedAddress from Google
+                if (string.IsNullOrEmpty(destination.HomeAddress))
+                    destination.HomeAddress = address.FormattedAddress;
+
 				if (address.Primary)
 					destination.SelectedMailingAddress = Microsoft.Office.Interop.Outlook.OlMailingAddress.olHome;
-				return;
 			}
-			if (address.Rel == ContactsRelationships.IsWork)
+			else if (address.Rel == ContactsRelationships.IsWork)
 			{
                 destination.BusinessAddressStreet = address.Street;
                 destination.BusinessAddressCity = address.City;
                 destination.BusinessAddressPostalCode = address.Postcode;
                 destination.BusinessAddressCountry = address.Country;
 
+                //Workaround because of Google bug: If a contact was created on GOOGLE side, it uses the unstructured approach
+                //Therefore we need to check, if the structure was filled, if yes it resulted in a formatted string in the Address summary field
+                //If not, the formatted string is null => overwrite it with the formmatedAddress from Google
+                if (string.IsNullOrEmpty(destination.BusinessAddress))
+                    destination.BusinessAddress = address.FormattedAddress;
+
 				if (address.Primary)
 					destination.SelectedMailingAddress = Microsoft.Office.Interop.Outlook.OlMailingAddress.olBusiness;
-				return;
 			}
-			if (address.Rel == ContactsRelationships.IsOther)
+			else if (address.Rel == ContactsRelationships.IsOther)
 			{
                 destination.OtherAddressStreet = address.Street;
                 destination.OtherAddressCity = address.City;
                 destination.OtherAddressPostalCode = address.Postcode;
                 destination.OtherAddressCountry = address.Country;
 
+                //Workaround because of Google bug: If a contact was created on GOOGLE side, it uses the unstructured approach
+                //Therefore we need to check, if the structure was filled, if yes it resulted in a formatted string in the Address summary field
+                //If not, the formatted string is null => overwrite it with the formmatedAddress from Google
+                if (string.IsNullOrEmpty(destination.OtherAddress))
+                    destination.OtherAddress = address.FormattedAddress;
+
 				if (address.Primary)
 					destination.SelectedMailingAddress = Microsoft.Office.Interop.Outlook.OlMailingAddress.olOther;
-				return;
 			}
 		}
 

Modified: trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
===================================================================
--- trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-03-05 16:26:19 UTC (rev 98)
+++ trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-03-07 13:02:46 UTC (rev 99)
@@ -31,6 +31,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.2.1.*")]
-[assembly: AssemblyFileVersion("3.2.1")]
+[assembly: AssemblyVersion("3.2.2.*")]
+[assembly: AssemblyFileVersion("3.2.2")]
 [assembly: NeutralResourcesLanguageAttribute("en-GB")]


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

Revision: 101
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=101&view=rev
Author:   floriwan
Date:     2011-03-08 08:35:41 +0000 (Tue, 08 Mar 2011)

Log Message:
-----------
Fix: Fixed some minor issues regarding the unique properties matching

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactSync.cs
    trunk/GoogleContactsSync/ContactsMatcher.cs

Modified: trunk/GoogleContactsSync/ContactSync.cs
===================================================================
--- trunk/GoogleContactsSync/ContactSync.cs	2011-03-07 21:26:43 UTC (rev 100)
+++ trunk/GoogleContactsSync/ContactSync.cs	2011-03-08 08:35:41 UTC (rev 101)
@@ -12,7 +12,7 @@
     
 	internal static class ContactSync
 	{
-        private static DateTime outlookDateNone = new DateTime(4501, 1, 1);
+        internal static DateTime outlookDateNone = new DateTime(4501, 1, 1);
         private const string relSpouse = "spouse";
         private const string relChild = "child";
         private const string relManager = "manager";
@@ -436,6 +436,7 @@
             Name name = new Name();            
             name.NamePrefix = master.Title;
             name.GivenName = master.FirstName;
+            //TODO: Currently Google always sets an empty string for the MiddleName (bug of GoogleAPI, we must wait for a fix)
             name.AdditonalName = master.MiddleName;
             name.FamilyName = master.LastName;
             name.NameSuffix = master.Suffix;
@@ -588,12 +589,14 @@
             #endregion Title/FileAs
 
             #region Name
-            //slave.FullName = master.Name.FullName; //The Outlook fullName is automatically set, so don't assign it from Google
             slave.Title = master.Name.NamePrefix;
             slave.FirstName = master.Name.GivenName;
+            //TODO: Currently Google always returns an empty string for the MiddleName (bug of GoogleAPI, we must wait for a fix)
             slave.MiddleName = master.Name.AdditonalName;
             slave.LastName = master.Name.FamilyName;
             slave.Suffix = master.Name.NameSuffix;
+            if (string.IsNullOrEmpty(slave.FullName)) //The Outlook fullName is automatically set, so don't assign it from Google, unless the structured properties were empty
+                slave.FullName = master.Name.FullName;
             #endregion Name
 
             #region birthday

Modified: trunk/GoogleContactsSync/ContactsMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/ContactsMatcher.cs	2011-03-07 21:26:43 UTC (rev 100)
+++ trunk/GoogleContactsSync/ContactsMatcher.cs	2011-03-08 08:35:41 UTC (rev 101)
@@ -365,24 +365,19 @@
                     if (match.AllGoogleContactMatches.Count > 1)
                     {
                         sync.GoogleContactDuplicates.Add(match);
-                    }
-
-                    foreach (Contact entry in match.AllGoogleContactMatches)
-                    {
-                        //Remove matched google contacts from list to not match it twice
-                        sync.GoogleContacts.Remove(entry);
-
-                        if (match.AllGoogleContactMatches.Count > 1)
-                        {//Create message for duplicatesFound exception
+                        foreach (Contact entry in match.AllGoogleContactMatches)
+                        {
+                            //Create message for duplicatesFound exception
                             if (string.IsNullOrEmpty(duplicateGoogleMatches))
                                 duplicateGoogleMatches = "Outlook contacts matching with multiple Google contacts have been found (either same email, Mobile or FullName) and cannot be synchronized. Please delete or resolve duplicates of:";
 
                             string str = entry.Name.FullName + " (" + olc.Email1Address + ", " + olc.MobileTelephoneNumber + ")";
                             if (!duplicateGoogleMatches.Contains(str))
-                                duplicateGoogleMatches += Environment.NewLine + str;
+                                duplicateGoogleMatches += Environment.NewLine + str;                            
                         }
-
                     }
+
+                   
                                         
                 }                
 


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

Revision: 113
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=113&view=rev
Author:   floriwan
Date:     2011-03-18 08:56:50 +0000 (Fri, 18 Mar 2011)

Log Message:
-----------
Improvement: Replaced Office version 12 (2007) by Office version 14 (2010), but it has been tested and works also with Office 2003 and 2007

Modified Paths:
--------------
    trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
    trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj

Modified: trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
===================================================================
--- trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-03-17 23:31:05 UTC (rev 112)
+++ trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-03-18 08:56:50 UTC (rev 113)
@@ -31,6 +31,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.0.*")]
-[assembly: AssemblyFileVersion("3.3.0")]
+[assembly: AssemblyVersion("3.3.1.*")]
+[assembly: AssemblyFileVersion("3.3.1")]
 [assembly: NeutralResourcesLanguageAttribute("en-GB")]

Modified: trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj
===================================================================
--- trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2011-03-17 23:31:05 UTC (rev 112)
+++ trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2011-03-18 08:56:50 UTC (rev 113)
@@ -39,12 +39,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_7EB6A87495628874292F8FC8D841A68F"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -75,26 +69,38 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
-        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
+        "MsmKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
+        "OwnerKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
+        "MsmKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
+        "OwnerKey" = "8:_A731D03419354BA394288751812F5F97"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_A731D03419354BA394288751812F5F97"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
-        "OwnerKey" = "8:_7EB6A87495628874292F8FC8D841A68F"
+        "MsmKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "OwnerKey" = "8:_A731D03419354BA394288751812F5F97"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -112,7 +118,7 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_7EB6A87495628874292F8FC8D841A68F"
+        "OwnerKey" = "8:_A731D03419354BA394288751812F5F97"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -124,6 +130,12 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -179,7 +191,7 @@
         "DisplayName" = "8:Release"
         "IsDebugOnly" = "11:FALSE"
         "IsReleaseOnly" = "11:TRUE"
-        "OutputFilename" = "8:Release\\GOContactSyncSetup_v3.2.msi"
+        "OutputFilename" = "8:Release\\GOContactSyncSetup_v3.3.1.msi"
         "PackageFilesAs" = "3:2"
         "PackageFileSize" = "3:-2147483648"
         "CabType" = "3:1"
@@ -320,20 +332,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7EB6A87495628874292F8FC8D841A68F"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_91E364B39302FB8247F82D5FA41F951E"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Microsoft.Office.Interop.Outlook, Version=11.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Client, Version=1.7.0.1, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_7EB6A87495628874292F8FC8D841A68F"
+                    "_91E364B39302FB8247F82D5FA41F951E"
                     {
-                    "Name" = "8:Microsoft.Office.Interop.Outlook.dll"
+                    "Name" = "8:Google.GData.Client.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Microsoft.Office.Interop.Outlook.dll"
+            "SourcePath" = "8:Google.GData.Client.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -351,20 +363,40 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_91E364B39302FB8247F82D5FA41F951E"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A131A9765CDF4FB18FC170D9BCFC2F20"
             {
+            "SourcePath" = "8:install-banner.jpg"
+            "TargetName" = "8:install-banner.jpg"
+            "Tag" = "8:"
+            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A2D96859CE406F76F4F0818B2813AE72"
+            {
             "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Client, Version=1.7.0.1, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL"
+            "AssemblyIsInGAC" = "11:TRUE"
+            "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
                 "ScatterAssemblies"
                 {
-                    "_91E364B39302FB8247F82D5FA41F951E"
+                    "_A2D96859CE406F76F4F0818B2813AE72"
                     {
-                    "Name" = "8:Google.GData.Client.dll"
+                    "Name" = "8:stdole.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Google.GData.Client.dll"
+            "SourcePath" = "8:stdole.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -382,10 +414,21 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A131A9765CDF4FB18FC170D9BCFC2F20"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A731D03419354BA394288751812F5F97"
             {
-            "SourcePath" = "8:install-banner.jpg"
-            "TargetName" = "8:install-banner.jpg"
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Microsoft.Office.Interop.Outlook, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_A731D03419354BA394288751812F5F97"
+                    {
+                    "Name" = "8:Microsoft.Office.Interop.Outlook.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:..\\OutlookAPI\\Microsoft.Office.Interop.Outlook.dll"
+            "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
             "Condition" = "8:"
@@ -398,7 +441,7 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:TRUE"
+            "Exclude" = "11:FALSE"
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
@@ -437,16 +480,16 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:office, Version=11.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c"
+            "AssemblyAsmDisplayName" = "8:office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                     "_E695CBDD605E1061614DA23AB6EED043"
                     {
-                    "Name" = "8:Office.dll"
+                    "Name" = "8:office.DLL"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Office.dll"
+            "SourcePath" = "8:office.DLL"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -552,7 +595,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:GO Contact Sync Mod"
         "ProductCode" = "8:{60935927-2D24-4753-9902-296986141733}"
-        "PackageCode" = "8:{8DBC1D2C-DC11-4274-BDD4-4E8D6FA3F232}"
+        "PackageCode" = "8:{20810E04-D8F6-4C41-9D54-B03B20532802}"
         "UpgradeCode" = "8:{170B4620-F5BB-4D2E-97A1-239D79030F20}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"


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

Revision: 117
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=117&view=rev
Author:   floriwan
Date:     2011-03-19 07:10:49 +0000 (Sat, 19 Mar 2011)

Log Message:
-----------
Fix: added SkippedCountNotMatches to also track accounts, that have not been added to the Matches because of Outlook access problems and handle them accordingly (don't delete them from Outlook, e.g. if also found on google side)

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactsMatcher.cs
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/ContactsMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/ContactsMatcher.cs	2011-03-18 13:43:34 UTC (rev 116)
+++ trunk/GoogleContactsSync/ContactsMatcher.cs	2011-03-19 07:10:49 UTC (rev 117)
@@ -35,6 +35,8 @@
             sync.GoogleContactDuplicates = new Collection<ContactMatch>();
             sync.OutlookContactDuplicates = new Collection<ContactMatch>();
 
+            List<string> skippedOutlookIds = new List<string>();
+
 			//for each outlook contact try to get google contact id from user properties
 			//if no match - try to match by properties
 			//if no match - create a new match pair without google contact. 
@@ -50,13 +52,17 @@
 					olc = sync.OutlookContacts[i] as Outlook.ContactItem;
                     if (olc == null)
                     {
-                        //Logger.Log("Empty Outlook contact found", EventType.Warning);
+                        Logger.Log("Empty Outlook contact found (maybe distribution list). Skipping", EventType.Warning);
+                        sync.SkippedCount++;
+                        sync.SkippedCountNotMatches++;
                         continue;
                     }
 				}
 				catch
 				{
 					//this is needed because some contacts throw exceptions
+                    sync.SkippedCount++;
+                    sync.SkippedCountNotMatches++;
 					continue;
 				}
 
@@ -68,36 +74,45 @@
 				}
 				catch
 				{
-					string message;
+					string message = "Can't access contact details for outlook contact. Skipping";
 					try
 					{
-						message = string.Format("Can't access contact details for outlook contact {0}.", olc.FileAs);
+						message = string.Format("{0} {1}.", message, olc.FileAs);
+                        //remember skippedOutlookIds to later not delete them if found on Google side
+                        skippedOutlookIds.Add(olc.EntryID);
+                                                
 					}
 					catch
 					{
-						message = null;
+                        //e.g. if olc.FileAs also fails, ignore, because messge already set
+						//message = null;
 					}
 
-					if (olc != null && message != null) // it's useless to say "we couldn't access some contacts properties
-					{
-						Logger.Log(message, EventType.Warning);
-					}
-
-					continue;
+                    //if (olc != null && message != null) // it's useless to say "we couldn't access some contacts properties
+                    //{
+                    Logger.Log(message, EventType.Warning);
+                    //}
+                    sync.SkippedCount++;
+                    sync.SkippedCountNotMatches++;
+                    continue;                                        
 				}
 
                 if (!IsContactValid(olc))
 				{
 					Logger.Log(string.Format("Invalid outlook contact ({0}). Skipping", olc.FileAs), EventType.Warning);
+                    skippedOutlookIds.Add(olc.EntryID);
                     sync.SkippedCount++;
+                    sync.SkippedCountNotMatches++;
 					continue;
 				}
 
 				if (olc.Body != null && olc.Body.Length > 62000)
 				{
-					// notes field too large
+					// notes field too large                    
+					Logger.Log(string.Format("Skipping outlook contact ({0}). Reduce the notes field to a maximum of 62.000 characters.", olc.FileAs), EventType.Warning);
+                    skippedOutlookIds.Add(olc.EntryID);
                     sync.SkippedCount++;
-					Logger.Log(string.Format("Skipping outlook contact ({0}). Reduce the notes field to a maximum of 62.000 characters.", olc.FileAs), EventType.Warning);
+                    sync.SkippedCountNotMatches++;
                     continue;
 				}                               
 
@@ -408,17 +423,24 @@
                         break;
                     }
                 }
-				if (entry.Emails.Count != 0 || mobileExists || !string.IsNullOrEmpty(entry.Title))
-				{                       
-					ContactMatch match = new ContactMatch(null, entry); ;
-					result.Add(match);
-				}
-				else
-				{
-					// no telephone and email
+
+                string googleOutlookId = ContactPropertiesUtils.GetGoogleOutlookContactId(sync.SyncProfile, entry);
+                if (!String.IsNullOrEmpty(googleOutlookId) && skippedOutlookIds.Contains(googleOutlookId))
+                {
+                    Logger.Log("Skipped GoogleContact because Outlook contact couldn't be matched beacause of previous problem (see log): " + entry.Title, EventType.Warning);
+                }
+                else if (entry.Emails.Count == 0 && !mobileExists && string.IsNullOrEmpty(entry.Title))
+				{       
+                    // no telephone and email
                     sync.SkippedCount++;
+                    sync.SkippedCountNotMatches++;
                     Logger.Log("Skipped GoogleContact because no unique property found (Email1 or mobile or name):" + entry.Title, EventType.Warning);
-				}
+                }
+                else
+                {
+					ContactMatch match = new ContactMatch(null, entry);
+					result.Add(match);
+				}				
 			}
 			return result;
 		}

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-03-18 13:43:34 UTC (rev 116)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-03-19 07:10:49 UTC (rev 117)
@@ -211,7 +211,7 @@
 						    notifyIcon.BalloonTipIcon = ToolTipIcon.Info;
 						notifyIcon.ShowBalloonTip(5000);
 					}
-                    string toolTip = string.Format("{0}\nLast sync completed: {1}", Application.ProductName, DateTime.Now);
+                    string toolTip = string.Format("{0}\nLast sync: {1}", Application.ProductName, DateTime.Now.ToString("dd.MM. HH:mm"));
                     if (_sync.ErrorCount + _sync.SkippedCount > 0)
                         toolTip += string.Format("\nWarnings: {0}.", _sync.ErrorCount + _sync.SkippedCount);
                     if (toolTip.Length >= 64)

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-03-18 13:43:34 UTC (rev 116)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-03-19 07:10:49 UTC (rev 117)
@@ -54,7 +54,14 @@
             get { return _skippedCount; }
         }
 
+        private int _skippedCountNotMatches;
+        public int SkippedCountNotMatches
+        {
+            set { _skippedCountNotMatches = value; }
+            get { return _skippedCountNotMatches; }
+        }
 
+
 		public delegate void NotificationHandler(string title, string message, EventType eventType);
 		public delegate void ErrorNotificationHandler(string title, Exception ex, EventType eventType);
 		public event NotificationHandler DuplicatesFound;
@@ -471,6 +478,7 @@
 				_deletedCount = 0;
                 _errorCount = 0;
                 _skippedCount = 0;
+                _skippedCountNotMatches = 0;
 
 				Load();
 
@@ -481,7 +489,7 @@
 				if (_matches == null)
 					return;
 
-                _totalCount = _matches.Count;
+                _totalCount = _matches.Count + _skippedCountNotMatches;
 
                 //Remove Google duplicates from matches to be synced
                 if (_googleContactDuplicates != null)


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

Revision: 129
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=129&view=rev
Author:   floriwan
Date:     2011-03-23 20:39:28 +0000 (Wed, 23 Mar 2011)

Log Message:
-----------
Fix: Improved error handling
Fix: Continue sync timer, after an error occurred
Fix: Reset sync timer to full time intervall after an error occurred and was confirmed

Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-03-23 06:27:04 UTC (rev 128)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-03-23 20:39:28 UTC (rev 129)
@@ -185,63 +185,60 @@
 				//SetSyncConsoleText(Logger.GetText());
 				_sync.SyncProfile = tbSyncProfile.Text;
 				_sync.SyncOption = _syncOption;
-                
-				try
-				{
-					_sync.LoginToGoogle(UserName.Text, Password.Text);
-					_sync.LoginToOutlook();
+
+                try
+                {
+                    _sync.LoginToGoogle(UserName.Text, Password.Text);
+                    _sync.LoginToOutlook();
+
+                    _sync.Sync();
                     
-					_sync.Sync();
-
                     lastSync = DateTime.Now;
-					SetLastSyncText("Last synced at " + lastSync.ToString());
+                    SetLastSyncText("Last synced at " + lastSync.ToString());
 
                     string message = string.Format("Sync complete.\r\n Synced:  {1} out of {0}.\r\n Deleted:  {2}.\r\n Skipped: {3}.\r\n Errors:    {4}.", _sync.TotalCount, _sync.SyncedCount, _sync.DeletedCount, _sync.SkippedCount, _sync.ErrorCount);
                     Logger.Log(message, EventType.Information);
                     if (reportSyncResultCheckBox.Checked)
-					{
+                    {
                         notifyIcon.BalloonTipTitle = Application.ProductName;
                         notifyIcon.BalloonTipText = string.Format("{0}. {1}", DateTime.Now, message);
-                        
+
                         if (_sync.ErrorCount > 0)
                             notifyIcon.BalloonTipIcon = ToolTipIcon.Error;
                         else if (_sync.SkippedCount > 0)
                             notifyIcon.BalloonTipIcon = ToolTipIcon.Warning;
                         else
-						    notifyIcon.BalloonTipIcon = ToolTipIcon.Info;
-						notifyIcon.ShowBalloonTip(5000);
-					}
+                            notifyIcon.BalloonTipIcon = ToolTipIcon.Info;
+                        notifyIcon.ShowBalloonTip(5000);
+                    }
                     string toolTip = string.Format("{0}\nLast sync: {1}", Application.ProductName, DateTime.Now.ToString("dd.MM. HH:mm"));
                     if (_sync.ErrorCount + _sync.SkippedCount > 0)
                         toolTip += string.Format("\nWarnings: {0}.", _sync.ErrorCount + _sync.SkippedCount);
                     if (toolTip.Length >= 64)
                         toolTip = toolTip.Substring(0, 63);
                     notifyIcon.Text = toolTip;
-                    
-                    TimerSwitch(true);
-				}
-				catch (Google.GData.Client.GDataRequestException ex)
-				{
+                }
+                catch (Google.GData.Client.GDataRequestException ex)
+                {
                     SetLastSyncText("Sync failed.");
                     notifyIcon.Text = Application.ProductName + "\nSync failed";
 
                     string responseString = ex.ResponseString;
-					if (ex.InnerException is System.Net.WebException)
-					{
-						Logger.Log("Cannot connect to Google, please check for available internet connection and proxy settings if applicable: "+((System.Net.WebException)ex.InnerException).Message + "\r\n" + responseString, EventType.Warning);
-					}
-					else
-					{
-						ErrorHandler.Handle(ex);
-					}
-				}
-				catch (Exception ex)
-				{
+                    if (ex.InnerException is System.Net.WebException)
+                    {
+                        Logger.Log("Cannot connect to Google, please check for available internet connection and proxy settings if applicable: " + ((System.Net.WebException)ex.InnerException).Message + "\r\n" + responseString, EventType.Warning);
+                    }
+                    else
+                    {
+                        ErrorHandler.Handle(ex);
+                    }
+                }
+                catch (Exception ex)
+                {
                     SetLastSyncText("Sync failed.");
                     notifyIcon.Text = Application.ProductName + "\nSync failed";
-					ErrorHandler.Handle(ex);
-				}
-				
+                    ErrorHandler.Handle(ex);
+                }				
 
 			}
 			catch (Exception ex)
@@ -250,6 +247,8 @@
 			}
 			finally
 			{
+                lastSync = DateTime.Now;
+                TimerSwitch(true);
 				SetFormEnabled(true);
 			}
 		}
@@ -354,9 +353,9 @@
 					}
 				}
 				else
-				{
+				{                    
 					autoSyncInterval.Enabled = value;
-					syncTimer.Enabled = value;
+                    syncTimer.Enabled = value;
 					nextSyncLabel.Visible = value;
 				}
 			}
@@ -443,6 +442,7 @@
 
 		private void autoSyncCheckBox_CheckedChanged(object sender, EventArgs e)
 		{
+            lastSync = DateTime.Now.AddSeconds(15) - new TimeSpan(0, (int)autoSyncInterval.Value, 0);
 			autoSyncInterval.Enabled = autoSyncCheckBox.Checked;
 			syncTimer.Enabled = autoSyncCheckBox.Checked;
 			nextSyncLabel.Visible = autoSyncCheckBox.Checked;
@@ -504,15 +504,18 @@
 
                 lastSync = DateTime.Now;
                 SetLastSyncText("Matches reset at " + lastSync.ToString());
-                Logger.Log("Matches reset.", EventType.Information);
-                TimerSwitch(true);
+                Logger.Log("Matches reset.", EventType.Information);                
 			}
 			catch (Exception ex)
-			{
+            {
+                SetLastSyncText("Reset Matches failed");
+                Logger.Log("Reset Matches failed", EventType.Error);
 				ErrorHandler.Handle(ex);
 			}
 			finally
 			{
+                lastSync = DateTime.Now;
+                TimerSwitch(true);
 				SetFormEnabled(true);
                 this.hideButton.Enabled = true;
 			}

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-03-23 06:27:04 UTC (rev 128)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-03-23 20:39:28 UTC (rev 129)
@@ -388,6 +388,7 @@
 
 		public void LoadGoogleContacts()
 		{
+            string message = "Error Loading Google Contacts. Cannot connect to Google: {0}. \r\nPlease ensure you are connected to the internet. If you are behind a proxy, change your proxy configuration!";
 			try
 			{
 
@@ -423,12 +424,18 @@
 			}
 			catch (System.Net.WebException ex)
 			{                               
-				string message = string.Format("Cannot connect to Google: {0}. \r\nPlease ensure you are connected to the internet. If you are behind a proxy, change your proxy configuration!", ex.Message);
-				Logger.Log(message, EventType.Error);
+				//Logger.Log(message, EventType.Error);
+                throw new NotSupportedException(string.Format(message, ex.Message), ex);
 			}
+            catch (System.NullReferenceException ex)
+            {                
+                //Logger.Log(message, EventType.Error);
+                throw new NotSupportedException(string.Format(message, ex.Message), ex);
+            }
 		}
 		public void LoadGoogleGroups()
 		{
+            string message = "Error Loading Google Groups. Cannot connect to Google: {0}. \r\nPlease ensure you are connected to the internet. If you are behind a proxy, change your proxy configuration!";
             try
             {
                 Logger.Log("Loading Google Groups...", EventType.Information);
@@ -439,7 +446,7 @@
 
                 _googleGroups = new Collection<Group>();
 
-                Feed<Group> feed = _googleService.Get<Group>(query);
+                Feed<Group> feed = _googleService.Get<Group>(query);               
 
                 while (feed != null)
                 {
@@ -457,10 +464,15 @@
                 //    _googleService.Delete(_googleGroups[i-1]);
             }            
 			catch (System.Net.WebException ex)
-			{                               
-				string message = string.Format("Cannot connect to Google: {0}. \r\nPlease ensure you are connected to the internet. If you are behind a proxy, change your proxy configuration!", ex.Message);
-				Logger.Log(message, EventType.Error);
+			{                               				
+				//Logger.Log(message, EventType.Error);
+                throw new NotSupportedException(string.Format(message, ex.Message), ex);
 			}
+            catch (System.NullReferenceException ex)
+            {
+                //Logger.Log(message, EventType.Error);
+                throw new NotSupportedException(string.Format(message, ex.Message), ex);
+            }
 
 		}
 


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

Revision: 130
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=130&view=rev
Author:   big-r
Date:     2011-03-24 15:58:59 +0000 (Thu, 24 Mar 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/GoogleContactsSync/ILogger.cs
    trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj

Modified: trunk/GoogleContactsSync/ILogger.cs
===================================================================
--- trunk/GoogleContactsSync/ILogger.cs	2011-03-23 20:39:28 UTC (rev 129)
+++ trunk/GoogleContactsSync/ILogger.cs	2011-03-24 15:58:59 UTC (rev 130)
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.IO;
 
 namespace GoContactSyncMod
 {
@@ -28,7 +29,8 @@
 		public static List<LogEntry> messages = new List<LogEntry>();
 		public delegate void LogUpdatedHandler(string Message);
 		public static event LogUpdatedHandler LogUpdated;
-        
+        private static StreamWriter logwriter;
+    
         private static string formatMessage(string message, EventType eventType)
         {
             return String.Format("{0}:{1}{2}", eventType, Environment.NewLine, message);
@@ -41,8 +43,16 @@
 
 		public static void Log(string message, EventType eventType)
         {
+            
             LogEntry new_logEntry = new LogEntry(DateTime.Now, eventType, message);
             messages.Add(new_logEntry);
+            using (logwriter = new StreamWriter(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)+"\\GoContactSyncMOD\\log.txt", true))
+            {
+                logwriter.Write(GetLogLine(new_logEntry));
+                //logwriter.Write(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData));
+                logwriter.Flush();
+                logwriter.Close();
+            }
             if (LogUpdated != null)
                 LogUpdated(GetLogLine(new_logEntry));
         }
@@ -72,4 +82,4 @@
         }
         */
     }
-}
+}
\ No newline at end of file

Modified: trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj
===================================================================
--- trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2011-03-23 20:39:28 UTC (rev 129)
+++ trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2011-03-24 15:58:59 UTC (rev 130)
@@ -27,20 +27,20 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_17C96A08C0C04AB99C55461B72206B9C"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_084162EBBDB9A67BC79C1B76E14DE8AB"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_449A09D626FD4A6C9AEE1F387A23D13C"
+        "MsmKey" = "8:_17C96A08C0C04AB99C55461B72206B9C"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "MsmKey" = "8:_449A09D626FD4A6C9AEE1F387A23D13C"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -51,32 +51,32 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
+        "MsmKey" = "8:_8E6A08BB36333FBE57EC036538692E85"
         "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
-        "OwnerKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
+        "MsmKey" = "8:_8E6A08BB36333FBE57EC036538692E85"
+        "OwnerKey" = "8:_E7C0F54CE3CCDB6B105B2A506EBDA764"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
-        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
+        "MsmKey" = "8:_8E6A08BB36333FBE57EC036538692E85"
+        "OwnerKey" = "8:_084162EBBDB9A67BC79C1B76E14DE8AB"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
+        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
-        "OwnerKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
+        "MsmKey" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -87,20 +87,20 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
-        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
+        "MsmKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
+        "OwnerKey" = "8:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "MsmKey" = "8:_E7C0F54CE3CCDB6B105B2A506EBDA764"
+        "OwnerKey" = "8:_084162EBBDB9A67BC79C1B76E14DE8AB"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
-        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
+        "MsmKey" = "8:_E7C0F54CE3CCDB6B105B2A506EBDA764"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -118,37 +118,37 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
+        "OwnerKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
+        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
+        "OwnerKey" = "8:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
+        "OwnerKey" = "8:_084162EBBDB9A67BC79C1B76E14DE8AB"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
+        "OwnerKey" = "8:_E7C0F54CE3CCDB6B105B2A506EBDA764"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
+        "OwnerKey" = "8:_8E6A08BB36333FBE57EC036538692E85"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -292,6 +292,37 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_084162EBBDB9A67BC79C1B76E14DE8AB"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Contacts, Version=1.7.0.14479, Culture=neutral, PublicKeyToken=7e065189dd4b982f, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_084162EBBDB9A67BC79C1B76E14DE8AB"
+                    {
+                    "Name" = "8:Google.GData.Contacts.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Google.GData.Contacts.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_17C96A08C0C04AB99C55461B72206B9C"
             {
             "SourcePath" = "8:..\\GoogleContactsSync\\GO Contact Sync Homepage.url"
@@ -332,20 +363,20 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6EC35BE8EF1AAED05EABD0848EEEB700"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8E6A08BB36333FBE57EC036538692E85"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Contacts, Version=1.7.0.14479, Culture=neutral, PublicKeyToken=7e065189dd4b982f, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Client, Version=1.7.0.14478, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_6EC35BE8EF1AAED05EABD0848EEEB700"
+                    "_8E6A08BB36333FBE57EC036538692E85"
                     {
-                    "Name" = "8:Google.GData.Contacts.dll"
+                    "Name" = "8:Google.GData.Client.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Google.GData.Contacts.dll"
+            "SourcePath" = "8:Google.GData.Client.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -363,20 +394,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_91E364B39302FB8247F82D5FA41F951E"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
             {
             "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Client, Version=1.7.0.14478, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL"
+            "AssemblyIsInGAC" = "11:TRUE"
+            "AssemblyAsmDisplayName" = "8:office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_91E364B39302FB8247F82D5FA41F951E"
+                    "_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
                     {
-                    "Name" = "8:Google.GData.Client.dll"
+                    "Name" = "8:office.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Google.GData.Client.dll"
+            "SourcePath" = "8:office.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -445,14 +476,14 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E4E9E9D12EE20858632E2D09D30DCA43"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E7C0F54CE3CCDB6B105B2A506EBDA764"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
             "AssemblyAsmDisplayName" = "8:Google.GData.Extensions, Version=1.7.0.14479, Culture=neutral, PublicKeyToken=0b4c5df2ebf20876, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_E4E9E9D12EE20858632E2D09D30DCA43"
+                    "_E7C0F54CE3CCDB6B105B2A506EBDA764"
                     {
                     "Name" = "8:Google.GData.Extensions.dll"
                     "Attributes" = "3:512"
@@ -476,37 +507,6 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E695CBDD605E1061614DA23AB6EED043"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_E695CBDD605E1061614DA23AB6EED043"
-                    {
-                    "Name" = "8:office.DLL"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:office.DLL"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EEF5B1E061E94324A394BC6D6E07F65D"
             {
             "SourcePath" = "8:..\\GoogleContactsSync\\COPYING.rtf"
@@ -533,6 +533,28 @@
         }
         "Folder"
         {
+            "{1525181F-901A-416C-8A58-119130FE478E}:_0B8795A866FF4B8C9AE19672531945A6"
+            {
+            "Name" = "8:#1915"
+            "AlwaysCreate" = "11:TRUE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:AppDataFolder"
+                "Folders"
+                {
+                    "{9EF0B969-E518-4E46-987F-47570745A589}:_1BCDE4E294E34A93AD17374B6FF557D8"
+                    {
+                    "Name" = "8:GoContactSyncMOD"
+                    "AlwaysCreate" = "11:TRUE"
+                    "Condition" = "8:"
+                    "Transitive" = "11:FALSE"
+                    "Property" = "8:_2A34F95EFE744F7C8EDC39698B808448"
+                        "Folders"
+                        {
+                        }
+                    }
+                }
+            }
             "{3C67513D-01DD-4637-8A68-80971EB9504F}:_5F08081D58314698A5EF7B2D88DBA295"
             {
             "DefaultLocation" = "8:[ProgramFilesFolder]WebGear\\GO Contact Sync"
@@ -595,7 +617,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:GO Contact Sync Mod"
         "ProductCode" = "8:{60935927-2D24-4753-9902-296986141733}"
-        "PackageCode" = "8:{F3D37FF4-C5E0-4863-9A70-3B9B185E373C}"
+        "PackageCode" = "8:{CCB81454-0E81-4F2A-BAA1-6BAA251F452D}"
         "UpgradeCode" = "8:{170B4620-F5BB-4D2E-97A1-239D79030F20}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
@@ -756,7 +778,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_798D502AD8A84A668FE47568EA35FD15"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Progress"
+                    "DisplayName" = "8:Status"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"
@@ -801,7 +823,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_6446AF9ADE87475A86215903A9A029F2"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Welcome"
+                    "DisplayName" = "8:Willkommen"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"
@@ -850,7 +872,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_7B6D831D957541DFBD9CB979ACA9DA14"
                     {
                     "Sequence" = "3:300"
-                    "DisplayName" = "8:Confirm Installation"
+                    "DisplayName" = "8:Installation bestätigen"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"
@@ -873,7 +895,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8CF1DBE8409F4314B79DA786912F31BF"
                     {
                     "Sequence" = "3:220"
-                    "DisplayName" = "8:Installation Folder"
+                    "DisplayName" = "8:Installationsordner"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"
@@ -896,7 +918,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_DA74DE1924F44B7DBDA74B9BC54FBB22"
                     {
                     "Sequence" = "3:210"
-                    "DisplayName" = "8:License Agreement"
+                    "DisplayName" = "8:Lizenzvertrag"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminLicenseDlg.wid"
@@ -953,7 +975,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C735890B3EDF492481BA4710353C03E6"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Finished"
+                    "DisplayName" = "8:Fertig"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFinishedDlg.wid"
@@ -985,7 +1007,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_57BF2CE534C546019D28C01BDF7C1D53"
                     {
                     "Sequence" = "3:110"
-                    "DisplayName" = "8:License Agreement"
+                    "DisplayName" = "8:Lizenzvertrag"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdLicenseDlg.wid"
@@ -1033,7 +1055,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_AFB55B0E17484458BA2BD5FA0765BF76"
                     {
                     "Sequence" = "3:200"
-                    "DisplayName" = "8:Installation Folder"
+                    "DisplayName" = "8:Installationsordner"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"
@@ -1069,7 +1091,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BB2923AE8C5D4CC78A3214E91705C560"
                     {
                     "Sequence" = "3:300"
-                    "DisplayName" = "8:Confirm Installation"
+                    "DisplayName" = "8:Installation bestätigen"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"
@@ -1092,7 +1114,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D0404B3EBC644059A923737BA3961EB4"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Welcome"
+                    "DisplayName" = "8:Willkommen"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"
@@ -1156,7 +1178,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_22B328A76C81473E864FBE671002BF41"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Finished"
+                    "DisplayName" = "8:Fertig"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"
@@ -1201,7 +1223,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BE954D72A8574059B73649E3C8A961AE"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Progress"
+                    "DisplayName" = "8:Status"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"


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

Revision: 132
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=132&view=rev
Author:   floriwan
Date:     2011-03-25 06:55:38 +0000 (Fri, 25 Mar 2011)

Log Message:
-----------
Fix: set not used properties to null to avoid memory leaks

Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-03-24 16:01:43 UTC (rev 131)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-03-25 06:55:38 UTC (rev 132)
@@ -246,10 +246,15 @@
 				ErrorHandler.Handle(ex);
 			}
 			finally
-			{
+			{                        
                 lastSync = DateTime.Now;
                 TimerSwitch(true);
 				SetFormEnabled(true);
+                if (_sync != null)
+                {
+                    _sync.LogoffGoogle();
+                    _sync = null;
+                }
 			}
 		}
 

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-03-24 16:01:43 UTC (rev 131)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-03-25 06:55:38 UTC (rev 132)
@@ -322,21 +322,31 @@
 
 		public void LogoffOutlook()
 		{
-			try
-			{
-				Logger.Log("Disconnecting from Outlook...", EventType.Information);
-				if (_outlookNamespace != null)
-				{
-					_outlookNamespace.Logoff();
-				}
-			}
-			catch (Exception)
-			{
-				// if outlook was closed inbetween, we get an System.InvalidCastException or similar exception, that indicates that outlook cannot be acced anymore
-				// so as outlook is closed anyways, we just ignore the exception here
-			}
+            try
+            {
+                Logger.Log("Disconnecting from Outlook...", EventType.Information);
+                if (_outlookNamespace != null)
+                {
+                    _outlookNamespace.Logoff();
+                }
+            }
+            catch (Exception)
+            {
+                // if outlook was closed inbetween, we get an System.InvalidCastException or similar exception, that indicates that outlook cannot be acced anymore
+                // so as outlook is closed anyways, we just ignore the exception here
+            }
+            finally
+            {
+                _outlookNamespace = null;
+                _outlookApp = null;
+            }
 		}
 
+        public void LogoffGoogle()
+        {            
+            _googleService = null;            
+        }
+
 		public void LoadOutlookContacts()
 		{
 			Logger.Log("Loading Outlook contacts...", EventType.Information);
@@ -501,80 +511,92 @@
 		{
 			lock (_syncRoot)
 			{
-                if (_syncProfile.Length == 0)
+                try
                 {
-                    Logger.Log("Must set a sync profile. This should be different on each user/computer you sync on.", EventType.Error);
-                    return;
-                }
+                    if (_syncProfile.Length == 0)
+                    {
+                        Logger.Log("Must set a sync profile. This should be different on each user/computer you sync on.", EventType.Error);
+                        return;
+                    }
 
-				_syncedCount = 0;
-				_deletedCount = 0;
-                _errorCount = 0;
-                _skippedCount = 0;
-                _skippedCountNotMatches = 0;
+                    _syncedCount = 0;
+                    _deletedCount = 0;
+                    _errorCount = 0;
+                    _skippedCount = 0;
+                    _skippedCountNotMatches = 0;
 
-				Load();
+                    Load();
 
 #if debug
-			this.DebugContacts();
+                    this.DebugContacts();
 #endif
 
-				if (_matches == null)
-					return;
+                    if (_matches == null)
+                        return;
 
-                _totalCount = _matches.Count + _skippedCountNotMatches;
+                    _totalCount = _matches.Count + _skippedCountNotMatches;
 
-                //Remove Google duplicates from matches to be synced
-                if (_googleContactDuplicates != null)
-                {
-                    for (int i = _googleContactDuplicates.Count -1; i>=0; i--)
+                    //Remove Google duplicates from matches to be synced
+                    if (_googleContactDuplicates != null)
                     {
-                        ContactMatch match = _googleContactDuplicates[i];
-                        if (_matches.Contains(match))
+                        for (int i = _googleContactDuplicates.Count - 1; i >= 0; i--)
                         {
-                            _skippedCount++;
-                            _matches.Remove(match);
+                            ContactMatch match = _googleContactDuplicates[i];
+                            if (_matches.Contains(match))
+                            {
+                                _skippedCount++;
+                                _matches.Remove(match);
+                            }
                         }
                     }
-                }
 
-                //Remove Outlook duplicates from matches to be synced
-                if (_outlookContactDuplicates != null)
-                {
-                    for (int i = _outlookContactDuplicates.Count -1; i>=0;i--)
+                    //Remove Outlook duplicates from matches to be synced
+                    if (_outlookContactDuplicates != null)
                     {
-                        ContactMatch match = _outlookContactDuplicates[i];
-                        if (_matches.Contains(match))
+                        for (int i = _outlookContactDuplicates.Count - 1; i >= 0; i--)
                         {
-                            _skippedCount++;
-                            _matches.Remove(match);
+                            ContactMatch match = _outlookContactDuplicates[i];
+                            if (_matches.Contains(match))
+                            {
+                                _skippedCount++;
+                                _matches.Remove(match);
+                            }
                         }
                     }
-                }
 
-                ////Remove remaining google contacts not in My Contacts group (to avoid syncing accounts added automatically to "Weitere Kontakte"/"Further Contacts"
-                //Group syncGroup = GetGoogleGroupByName(myContactsGroup);
-                //if (syncGroup != null)
-                //{
-                //    for (int i = _googleContacts.Count -1 ;i >=0; i--)
-                //    {
-                //        Contact googleContact = _googleContacts[i];
-                //        Collection<Group> googleContactGroups = Utilities.GetGoogleGroups(this, googleContact);
+                    ////Remove remaining google contacts not in My Contacts group (to avoid syncing accounts added automatically to "Weitere Kontakte"/"Further Contacts"
+                    //Group syncGroup = GetGoogleGroupByName(myContactsGroup);
+                    //if (syncGroup != null)
+                    //{
+                    //    for (int i = _googleContacts.Count -1 ;i >=0; i--)
+                    //    {
+                    //        Contact googleContact = _googleContacts[i];
+                    //        Collection<Group> googleContactGroups = Utilities.GetGoogleGroups(this, googleContact);
 
-                //        if (!googleContactGroups.Contains(syncGroup))
-                //            _googleContacts.Remove(googleContact);
-                        
-                //    }
-                //}                                    
+                    //        if (!googleContactGroups.Contains(syncGroup))
+                    //            _googleContacts.Remove(googleContact);
 
+                    //    }
+                    //}                                    
 
-				Logger.Log("Syncing groups...", EventType.Information);
-				ContactsMatcher.SyncGroups(this);
 
-				Logger.Log("Syncing contacts...", EventType.Information);
-				ContactsMatcher.SyncContacts(this);
+                    Logger.Log("Syncing groups...", EventType.Information);
+                    ContactsMatcher.SyncGroups(this);
 
-				SaveContacts(_matches);
+                    Logger.Log("Syncing contacts...", EventType.Information);
+                    ContactsMatcher.SyncContacts(this);
+
+                    SaveContacts(_matches);
+                }
+                finally
+                {                 
+                    _googleContacts = null;
+                    _outlookContacts = null;
+                    _outlookContactDuplicates = null;
+                    _googleContactDuplicates = null;
+                    _googleGroups = null;
+                    _googleService = null;
+                }
 			}
 		}
 


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

Revision: 133
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=133&view=rev
Author:   floriwan
Date:     2011-03-25 06:56:11 +0000 (Fri, 25 Mar 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-03-25 06:55:38 UTC (rev 132)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-03-25 06:56:11 UTC (rev 133)
@@ -252,6 +252,7 @@
 				SetFormEnabled(true);
                 if (_sync != null)
                 {
+                    _sync.LogoffOutlook();
                     _sync.LogoffGoogle();
                     _sync = null;
                 }

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-03-25 06:55:38 UTC (rev 132)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-03-25 06:56:11 UTC (rev 133)
@@ -589,13 +589,13 @@
                     SaveContacts(_matches);
                 }
                 finally
-                {                 
+                {              
                     _googleContacts = null;
                     _outlookContacts = null;
                     _outlookContactDuplicates = null;
                     _googleContactDuplicates = null;
                     _googleGroups = null;
-                    _googleService = null;
+                    _matches = null;                    
                 }
 			}
 		}


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

Revision: 134
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=134&view=rev
Author:   big-r
Date:     2011-03-25 08:20:05 +0000 (Fri, 25 Mar 2011)

Log Message:
-----------
ILogger.cs:
    create the log-directory if it doesn't exist...

Modified Paths:
--------------
    trunk/GoogleContactsSync/ILogger.cs
    trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj

Modified: trunk/GoogleContactsSync/ILogger.cs
===================================================================
--- trunk/GoogleContactsSync/ILogger.cs	2011-03-25 06:56:11 UTC (rev 133)
+++ trunk/GoogleContactsSync/ILogger.cs	2011-03-25 08:20:05 UTC (rev 134)
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
 
 namespace GoContactSyncMod
@@ -28,8 +27,15 @@
     {
 		public static List<LogEntry> messages = new List<LogEntry>();
 		public delegate void LogUpdatedHandler(string Message);
-		public static event LogUpdatedHandler LogUpdated;
+        public static event LogUpdatedHandler LogUpdated;
         private static StreamWriter logwriter;
+
+        static Logger()
+        {
+            String path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\GoContactSyncMOD";
+            if (!Directory.Exists(path))
+                Directory.CreateDirectory(path);
+        }
     
         private static string formatMessage(string message, EventType eventType)
         {
@@ -46,6 +52,7 @@
             
             LogEntry new_logEntry = new LogEntry(DateTime.Now, eventType, message);
             messages.Add(new_logEntry);
+            
             using (logwriter = new StreamWriter(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)+"\\GoContactSyncMOD\\log.txt", true))
             {
                 logwriter.Write(GetLogLine(new_logEntry));

Modified: trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj
===================================================================
--- trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2011-03-25 06:56:11 UTC (rev 133)
+++ trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2011-03-25 08:20:05 UTC (rev 134)
@@ -124,13 +124,13 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
+        "OwnerKey" = "8:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
+        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -421,7 +421,7 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:FALSE"
+            "Exclude" = "11:TRUE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }


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

Revision: 137
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=137&view=rev
Author:   big-r
Date:     2011-03-26 09:04:53 +0000 (Sat, 26 Mar 2011)

Log Message:
-----------
change how logfiles are opened/written

Modified Paths:
--------------
    trunk/GoogleContactsSync/ILogger.cs
    trunk/GoogleContactsSync/SettingsForm.cs

Modified: trunk/GoogleContactsSync/ILogger.cs
===================================================================
--- trunk/GoogleContactsSync/ILogger.cs	2011-03-25 17:34:31 UTC (rev 136)
+++ trunk/GoogleContactsSync/ILogger.cs	2011-03-26 09:04:53 UTC (rev 137)
@@ -35,8 +35,29 @@
             String path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\GoContactSyncMOD";
             if (!Directory.Exists(path))
                 Directory.CreateDirectory(path);
+            try
+            {
+                logwriter = new StreamWriter(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\GoContactSyncMOD\\log.txt", true);
+            }
+            catch (Exception ex)
+            {
+                ErrorHandler.Handle(ex);
+            }
         }
     
+        public static void Close()
+        {
+            try
+            {
+                if(logwriter!=null)
+                    logwriter.Close();
+            }
+            catch(Exception e)
+            {
+                ErrorHandler.Handle(e);
+            }
+        }
+
         private static string formatMessage(string message, EventType eventType)
         {
             return String.Format("{0}:{1}{2}", eventType, Environment.NewLine, message);
@@ -52,13 +73,17 @@
             
             LogEntry new_logEntry = new LogEntry(DateTime.Now, eventType, message);
             messages.Add(new_logEntry);
-            
-            using (logwriter = new StreamWriter(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)+"\\GoContactSyncMOD\\log.txt", true))
+
+            try
             {
                 logwriter.Write(GetLogLine(new_logEntry));
                 logwriter.Flush();
-                logwriter.Close();
             }
+            catch (Exception ex)
+            {
+                ErrorHandler.Handle(ex);
+            }
+
             if (LogUpdated != null)
                 LogUpdated(GetLogLine(new_logEntry));
         }

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-03-25 17:34:31 UTC (rev 136)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-03-26 09:04:53 UTC (rev 137)
@@ -59,6 +59,7 @@
                 WTSUnRegisterSessionNotification(Handle);
                 registered = false;
             }
+            Logger.Close();
         }
 
 		private void PopulateSyncOptionBox()


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

Revision: 142
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=142&view=rev
Author:   big-r
Date:     2011-03-26 12:29:34 +0000 (Sat, 26 Mar 2011)

Log Message:
-----------
change:
    Errorhandler.cs:
        show BalloonTooltip only if user is active
    SettingsForm.cs:
        method ShowBalloonToolTip is now public

Modified Paths:
--------------
    trunk/GoogleContactsSync/ErrorHandler.cs
    trunk/GoogleContactsSync/SettingsForm.cs

Modified: trunk/GoogleContactsSync/ErrorHandler.cs
===================================================================
--- trunk/GoogleContactsSync/ErrorHandler.cs	2011-03-26 10:10:54 UTC (rev 141)
+++ trunk/GoogleContactsSync/ErrorHandler.cs	2011-03-26 12:29:34 UTC (rev 142)
@@ -17,10 +17,13 @@
 
 			try
 			{
+                Program.Instance.ShowBalloonToolTip("Error", ex.Message, ToolTipIcon.Error, 5000);
+                /*
 				Program.Instance.notifyIcon.BalloonTipTitle = "Error";
 				Program.Instance.notifyIcon.BalloonTipText = ex.Message;
 				Program.Instance.notifyIcon.BalloonTipIcon = ToolTipIcon.Error;
 				Program.Instance.notifyIcon.ShowBalloonTip(5000);
+                 */
 			}
 			catch (Exception)
 			{

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-03-26 10:10:54 UTC (rev 141)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-03-26 12:29:34 UTC (rev 142)
@@ -291,7 +291,7 @@
 			}
 		}
 
-        void ShowBalloonToolTip(string title, string message, ToolTipIcon icon, int timeout)
+        public void ShowBalloonToolTip(string title, string message, ToolTipIcon icon, int timeout)
         {
             //if user is active on workstation
             if(boolShowBalloonTip)


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

Revision: 144
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=144&view=rev
Author:   floriwan
Date:     2011-03-27 09:13:12 +0000 (Sun, 27 Mar 2011)

Log Message:
-----------
changed version to 3.4 and added office.dll to installation again

Modified Paths:
--------------
    trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
    trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj

Modified: trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
===================================================================
--- trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-03-27 05:00:59 UTC (rev 143)
+++ trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-03-27 09:13:12 UTC (rev 144)
@@ -31,6 +31,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.3.*")]
-[assembly: AssemblyFileVersion("3.3.3")]
+[assembly: AssemblyVersion("3.4.0.*")]
+[assembly: AssemblyFileVersion("3.4.0")]
 [assembly: NeutralResourcesLanguageAttribute("en-GB")]

Modified: trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj
===================================================================
--- trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2011-03-27 05:00:59 UTC (rev 143)
+++ trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2011-03-27 09:13:12 UTC (rev 144)
@@ -27,20 +27,20 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_084162EBBDB9A67BC79C1B76E14DE8AB"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "MsmKey" = "8:_17C96A08C0C04AB99C55461B72206B9C"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_17C96A08C0C04AB99C55461B72206B9C"
+        "MsmKey" = "8:_449A09D626FD4A6C9AEE1F387A23D13C"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_449A09D626FD4A6C9AEE1F387A23D13C"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -51,30 +51,24 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_8E6A08BB36333FBE57EC036538692E85"
+        "MsmKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
         "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_8E6A08BB36333FBE57EC036538692E85"
-        "OwnerKey" = "8:_E7C0F54CE3CCDB6B105B2A506EBDA764"
+        "MsmKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
+        "OwnerKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_8E6A08BB36333FBE57EC036538692E85"
-        "OwnerKey" = "8:_084162EBBDB9A67BC79C1B76E14DE8AB"
+        "MsmKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
+        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
-        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -88,23 +82,29 @@
         "Entry"
         {
         "MsmKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
-        "OwnerKey" = "8:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
+        "OwnerKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E7C0F54CE3CCDB6B105B2A506EBDA764"
-        "OwnerKey" = "8:_084162EBBDB9A67BC79C1B76E14DE8AB"
+        "MsmKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
+        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E7C0F54CE3CCDB6B105B2A506EBDA764"
+        "MsmKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
         "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
+        "MsmKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
+        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_EEF5B1E061E94324A394BC6D6E07F65D"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -124,31 +124,31 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
+        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
+        "OwnerKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_084162EBBDB9A67BC79C1B76E14DE8AB"
+        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E7C0F54CE3CCDB6B105B2A506EBDA764"
+        "OwnerKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_8E6A08BB36333FBE57EC036538692E85"
+        "OwnerKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -292,37 +292,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_084162EBBDB9A67BC79C1B76E14DE8AB"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Contacts, Version=1.7.0.14479, Culture=neutral, PublicKeyToken=7e065189dd4b982f, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_084162EBBDB9A67BC79C1B76E14DE8AB"
-                    {
-                    "Name" = "8:Google.GData.Contacts.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Google.GData.Contacts.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_17C96A08C0C04AB99C55461B72206B9C"
             {
             "SourcePath" = "8:..\\GoogleContactsSync\\GO Contact Sync Homepage.url"
@@ -363,20 +332,20 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8E6A08BB36333FBE57EC036538692E85"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6EC35BE8EF1AAED05EABD0848EEEB700"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Client, Version=1.7.0.14478, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Contacts, Version=1.7.0.17771, Culture=neutral, PublicKeyToken=7e065189dd4b982f, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_8E6A08BB36333FBE57EC036538692E85"
+                    "_6EC35BE8EF1AAED05EABD0848EEEB700"
                     {
-                    "Name" = "8:Google.GData.Client.dll"
+                    "Name" = "8:Google.GData.Contacts.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Google.GData.Client.dll"
+            "SourcePath" = "8:Google.GData.Contacts.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -394,20 +363,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_91E364B39302FB8247F82D5FA41F951E"
             {
             "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:TRUE"
-            "AssemblyAsmDisplayName" = "8:office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Client, Version=1.7.0.17769, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
+                    "_91E364B39302FB8247F82D5FA41F951E"
                     {
-                    "Name" = "8:office.dll"
+                    "Name" = "8:Google.GData.Client.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:office.dll"
+            "SourcePath" = "8:Google.GData.Client.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -421,7 +390,7 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:TRUE"
+            "Exclude" = "11:FALSE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
@@ -476,14 +445,14 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E7C0F54CE3CCDB6B105B2A506EBDA764"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E4E9E9D12EE20858632E2D09D30DCA43"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Extensions, Version=1.7.0.14479, Culture=neutral, PublicKeyToken=0b4c5df2ebf20876, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Extensions, Version=1.7.0.17770, Culture=neutral, PublicKeyToken=0b4c5df2ebf20876, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_E7C0F54CE3CCDB6B105B2A506EBDA764"
+                    "_E4E9E9D12EE20858632E2D09D30DCA43"
                     {
                     "Name" = "8:Google.GData.Extensions.dll"
                     "Attributes" = "3:512"
@@ -507,6 +476,37 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E695CBDD605E1061614DA23AB6EED043"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_E695CBDD605E1061614DA23AB6EED043"
+                    {
+                    "Name" = "8:office.DLL"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:office.DLL"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EEF5B1E061E94324A394BC6D6E07F65D"
             {
             "SourcePath" = "8:..\\GoogleContactsSync\\COPYING.rtf"
@@ -617,7 +617,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:GO Contact Sync Mod"
         "ProductCode" = "8:{60935927-2D24-4753-9902-296986141733}"
-        "PackageCode" = "8:{CCB81454-0E81-4F2A-BAA1-6BAA251F452D}"
+        "PackageCode" = "8:{58EC96A6-39D8-49C2-B13F-85CC7BDC33AE}"
         "UpgradeCode" = "8:{170B4620-F5BB-4D2E-97A1-239D79030F20}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
@@ -778,7 +778,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_798D502AD8A84A668FE47568EA35FD15"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Status"
+                    "DisplayName" = "8:Progress"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"
@@ -823,7 +823,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_6446AF9ADE87475A86215903A9A029F2"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Willkommen"
+                    "DisplayName" = "8:Welcome"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"
@@ -872,7 +872,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_7B6D831D957541DFBD9CB979ACA9DA14"
                     {
                     "Sequence" = "3:300"
-                    "DisplayName" = "8:Installation bestätigen"
+                    "DisplayName" = "8:Confirm Installation"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"
@@ -895,7 +895,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8CF1DBE8409F4314B79DA786912F31BF"
                     {
                     "Sequence" = "3:220"
-                    "DisplayName" = "8:Installationsordner"
+                    "DisplayName" = "8:Installation Folder"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"
@@ -918,7 +918,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_DA74DE1924F44B7DBDA74B9BC54FBB22"
                     {
                     "Sequence" = "3:210"
-                    "DisplayName" = "8:Lizenzvertrag"
+                    "DisplayName" = "8:License Agreement"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminLicenseDlg.wid"
@@ -975,7 +975,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C735890B3EDF492481BA4710353C03E6"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Fertig"
+                    "DisplayName" = "8:Finished"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFinishedDlg.wid"
@@ -1007,7 +1007,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_57BF2CE534C546019D28C01BDF7C1D53"
                     {
                     "Sequence" = "3:110"
-                    "DisplayName" = "8:Lizenzvertrag"
+                    "DisplayName" = "8:License Agreement"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdLicenseDlg.wid"
@@ -1055,7 +1055,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_AFB55B0E17484458BA2BD5FA0765BF76"
                     {
                     "Sequence" = "3:200"
-                    "DisplayName" = "8:Installationsordner"
+                    "DisplayName" = "8:Installation Folder"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"
@@ -1091,7 +1091,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BB2923AE8C5D4CC78A3214E91705C560"
                     {
                     "Sequence" = "3:300"
-                    "DisplayName" = "8:Installation bestätigen"
+                    "DisplayName" = "8:Confirm Installation"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"
@@ -1114,7 +1114,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D0404B3EBC644059A923737BA3961EB4"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Willkommen"
+                    "DisplayName" = "8:Welcome"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"
@@ -1178,7 +1178,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_22B328A76C81473E864FBE671002BF41"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Fertig"
+                    "DisplayName" = "8:Finished"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"
@@ -1223,7 +1223,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BE954D72A8574059B73649E3C8A961AE"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Status"
+                    "DisplayName" = "8:Progress"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"
@@ -1272,7 +1272,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8A4A20DC9841455BB5FD97B9DF38A24E"
             {
-            "SourcePath" = "8:..\\GoogleContactsSync\\obj\\Release\\GOContactSync.exe"
+            "SourcePath" = "8:..\\GoogleContactsSync\\obj\\x86\\Release\\GOContactSync.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"


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

Revision: 149
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=149&view=rev
Author:   floriwan
Date:     2011-03-29 05:54:33 +0000 (Tue, 29 Mar 2011)

Log Message:
-----------
Improvement: Show internet connection problems only in Balloon and Logger, don't show modal window, to continue syncing after Hibernating

Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-03-27 17:58:30 UTC (rev 148)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-03-29 05:54:33 UTC (rev 149)
@@ -258,7 +258,9 @@
                     string responseString = ex.ResponseString;
                     if (ex.InnerException is System.Net.WebException)
                     {
-                        Logger.Log("Cannot connect to Google, please check for available internet connection and proxy settings if applicable: " + ((System.Net.WebException)ex.InnerException).Message + "\r\n" + responseString, EventType.Warning);
+                        string message = "Cannot connect to Google, please check for available internet connection and proxy settings if applicable: " + ((System.Net.WebException)ex.InnerException).Message + "\r\n" + responseString;
+                        Logger.Log(message, EventType.Warning);
+                        Program.Instance.ShowBalloonToolTip("Error", message, ToolTipIcon.Error, 5000);
                     }
                     else
                     {

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-03-27 17:58:30 UTC (rev 148)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-03-29 05:54:33 UTC (rev 149)
@@ -433,15 +433,15 @@
                 }                              
 	
 			}
-			catch (System.Net.WebException ex)
-			{                               
-				//Logger.Log(message, EventType.Error);
-                throw new NotSupportedException(message, ex);
-			}
+            catch (System.Net.WebException ex)
+            {
+                //Logger.Log(message, EventType.Error);
+                throw new GDataRequestException(message, ex);
+            }
             catch (System.NullReferenceException ex)
-            {                
+            {
                 //Logger.Log(message, EventType.Error);
-                throw new NotSupportedException(message, ex);
+                throw new GDataRequestException(message, new System.Net.WebException("Error accessing feed", ex));
             }
 		}
 		public void LoadGoogleGroups()
@@ -477,12 +477,12 @@
 			catch (System.Net.WebException ex)
 			{                               				
 				//Logger.Log(message, EventType.Error);
-                throw new NotSupportedException(message, ex);
+                throw new GDataRequestException(message, ex);
 			}
             catch (System.NullReferenceException ex)
             {
                 //Logger.Log(message, EventType.Error);
-                throw new NotSupportedException(message, ex);
+                throw new GDataRequestException(message, new System.Net.WebException("Error accessing feed", ex));
             }
 
 		}


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

Revision: 151
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=151&view=rev
Author:   floriwan
Date:     2011-04-05 06:48:07 +0000 (Tue, 05 Apr 2011)

Log Message:
-----------
added comment to explain \r\n replacement

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactSync.cs
    trunk/GoogleContactsSync/ContactsMatcher.cs

Modified: trunk/GoogleContactsSync/ContactSync.cs
===================================================================
--- trunk/GoogleContactsSync/ContactSync.cs	2011-03-31 06:02:51 UTC (rev 150)
+++ trunk/GoogleContactsSync/ContactSync.cs	2011-04-05 06:48:07 UTC (rev 151)
@@ -570,9 +570,9 @@
 
             #region Title/FileAs
             if (!string.IsNullOrEmpty(master.Name.FullName))
-				slave.FileAs = master.Name.FullName.Replace("\r\n", "\n").Replace("\n","\r\n"); //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google
+                slave.FileAs = master.Name.FullName.Replace("\r\n", "\n").Replace("\n", "\r\n"); //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google and \r\n is saved on Outlook side to separate the single parts of the FullName
             else if (!string.IsNullOrEmpty(master.Title))
-                slave.FileAs = master.Title.Replace("\r\n", "\n").Replace("\n","\r\n"); //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google
+                slave.FileAs = master.Title.Replace("\r\n", "\n").Replace("\n", "\r\n"); //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google and \r\n is saved on Outlook side to separate the single parts of the FullName
             else if (master.Organizations.Count > 0 && !string.IsNullOrEmpty(master.Organizations[0].Name))
                 slave.FileAs = master.Organizations[0].Name;
             else if (master.Emails.Count > 0 && !string.IsNullOrEmpty(master.Emails[0].Address))

Modified: trunk/GoogleContactsSync/ContactsMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/ContactsMatcher.cs	2011-03-31 06:02:51 UTC (rev 150)
+++ trunk/GoogleContactsSync/ContactsMatcher.cs	2011-04-05 06:48:07 UTC (rev 151)
@@ -209,7 +209,7 @@
                     //1.1 try to match by FullName
                     //2. try to match by primary email
                     //3. try to match by mobile phone number, don't match by home or business bumbers, because several people may share the same home or business number
-                    if (!string.IsNullOrEmpty(olc.FileAs) && !string.IsNullOrEmpty(entry.Title) && olc.FileAs.Equals(entry.Title.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||  //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google
+                    if (!string.IsNullOrEmpty(olc.FileAs) && !string.IsNullOrEmpty(entry.Title) && olc.FileAs.Equals(entry.Title.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||  //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google and \r\n is saved on Outlook side to separate the single parts of the FullName
                         !string.IsNullOrEmpty(olc.FileAs) && !string.IsNullOrEmpty(entry.Name.FullName) && olc.FileAs.Equals(entry.Name.FullName.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||
                         !string.IsNullOrEmpty(olc.FullName) && !string.IsNullOrEmpty(entry.Name.FullName) && olc.FullName.Equals(entry.Name.FullName.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||                        
                         !string.IsNullOrEmpty(olc.Email1Address) && entry.Emails.Count > 0 && olc.Email1Address.Equals(entry.Emails[0].Address, StringComparison.InvariantCultureIgnoreCase) ||
@@ -333,7 +333,7 @@
                     foreach (ContactMatch duplicate in sync.GoogleContactDuplicates)
                     {
                         if (duplicate.AllGoogleContactMatches.Count > 0 &&
-                            (!string.IsNullOrEmpty(olc.FileAs) && !string.IsNullOrEmpty(duplicate.AllGoogleContactMatches[0].Title) && olc.FileAs.Equals(duplicate.AllGoogleContactMatches[0].Title.Replace("\r\n", "\n").Replace("\n","\r\n"), StringComparison.InvariantCultureIgnoreCase) ||  //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google
+                            (!string.IsNullOrEmpty(olc.FileAs) && !string.IsNullOrEmpty(duplicate.AllGoogleContactMatches[0].Title) && olc.FileAs.Equals(duplicate.AllGoogleContactMatches[0].Title.Replace("\r\n", "\n").Replace("\n","\r\n"), StringComparison.InvariantCultureIgnoreCase) ||  //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google and \r\n is saved on Outlook side to separate the single parts of the FullName
                              !string.IsNullOrEmpty(olc.FileAs) && !string.IsNullOrEmpty(duplicate.AllGoogleContactMatches[0].Name.FullName) && olc.FileAs.Equals(duplicate.AllGoogleContactMatches[0].Name.FullName.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||
                              !string.IsNullOrEmpty(olc.FullName) && !string.IsNullOrEmpty(duplicate.AllGoogleContactMatches[0].Name.FullName) && olc.FullName.Equals(duplicate.AllGoogleContactMatches[0].Name.FullName.Replace("\r\n", "\n").Replace("\n","\r\n"), StringComparison.InvariantCultureIgnoreCase) ||
                              !string.IsNullOrEmpty(olc.Email1Address) && duplicate.AllGoogleContactMatches[0].Emails.Count > 0 && olc.Email1Address.Equals(duplicate.AllGoogleContactMatches[0].Emails[0].Address, StringComparison.InvariantCultureIgnoreCase) ||


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

Revision: 152
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=152&view=rev
Author:   floriwan
Date:     2011-04-05 06:50:48 +0000 (Tue, 05 Apr 2011)

Log Message:
-----------
improved error handling for NullReferenceExceptions

Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-04-05 06:48:07 UTC (rev 151)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-04-05 06:50:48 UTC (rev 152)
@@ -208,77 +208,69 @@
 				Logger.Log("Sync started.", EventType.Information);
 				//SetSyncConsoleText(Logger.GetText());
 				_sync.SyncProfile = tbSyncProfile.Text;
-				_sync.SyncOption = _syncOption;
+				_sync.SyncOption = _syncOption;                
+                   
+                _sync.LoginToGoogle(UserName.Text, Password.Text);
+                _sync.LoginToOutlook();
 
-                try
-                {
-                    _sync.LoginToGoogle(UserName.Text, Password.Text);
-                    _sync.LoginToOutlook();
-
-                    _sync.Sync();
+                _sync.Sync();
                     
-                    lastSync = DateTime.Now;
-                    SetLastSyncText("Last synced at " + lastSync.ToString());
+                lastSync = DateTime.Now;
+                SetLastSyncText("Last synced at " + lastSync.ToString());
 
-                    string message = string.Format("Sync complete.\r\n Synced:  {1} out of {0}.\r\n Deleted:  {2}.\r\n Skipped: {3}.\r\n Errors:    {4}.", _sync.TotalCount, _sync.SyncedCount, _sync.DeletedCount, _sync.SkippedCount, _sync.ErrorCount);
-                    Logger.Log(message, EventType.Information);
-                    if (reportSyncResultCheckBox.Checked)
-                    {
-                        /*
-                        notifyIcon.BalloonTipTitle = Application.ProductName;
-                        notifyIcon.BalloonTipText = string.Format("{0}. {1}", DateTime.Now, message);
-                        */
-                        ToolTipIcon icon;
-                        if (_sync.ErrorCount > 0)
-                            icon = ToolTipIcon.Error;
-                        else if (_sync.SkippedCount > 0)
-                            icon = ToolTipIcon.Warning;
-                        else
-                            icon = ToolTipIcon.Info;
-                        /*notifyIcon.ShowBalloonTip(5000);
-                        */
-                        ShowBalloonToolTip(Application.ProductName,
-                            string.Format("{0}. {1}", DateTime.Now, message),
-                            icon,
-                            5000);
+                string message = string.Format("Sync complete.\r\n Synced:  {1} out of {0}.\r\n Deleted:  {2}.\r\n Skipped: {3}.\r\n Errors:    {4}.", _sync.TotalCount, _sync.SyncedCount, _sync.DeletedCount, _sync.SkippedCount, _sync.ErrorCount);
+                Logger.Log(message, EventType.Information);
+                if (reportSyncResultCheckBox.Checked)
+                {
+                    /*
+                    notifyIcon.BalloonTipTitle = Application.ProductName;
+                    notifyIcon.BalloonTipText = string.Format("{0}. {1}", DateTime.Now, message);
+                    */
+                    ToolTipIcon icon;
+                    if (_sync.ErrorCount > 0)
+                        icon = ToolTipIcon.Error;
+                    else if (_sync.SkippedCount > 0)
+                        icon = ToolTipIcon.Warning;
+                    else
+                        icon = ToolTipIcon.Info;
+                    /*notifyIcon.ShowBalloonTip(5000);
+                    */
+                    ShowBalloonToolTip(Application.ProductName,
+                        string.Format("{0}. {1}", DateTime.Now, message),
+                        icon,
+                        5000);
 
-                    }
-                    string toolTip = string.Format("{0}\nLast sync: {1}", Application.ProductName, DateTime.Now.ToString("dd.MM. HH:mm"));
-                    if (_sync.ErrorCount + _sync.SkippedCount > 0)
-                        toolTip += string.Format("\nWarnings: {0}.", _sync.ErrorCount + _sync.SkippedCount);
-                    if (toolTip.Length >= 64)
-                        toolTip = toolTip.Substring(0, 63);
-                    notifyIcon.Text = toolTip;
                 }
-                catch (Google.GData.Client.GDataRequestException ex)
-                {
-                    SetLastSyncText("Sync failed.");
-                    notifyIcon.Text = Application.ProductName + "\nSync failed";
+                string toolTip = string.Format("{0}\nLast sync: {1}", Application.ProductName, DateTime.Now.ToString("dd.MM. HH:mm"));
+                if (_sync.ErrorCount + _sync.SkippedCount > 0)
+                    toolTip += string.Format("\nWarnings: {0}.", _sync.ErrorCount + _sync.SkippedCount);
+                if (toolTip.Length >= 64)
+                    toolTip = toolTip.Substring(0, 63);
+                notifyIcon.Text = toolTip;
+            }
+            catch (Google.GData.Client.GDataRequestException ex)
+            {
+                SetLastSyncText("Sync failed.");
+                notifyIcon.Text = Application.ProductName + "\nSync failed";
 
-                    string responseString = ex.ResponseString;
-                    if (ex.InnerException is System.Net.WebException)
-                    {
-                        string message = "Cannot connect to Google, please check for available internet connection and proxy settings if applicable: " + ((System.Net.WebException)ex.InnerException).Message + "\r\n" + responseString;
-                        Logger.Log(message, EventType.Warning);
-                        Program.Instance.ShowBalloonToolTip("Error", message, ToolTipIcon.Error, 5000);
-                    }
-                    else
-                    {
-                        ErrorHandler.Handle(ex);
-                    }
+                string responseString = ex.ResponseString;
+                if (ex.InnerException is System.Net.WebException)
+                {
+                    string message = "Cannot connect to Google, please check for available internet connection and proxy settings if applicable: " + ((System.Net.WebException)ex.InnerException).Message + "\r\n" + responseString;
+                    Logger.Log(message, EventType.Warning);
+                    Program.Instance.ShowBalloonToolTip("Error", message, ToolTipIcon.Error, 5000);
                 }
-                catch (Exception ex)
+                else
                 {
-                    SetLastSyncText("Sync failed.");
-                    notifyIcon.Text = Application.ProductName + "\nSync failed";
                     ErrorHandler.Handle(ex);
-                }				
-
-			}
-			catch (Exception ex)
-			{
-				ErrorHandler.Handle(ex);
-			}
+                }
+            }
+            catch (Exception ex)
+            {
+                SetLastSyncText("Sync failed.");
+                notifyIcon.Text = Application.ProductName + "\nSync failed";
+                ErrorHandler.Handle(ex);
+            }							
 			finally
 			{                        
                 lastSync = DateTime.Now;
@@ -324,7 +316,7 @@
 
 		void _sync_DuplicatesFound(string title, string message, EventType eventType)
 		{
-            Logger.Log(message, EventType.Warning);
+            Logger.Log(message, eventType);
             ShowBalloonToolTip(title,message,ToolTipIcon.Warning,5000);
             /*
 			notifyIcon.BalloonTipTitle = title;

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-04-05 06:48:07 UTC (rev 151)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-04-05 06:50:48 UTC (rev 152)
@@ -238,7 +238,7 @@
 				{
 					string message = "Cannot connect to Outlook.\r\nPlease restart GO Contact Sync Mod and try again. If error persists, please inform developers on SourceForge.";
 					// Error again? We need full stacktrace, display it!
-					ErrorHandler.Handle(new ApplicationException(message, ex));
+					throw new Exception(message, ex);
 				}
 			}
 		}
@@ -502,9 +502,11 @@
 			_matches = ContactsMatcher.MatchContacts(this, out duplicateDataException);
 			if (duplicateDataException != null)
 			{
-				Logger.Log(duplicateDataException.Message, EventType.Error);
+				
 				if (DuplicatesFound != null)
 					DuplicatesFound("Google duplicates found", duplicateDataException.Message, EventType.Error);
+                else
+                    Logger.Log(duplicateDataException.Message, EventType.Error);
 			}
 		}
 


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

Revision: 153
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=153&view=rev
Author:   floriwan
Date:     2011-04-06 08:07:07 +0000 (Wed, 06 Apr 2011)

Log Message:
-----------
Fix: set SyncDelete at every SyncStart to avoid "Skipped deletion" warnings, though Sync Deletion checkbox was checked

Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.Designer.cs
    trunk/GoogleContactsSync/SettingsForm.cs

Modified: trunk/GoogleContactsSync/SettingsForm.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.Designer.cs	2011-04-05 06:50:48 UTC (rev 152)
+++ trunk/GoogleContactsSync/SettingsForm.Designer.cs	2011-04-06 08:07:07 UTC (rev 153)
@@ -364,7 +364,6 @@
                     "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
                     "ice versa.");
             this.btSyncDelete.UseVisualStyleBackColor = true;
-            this.btSyncDelete.CheckedChanged += new System.EventHandler(this.btSyncDelete_CheckedChanged);
             // 
             // tbSyncProfile
             // 

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-04-05 06:50:48 UTC (rev 152)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-04-06 08:07:07 UTC (rev 153)
@@ -208,7 +208,8 @@
 				Logger.Log("Sync started.", EventType.Information);
 				//SetSyncConsoleText(Logger.GetText());
 				_sync.SyncProfile = tbSyncProfile.Text;
-				_sync.SyncOption = _syncOption;                
+				_sync.SyncOption = _syncOption;
+                _sync.SyncDelete = btSyncDelete.Checked;
                    
                 _sync.LoginToGoogle(UserName.Text, Password.Text);
                 _sync.LoginToOutlook();
@@ -717,15 +718,15 @@
 			ValidateSyncButton();
 		}
 
-		private void btSyncDelete_CheckedChanged(object sender, EventArgs e)
-		{
-			if (_sync == null)
-			{
-				_sync = new Syncronizer();
-			}
+        //private void btSyncDelete_CheckedChanged(object sender, EventArgs e)
+        //{
+        //    if (_sync == null)
+        //    {
+        //        _sync = new Syncronizer(_syncOption);
+        //    }
 
-			_sync.SyncDelete = btSyncDelete.Checked;
-		}
+        //    _sync.SyncDelete = btSyncDelete.Checked;
+        //}
 
 		private void Donate_Click(object sender, EventArgs e)
 		{


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

Revision: 156
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=156&view=rev
Author:   big-r
Date:     2011-04-06 13:43:40 +0000 (Wed, 06 Apr 2011)

Log Message:
-----------
CHANGE:

- uncomment AssemblyFileVersion-property to get the same version as AssemblyVersion
- if we deploy a new setup we have to change the version number to that version to
  automatically update the setup process - so we don?\194?\180t need to uninstall the previous
  version manually
  if we change the version we (vss makes this for us) create a new product code and
  the upgrade code is the same - we don`t touch this

Modified Paths:
--------------
    trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
    trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj

Modified: trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
===================================================================
--- trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-04-06 08:10:27 UTC (rev 155)
+++ trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-04-06 13:43:40 UTC (rev 156)
@@ -32,5 +32,5 @@
 //      Revision
 //
 [assembly: AssemblyVersion("3.4.2.*")]
-[assembly: AssemblyFileVersion("3.4.2")]
+//[assembly: AssemblyFileVersion("3.4.2")]
 [assembly: NeutralResourcesLanguageAttribute("en-GB")]

Modified: trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj
===================================================================
--- trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2011-04-06 08:10:27 UTC (rev 155)
+++ trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2011-04-06 13:43:40 UTC (rev 156)
@@ -33,74 +33,74 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_449A09D626FD4A6C9AEE1F387A23D13C"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_2A05495146BEA351539361819DF18624"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "MsmKey" = "8:_2A05495146BEA351539361819DF18624"
+        "OwnerKey" = "8:_5176FF745326FDD70F5E875159AF95D0"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_2A05495146BEA351539361819DF18624"
+        "OwnerKey" = "8:_6727E4B2FF08F5E009578BCA710339E3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "MsmKey" = "8:_449A09D626FD4A6C9AEE1F387A23D13C"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
-        "OwnerKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
+        "MsmKey" = "8:_5176FF745326FDD70F5E875159AF95D0"
+        "OwnerKey" = "8:_6727E4B2FF08F5E009578BCA710339E3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
-        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
+        "MsmKey" = "8:_5176FF745326FDD70F5E875159AF95D0"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_6727E4B2FF08F5E009578BCA710339E3"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
-        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
+        "MsmKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
-        "OwnerKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
+        "MsmKey" = "8:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
+        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
-        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
+        "MsmKey" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "MsmKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
+        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
-        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
+        "MsmKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
+        "OwnerKey" = "8:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -130,25 +130,25 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
+        "OwnerKey" = "8:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
+        "OwnerKey" = "8:_6727E4B2FF08F5E009578BCA710339E3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
+        "OwnerKey" = "8:_5176FF745326FDD70F5E875159AF95D0"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
+        "OwnerKey" = "8:_2A05495146BEA351539361819DF18624"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -312,6 +312,37 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2A05495146BEA351539361819DF18624"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Client, Version=1.7.0.17769, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_2A05495146BEA351539361819DF18624"
+                    {
+                    "Name" = "8:Google.GData.Client.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Google.GData.Client.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_449A09D626FD4A6C9AEE1F387A23D13C"
             {
             "SourcePath" = "8:..\\GoogleContactsSync\\contacts-sync.ico"
@@ -332,20 +363,20 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6EC35BE8EF1AAED05EABD0848EEEB700"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5176FF745326FDD70F5E875159AF95D0"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Contacts, Version=1.7.0.17771, Culture=neutral, PublicKeyToken=7e065189dd4b982f, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Extensions, Version=1.7.0.17770, Culture=neutral, PublicKeyToken=0b4c5df2ebf20876, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_6EC35BE8EF1AAED05EABD0848EEEB700"
+                    "_5176FF745326FDD70F5E875159AF95D0"
                     {
-                    "Name" = "8:Google.GData.Contacts.dll"
+                    "Name" = "8:Google.GData.Extensions.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Google.GData.Contacts.dll"
+            "SourcePath" = "8:Google.GData.Extensions.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -363,20 +394,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_91E364B39302FB8247F82D5FA41F951E"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6727E4B2FF08F5E009578BCA710339E3"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Client, Version=1.7.0.17769, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Contacts, Version=1.7.0.17771, Culture=neutral, PublicKeyToken=7e065189dd4b982f, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_91E364B39302FB8247F82D5FA41F951E"
+                    "_6727E4B2FF08F5E009578BCA710339E3"
                     {
-                    "Name" = "8:Google.GData.Client.dll"
+                    "Name" = "8:Google.GData.Contacts.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Google.GData.Client.dll"
+            "SourcePath" = "8:Google.GData.Contacts.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -394,40 +425,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A131A9765CDF4FB18FC170D9BCFC2F20"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
             {
-            "SourcePath" = "8:install-banner.jpg"
-            "TargetName" = "8:install-banner.jpg"
-            "Tag" = "8:"
-            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:TRUE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A2D96859CE406F76F4F0818B2813AE72"
-            {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:TRUE"
-            "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+            "AssemblyAsmDisplayName" = "8:office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_A2D96859CE406F76F4F0818B2813AE72"
+                    "_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
                     {
-                    "Name" = "8:stdole.dll"
+                    "Name" = "8:office.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:stdole.dll"
+            "SourcePath" = "8:office.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -441,25 +452,14 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:TRUE"
+            "Exclude" = "11:FALSE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E4E9E9D12EE20858632E2D09D30DCA43"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A131A9765CDF4FB18FC170D9BCFC2F20"
             {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Extensions, Version=1.7.0.17770, Culture=neutral, PublicKeyToken=0b4c5df2ebf20876, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_E4E9E9D12EE20858632E2D09D30DCA43"
-                    {
-                    "Name" = "8:Google.GData.Extensions.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Google.GData.Extensions.dll"
-            "TargetName" = "8:"
+            "SourcePath" = "8:install-banner.jpg"
+            "TargetName" = "8:install-banner.jpg"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
             "Condition" = "8:"
@@ -472,24 +472,24 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E695CBDD605E1061614DA23AB6EED043"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A2D96859CE406F76F4F0818B2813AE72"
             {
             "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL"
+            "AssemblyIsInGAC" = "11:TRUE"
+            "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
                 "ScatterAssemblies"
                 {
-                    "_E695CBDD605E1061614DA23AB6EED043"
+                    "_A2D96859CE406F76F4F0818B2813AE72"
                     {
-                    "Name" = "8:office.DLL"
+                    "Name" = "8:stdole.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:office.DLL"
+            "SourcePath" = "8:stdole.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -503,7 +503,7 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:FALSE"
+            "Exclude" = "11:TRUE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
@@ -616,15 +616,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:GO Contact Sync Mod"
-        "ProductCode" = "8:{60935927-2D24-4753-9902-296986141733}"
-        "PackageCode" = "8:{58EC96A6-39D8-49C2-B13F-85CC7BDC33AE}"
+        "ProductCode" = "8:{292EBCF8-CE4E-4B91-BD7F-031B00C3BCF6}"
+        "PackageCode" = "8:{28BD690E-066E-46B2-AE32-13F15823899F}"
         "UpgradeCode" = "8:{170B4620-F5BB-4D2E-97A1-239D79030F20}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:2.3"
+        "ProductVersion" = "8:3.4.2"
         "Manufacturer" = "8:WebGear, Create Software, Stru.be, saller.NET"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://googlesyncmod.sourceforge.net/"
@@ -778,7 +778,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_798D502AD8A84A668FE47568EA35FD15"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Progress"
+                    "DisplayName" = "8:Status"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"
@@ -823,7 +823,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_6446AF9ADE87475A86215903A9A029F2"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Welcome"
+                    "DisplayName" = "8:Willkommen"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"
@@ -872,7 +872,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_7B6D831D957541DFBD9CB979ACA9DA14"
                     {
                     "Sequence" = "3:300"
-                    "DisplayName" = "8:Confirm Installation"
+                    "DisplayName" = "8:Installation bestätigen"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"
@@ -895,7 +895,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8CF1DBE8409F4314B79DA786912F31BF"
                     {
                     "Sequence" = "3:220"
-                    "DisplayName" = "8:Installation Folder"
+                    "DisplayName" = "8:Installationsordner"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"
@@ -918,7 +918,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_DA74DE1924F44B7DBDA74B9BC54FBB22"
                     {
                     "Sequence" = "3:210"
-                    "DisplayName" = "8:License Agreement"
+                    "DisplayName" = "8:Lizenzvertrag"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminLicenseDlg.wid"
@@ -975,7 +975,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C735890B3EDF492481BA4710353C03E6"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Finished"
+                    "DisplayName" = "8:Fertig"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFinishedDlg.wid"
@@ -1007,7 +1007,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_57BF2CE534C546019D28C01BDF7C1D53"
                     {
                     "Sequence" = "3:110"
-                    "DisplayName" = "8:License Agreement"
+                    "DisplayName" = "8:Lizenzvertrag"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdLicenseDlg.wid"
@@ -1055,7 +1055,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_AFB55B0E17484458BA2BD5FA0765BF76"
                     {
                     "Sequence" = "3:200"
-                    "DisplayName" = "8:Installation Folder"
+                    "DisplayName" = "8:Installationsordner"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"
@@ -1091,7 +1091,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BB2923AE8C5D4CC78A3214E91705C560"
                     {
                     "Sequence" = "3:300"
-                    "DisplayName" = "8:Confirm Installation"
+                    "DisplayName" = "8:Installation bestätigen"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"
@@ -1114,7 +1114,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D0404B3EBC644059A923737BA3961EB4"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Welcome"
+                    "DisplayName" = "8:Willkommen"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"
@@ -1178,7 +1178,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_22B328A76C81473E864FBE671002BF41"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Finished"
+                    "DisplayName" = "8:Fertig"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"
@@ -1223,7 +1223,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BE954D72A8574059B73649E3C8A961AE"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Progress"
+                    "DisplayName" = "8:Status"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"
@@ -1272,7 +1272,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8A4A20DC9841455BB5FD97B9DF38A24E"
             {
-            "SourcePath" = "8:..\\GoogleContactsSync\\obj\\x86\\Release\\GOContactSync.exe"
+            "SourcePath" = "8:..\\GoogleContactsSync\\obj\\Release\\GOContactSync.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"


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

Revision: 157
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=157&view=rev
Author:   floriwan
Date:     2011-04-09 07:11:36 +0000 (Sat, 09 Apr 2011)

Log Message:
-----------
Improvement: added progress notifications (which contact is currently syncing or matching)

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactsMatcher.cs
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/ContactsMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/ContactsMatcher.cs	2011-04-06 13:43:40 UTC (rev 156)
+++ trunk/GoogleContactsSync/ContactsMatcher.cs	2011-04-09 07:11:36 UTC (rev 157)
@@ -19,6 +19,9 @@
 		/// </summary>
 		public static int TimeTolerance = 60 ;
 
+        public delegate void NotificationHandler(string message);
+        public static event NotificationHandler NotificationReceived;
+
 		/// <summary>
 		/// Matches outlook and google contact by a) google id b) properties.
 		/// </summary>
@@ -116,6 +119,8 @@
                     continue;
 				}                               
 
+                if (NotificationReceived != null)
+                    NotificationReceived(String.Format("Matching contact {0} of {1} by id: {2} ...", i, sync.OutlookContacts.Count, olc.FileAs));
 
 				//try to match this contact to one of google contacts
 				Outlook.UserProperty idProp = olc.UserProperties[sync.OutlookPropertyNameId];
@@ -191,6 +196,9 @@
             {
                 olc = outlookContactsWithoutOutlookGoogleId[i];
 
+                if (NotificationReceived != null)
+                    NotificationReceived(String.Format("Matching contact {0} of {1} by unique properties: {2} ...", i, outlookContactsWithoutOutlookGoogleId.Count, olc.FileAs));               
+
                 //no match found by id => match by common properties
                 //create a default match pair with just outlook contact.
                 ContactMatch match = new ContactMatch(olc, null);
@@ -408,9 +416,11 @@
 			//return result;
 
 			//for each google contact that's left (they will be nonmatched) create a new match pair without outlook contact. 
-			foreach (Contact entry in sync.GoogleContacts)
+			for (int i=0; i< sync.GoogleContacts.Count;i++)
 			{
-               
+               Contact entry = sync.GoogleContacts[i];
+               if (NotificationReceived != null)
+                    NotificationReceived(String.Format("Adding new Google contact {0} of {1} by unique properties: {2} ...", i, sync.GoogleContacts.Count, entry.Title));               
                     
 				// only match if there is either an email or mobile phone or a name else
 				// a matching google contact will be created at each sync
@@ -488,15 +498,21 @@
 
 		public static void SyncContacts(Syncronizer sync)
 		{
-			foreach (ContactMatch match in sync.Contacts)
-			{
-				SyncContact(match, sync);
-			}
+            for (int i = 0; i < sync.Contacts.Count; i++ )
+            {
+                ContactMatch match = sync.Contacts[i];
+                if (NotificationReceived != null)
+                {
+                    NotificationReceived(String.Format("Syncing contact {0} of {1}: {2} ...", i, sync.Contacts.Count, (match.OutlookContact!=null)?match.OutlookContact.FileAs:match.GoogleContact.Title));
+                }
+                SyncContact(match, sync);
+            }
 		}
 		public static void SyncContact(ContactMatch match, Syncronizer sync)
 		{
+
             if (match.GoogleContact == null && match.OutlookContact != null)
-            {
+            {                
                 //no google contact                               
                 Outlook.UserProperty idProp = match.OutlookContact.UserProperties[sync.OutlookPropertyNameId];
                 if (idProp != null && (string)idProp.Value != "")

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-04-06 13:43:40 UTC (rev 156)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-04-09 07:11:36 UTC (rev 157)
@@ -199,8 +199,9 @@
 				if (_sync == null)
 				{
 					_sync = new Syncronizer();
-					_sync.DuplicatesFound += new Syncronizer.NotificationHandler(_sync_DuplicatesFound);
-					_sync.ErrorEncountered += new Syncronizer.ErrorNotificationHandler(_sync_ErrorEncountered);
+					_sync.DuplicatesFound += new Syncronizer.DuplicatesFoundHandler(OnDuplicatesFound);
+					_sync.ErrorEncountered += new Syncronizer.ErrorNotificationHandler(OnErrorEncountered);
+                    ContactsMatcher.NotificationReceived += new ContactsMatcher.NotificationHandler(OnNotificationReceived);
 				}
 
 				Logger.ClearLog();
@@ -303,7 +304,7 @@
 			AppendSyncConsoleText(Message);
 		}
 
-		void _sync_ErrorEncountered(string title, Exception ex, EventType eventType)
+		void OnErrorEncountered(string title, Exception ex, EventType eventType)
 		{
 			// do not show ErrorHandler, as there may be multiple exceptions that would nag the user
 			Logger.Log(ex.ToString(), EventType.Error);
@@ -315,9 +316,9 @@
 			notifyIcon.ShowBalloonTip(5000);*/
 		}
 
-		void _sync_DuplicatesFound(string title, string message, EventType eventType)
+		void OnDuplicatesFound(string title, string message)
 		{
-            Logger.Log(message, eventType);
+            Logger.Log(message, EventType.Warning);
             ShowBalloonToolTip(title,message,ToolTipIcon.Warning,5000);
             /*
 			notifyIcon.BalloonTipTitle = title;
@@ -327,6 +328,11 @@
              */
 		}
 
+        void OnNotificationReceived(string message)
+        {
+            SetLastSyncText(message);           
+        }
+
 		public void SetFormEnabled(bool enabled)
 		{
 			if (this.InvokeRequired)

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-04-06 13:43:40 UTC (rev 156)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-04-09 07:11:36 UTC (rev 157)
@@ -62,11 +62,12 @@
         }
 
 
-		public delegate void NotificationHandler(string title, string message, EventType eventType);
+		public delegate void DuplicatesFoundHandler(string title, string message);
 		public delegate void ErrorNotificationHandler(string title, Exception ex, EventType eventType);
-		public event NotificationHandler DuplicatesFound;
+		public event DuplicatesFoundHandler DuplicatesFound;
 		public event ErrorNotificationHandler ErrorEncountered;
 
+
 		private ContactsRequest _googleService;
 		public ContactsRequest GoogleService
 		{
@@ -504,9 +505,9 @@
 			{
 				
 				if (DuplicatesFound != null)
-					DuplicatesFound("Google duplicates found", duplicateDataException.Message, EventType.Error);
+                    DuplicatesFound("Google duplicates found", duplicateDataException.Message);
                 else
-                    Logger.Log(duplicateDataException.Message, EventType.Error);
+                    Logger.Log(duplicateDataException.Message, EventType.Warning);
 			}
 		}
 


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

Revision: 170
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=170&view=rev
Author:   floriwan
Date:     2011-04-13 07:57:48 +0000 (Wed, 13 Apr 2011)

Log Message:
-----------
changed version to 3.5.0

Modified Paths:
--------------
    trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
    trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj

Modified: trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
===================================================================
--- trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-04-13 06:17:45 UTC (rev 169)
+++ trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-04-13 07:57:48 UTC (rev 170)
@@ -31,6 +31,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.4.2.*")]
-//[assembly: AssemblyFileVersion("3.4.2")]
+[assembly: AssemblyVersion("3.5.0.*")]
+//[assembly: AssemblyFileVersion("3.5.0")]
 [assembly: NeutralResourcesLanguageAttribute("en-GB")]

Modified: trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj
===================================================================
--- trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2011-04-13 06:17:45 UTC (rev 169)
+++ trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2011-04-13 07:57:48 UTC (rev 170)
@@ -39,74 +39,74 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_2A05495146BEA351539361819DF18624"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "MsmKey" = "8:_449A09D626FD4A6C9AEE1F387A23D13C"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_2A05495146BEA351539361819DF18624"
-        "OwnerKey" = "8:_5176FF745326FDD70F5E875159AF95D0"
+        "MsmKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_2A05495146BEA351539361819DF18624"
-        "OwnerKey" = "8:_6727E4B2FF08F5E009578BCA710339E3"
+        "MsmKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_449A09D626FD4A6C9AEE1F387A23D13C"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_5176FF745326FDD70F5E875159AF95D0"
-        "OwnerKey" = "8:_6727E4B2FF08F5E009578BCA710339E3"
+        "MsmKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
+        "OwnerKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_5176FF745326FDD70F5E875159AF95D0"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "MsmKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
+        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_6727E4B2FF08F5E009578BCA710339E3"
-        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
+        "MsmKey" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
+        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
-        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
+        "MsmKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
+        "OwnerKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A131A9765CDF4FB18FC170D9BCFC2F20"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
+        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
-        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
+        "MsmKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
+        "OwnerKey" = "8:_8A4A20DC9841455BB5FD97B9DF38A24E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
-        "OwnerKey" = "8:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
+        "MsmKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
+        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -130,31 +130,31 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
+        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
+        "OwnerKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_6727E4B2FF08F5E009578BCA710339E3"
+        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_5176FF745326FDD70F5E875159AF95D0"
+        "OwnerKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_2A05495146BEA351539361819DF18624"
+        "OwnerKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -338,37 +338,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2A05495146BEA351539361819DF18624"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Client, Version=1.7.0.17769, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_2A05495146BEA351539361819DF18624"
-                    {
-                    "Name" = "8:Google.GData.Client.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Google.GData.Client.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_449A09D626FD4A6C9AEE1F387A23D13C"
             {
             "SourcePath" = "8:..\\GoogleContactsSync\\contacts-sync.ico"
@@ -389,20 +358,20 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5176FF745326FDD70F5E875159AF95D0"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6EC35BE8EF1AAED05EABD0848EEEB700"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Extensions, Version=1.7.0.17770, Culture=neutral, PublicKeyToken=0b4c5df2ebf20876, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Contacts, Version=1.7.0.17771, Culture=neutral, PublicKeyToken=7e065189dd4b982f, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_5176FF745326FDD70F5E875159AF95D0"
+                    "_6EC35BE8EF1AAED05EABD0848EEEB700"
                     {
-                    "Name" = "8:Google.GData.Extensions.dll"
+                    "Name" = "8:Google.GData.Contacts.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Google.GData.Extensions.dll"
+            "SourcePath" = "8:Google.GData.Contacts.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -420,20 +389,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6727E4B2FF08F5E009578BCA710339E3"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_91E364B39302FB8247F82D5FA41F951E"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Google.GData.Contacts, Version=1.7.0.17771, Culture=neutral, PublicKeyToken=7e065189dd4b982f, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Client, Version=1.7.0.17769, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_6727E4B2FF08F5E009578BCA710339E3"
+                    "_91E364B39302FB8247F82D5FA41F951E"
                     {
-                    "Name" = "8:Google.GData.Contacts.dll"
+                    "Name" = "8:Google.GData.Client.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:Google.GData.Contacts.dll"
+            "SourcePath" = "8:Google.GData.Client.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -451,20 +420,40 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A131A9765CDF4FB18FC170D9BCFC2F20"
             {
+            "SourcePath" = "8:install-banner.jpg"
+            "TargetName" = "8:install-banner.jpg"
+            "Tag" = "8:"
+            "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A2D96859CE406F76F4F0818B2813AE72"
+            {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:TRUE"
-            "AssemblyAsmDisplayName" = "8:office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
                 "ScatterAssemblies"
                 {
-                    "_9B5DC5D715B4971C5D9D7ED2D1D2EDD3"
+                    "_A2D96859CE406F76F4F0818B2813AE72"
                     {
-                    "Name" = "8:office.dll"
+                    "Name" = "8:stdole.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:office.dll"
+            "SourcePath" = "8:stdole.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -478,14 +467,25 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:FALSE"
+            "Exclude" = "11:TRUE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A131A9765CDF4FB18FC170D9BCFC2F20"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E4E9E9D12EE20858632E2D09D30DCA43"
             {
-            "SourcePath" = "8:install-banner.jpg"
-            "TargetName" = "8:install-banner.jpg"
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Google.GData.Extensions, Version=1.7.0.17770, Culture=neutral, PublicKeyToken=0b4c5df2ebf20876, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_E4E9E9D12EE20858632E2D09D30DCA43"
+                    {
+                    "Name" = "8:Google.GData.Extensions.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Google.GData.Extensions.dll"
+            "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
             "Condition" = "8:"
@@ -498,24 +498,24 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:TRUE"
-            "IsDependency" = "11:FALSE"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A2D96859CE406F76F4F0818B2813AE72"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E695CBDD605E1061614DA23AB6EED043"
             {
             "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:TRUE"
-            "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_A2D96859CE406F76F4F0818B2813AE72"
+                    "_E695CBDD605E1061614DA23AB6EED043"
                     {
-                    "Name" = "8:stdole.dll"
+                    "Name" = "8:office.DLL"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:stdole.dll"
+            "SourcePath" = "8:office.DLL"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"
@@ -529,7 +529,7 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:TRUE"
+            "Exclude" = "11:FALSE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
@@ -642,15 +642,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:GO Contact Sync Mod"
-        "ProductCode" = "8:{292EBCF8-CE4E-4B91-BD7F-031B00C3BCF6}"
-        "PackageCode" = "8:{4EBAAE57-19B8-4EAB-9BBD-AF953875F68C}"
+        "ProductCode" = "8:{7F54085B-8426-4416-A229-793D70432FEB}"
+        "PackageCode" = "8:{851F32AF-6C4E-497B-B2CF-B77D49D92D3F}"
         "UpgradeCode" = "8:{170B4620-F5BB-4D2E-97A1-239D79030F20}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:3.4.2"
+        "ProductVersion" = "8:3.5.0"
         "Manufacturer" = "8:WebGear, Create Software, Stru.be, saller.NET"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://googlesyncmod.sourceforge.net/"
@@ -804,7 +804,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_798D502AD8A84A668FE47568EA35FD15"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Status"
+                    "DisplayName" = "8:Progress"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"
@@ -849,7 +849,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_6446AF9ADE87475A86215903A9A029F2"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Willkommen"
+                    "DisplayName" = "8:Welcome"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"
@@ -898,7 +898,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_7B6D831D957541DFBD9CB979ACA9DA14"
                     {
                     "Sequence" = "3:300"
-                    "DisplayName" = "8:Installation bestätigen"
+                    "DisplayName" = "8:Confirm Installation"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"
@@ -921,7 +921,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8CF1DBE8409F4314B79DA786912F31BF"
                     {
                     "Sequence" = "3:220"
-                    "DisplayName" = "8:Installationsordner"
+                    "DisplayName" = "8:Installation Folder"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"
@@ -944,7 +944,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_DA74DE1924F44B7DBDA74B9BC54FBB22"
                     {
                     "Sequence" = "3:210"
-                    "DisplayName" = "8:Lizenzvertrag"
+                    "DisplayName" = "8:License Agreement"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminLicenseDlg.wid"
@@ -1001,7 +1001,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C735890B3EDF492481BA4710353C03E6"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Fertig"
+                    "DisplayName" = "8:Finished"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFinishedDlg.wid"
@@ -1033,7 +1033,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_57BF2CE534C546019D28C01BDF7C1D53"
                     {
                     "Sequence" = "3:110"
-                    "DisplayName" = "8:Lizenzvertrag"
+                    "DisplayName" = "8:License Agreement"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdLicenseDlg.wid"
@@ -1081,7 +1081,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_AFB55B0E17484458BA2BD5FA0765BF76"
                     {
                     "Sequence" = "3:200"
-                    "DisplayName" = "8:Installationsordner"
+                    "DisplayName" = "8:Installation Folder"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"
@@ -1117,7 +1117,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BB2923AE8C5D4CC78A3214E91705C560"
                     {
                     "Sequence" = "3:300"
-                    "DisplayName" = "8:Installation bestätigen"
+                    "DisplayName" = "8:Confirm Installation"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"
@@ -1140,7 +1140,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D0404B3EBC644059A923737BA3961EB4"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Willkommen"
+                    "DisplayName" = "8:Welcome"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"
@@ -1204,7 +1204,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_22B328A76C81473E864FBE671002BF41"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Fertig"
+                    "DisplayName" = "8:Finished"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"
@@ -1249,7 +1249,7 @@
                     "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_BE954D72A8574059B73649E3C8A961AE"
                     {
                     "Sequence" = "3:100"
-                    "DisplayName" = "8:Status"
+                    "DisplayName" = "8:Progress"
                     "UseDynamicProperties" = "11:TRUE"
                     "IsDependency" = "11:FALSE"
                     "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"
@@ -1298,7 +1298,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8A4A20DC9841455BB5FD97B9DF38A24E"
             {
-            "SourcePath" = "8:..\\GoogleContactsSync\\obj\\Release\\GOContactSync.exe"
+            "SourcePath" = "8:..\\GoogleContactsSync\\obj\\x86\\Release\\GOContactSync.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_5F08081D58314698A5EF7B2D88DBA295"


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

Revision: 173
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=173&view=rev
Author:   floriwan
Date:     2011-04-15 05:36:41 +0000 (Fri, 15 Apr 2011)

Log Message:
-----------
FIX: added a catch to the try block where the AccessViolation occurs and return the original Email address, if it couldn't be parsed by your approach. By that we are fail safe, even if your new bug fix fails, at least the previous behavior to return the original scrumbled email address (/o=xxxx/ou=xxxx/cn=Recipients/cn=xxxx), it will only log an error and continue with the next entry.

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactPropertiesUtils.cs
    trunk/GoogleContactsSync/Properties/AssemblyInfo.cs

Modified: trunk/GoogleContactsSync/ContactPropertiesUtils.cs
===================================================================
--- trunk/GoogleContactsSync/ContactPropertiesUtils.cs	2011-04-14 21:44:02 UTC (rev 172)
+++ trunk/GoogleContactsSync/ContactPropertiesUtils.cs	2011-04-15 05:36:41 UTC (rev 173)
@@ -305,6 +305,11 @@
                                             Logger.Log(string.Format("Unsupported AddressEntryUserType {0} for contact '{1}'.", addressEntry.AddressEntryUserType, outlookContactItem.FileAs), EventType.Debug);
                                         }
                                     }
+                                    catch (Exception ex)
+                                    {
+                                        Logger.Log("Error getting the email address from Exchange: " + ex.Message, EventType.Warning);
+                                        return emailAddress;
+                                    }
                                     finally
                                     {
                                         Marshal.ReleaseComObject(addressEntry);

Modified: trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
===================================================================
--- trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-04-14 21:44:02 UTC (rev 172)
+++ trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-04-15 05:36:41 UTC (rev 173)
@@ -31,6 +31,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.5.0.*")]
-//[assembly: AssemblyFileVersion("3.5.0")]
+[assembly: AssemblyVersion("3.5.1.*")]
+//[assembly: AssemblyFileVersion("3.5.1")]
 [assembly: NeutralResourcesLanguageAttribute("en-GB")]


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

Revision: 174
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=174&view=rev
Author:   floriwan
Date:     2011-04-15 09:28:54 +0000 (Fri, 15 Apr 2011)

Log Message:
-----------
FIX: Enhanced error message with contact and emailAddress, if problem when parsing Exchange Email

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactPropertiesUtils.cs
    trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj

Modified: trunk/GoogleContactsSync/ContactPropertiesUtils.cs
===================================================================
--- trunk/GoogleContactsSync/ContactPropertiesUtils.cs	2011-04-15 05:36:41 UTC (rev 173)
+++ trunk/GoogleContactsSync/ContactPropertiesUtils.cs	2011-04-15 09:28:54 UTC (rev 174)
@@ -304,12 +304,7 @@
                                         {
                                             Logger.Log(string.Format("Unsupported AddressEntryUserType {0} for contact '{1}'.", addressEntry.AddressEntryUserType, outlookContactItem.FileAs), EventType.Debug);
                                         }
-                                    }
-                                    catch (Exception ex)
-                                    {
-                                        Logger.Log("Error getting the email address from Exchange: " + ex.Message, EventType.Warning);
-                                        return emailAddress;
-                                    }
+                                    }                                    
                                     finally
                                     {
                                         Marshal.ReleaseComObject(addressEntry);
@@ -323,13 +318,21 @@
                                 Marshal.ReleaseComObject(recipient);
                         }
                     }
+                    catch (Exception ex)
+                    {
+                        // Fallback: If Exchange cannot give us the SMTP address, we give up and use the Exchange address format.
+                        // TODO: Can we do better?
+                        Logger.Log(string.Format("Error getting the email address of outlook contact '{0}' from Exchange format '{1}': {2}", outlookContactItem.FileAs, emailAddress, ex.Message), EventType.Warning);
+                        return emailAddress;
+                    }
                     finally
                     {
                         if (outlookNameSpace != null)
                             Marshal.ReleaseComObject(outlookNameSpace);
                     }
+
                     // Fallback: If Exchange cannot give us the SMTP address, we give up and use the Exchange address format.
-                    // TODO: Can we do better?
+                    // TODO: Can we do better?                   
                     return emailAddress;
 
                 case "SMTP":

Modified: trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj
===================================================================
--- trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2011-04-15 05:36:41 UTC (rev 173)
+++ trunk/GoogleContactsSyncSetup/GoogleContactsSyncSetup.vdproj	2011-04-15 09:28:54 UTC (rev 174)
@@ -64,13 +64,13 @@
         "Entry"
         {
         "MsmKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
-        "OwnerKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
+        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
-        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
+        "OwnerKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -124,37 +124,37 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
+        "OwnerKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
+        "OwnerKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
+        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_6EC35BE8EF1AAED05EABD0848EEEB700"
+        "OwnerKey" = "8:_E695CBDD605E1061614DA23AB6EED043"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_E4E9E9D12EE20858632E2D09D30DCA43"
+        "OwnerKey" = "8:_06C9B16F19D14FD3B3FA194D0586E047"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_91E364B39302FB8247F82D5FA41F951E"
+        "OwnerKey" = "8:_A2D96859CE406F76F4F0818B2813AE72"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -365,11 +365,6 @@
             "AssemblyAsmDisplayName" = "8:Google.GData.Contacts, Version=1.7.0.17771, Culture=neutral, PublicKeyToken=7e065189dd4b982f, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_6EC35BE8EF1AAED05EABD0848EEEB700"
-                    {
-                    "Name" = "8:Google.GData.Contacts.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:Google.GData.Contacts.dll"
             "TargetName" = "8:"
@@ -396,11 +391,6 @@
             "AssemblyAsmDisplayName" = "8:Google.GData.Client, Version=1.7.0.17769, Culture=neutral, PublicKeyToken=04a59ca9b0273830, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_91E364B39302FB8247F82D5FA41F951E"
-                    {
-                    "Name" = "8:Google.GData.Client.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:Google.GData.Client.dll"
             "TargetName" = "8:"
@@ -478,11 +468,6 @@
             "AssemblyAsmDisplayName" = "8:Google.GData.Extensions, Version=1.7.0.17770, Culture=neutral, PublicKeyToken=0b4c5df2ebf20876, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_E4E9E9D12EE20858632E2D09D30DCA43"
-                    {
-                    "Name" = "8:Google.GData.Extensions.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:Google.GData.Extensions.dll"
             "TargetName" = "8:"
@@ -509,11 +494,6 @@
             "AssemblyAsmDisplayName" = "8:office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_E695CBDD605E1061614DA23AB6EED043"
-                    {
-                    "Name" = "8:office.DLL"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:office.DLL"
             "TargetName" = "8:"
@@ -642,15 +622,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:GO Contact Sync Mod"
-        "ProductCode" = "8:{7F54085B-8426-4416-A229-793D70432FEB}"
-        "PackageCode" = "8:{851F32AF-6C4E-497B-B2CF-B77D49D92D3F}"
+        "ProductCode" = "8:{82126A52-6AB6-4D1B-A89C-8F1C7790B55A}"
+        "PackageCode" = "8:{DE322831-8FA9-48E5-8D4B-AC545AC6D9C8}"
         "UpgradeCode" = "8:{170B4620-F5BB-4D2E-97A1-239D79030F20}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:3.5.0"
+        "ProductVersion" = "8:3.5.1"
         "Manufacturer" = "8:WebGear, Create Software, Stru.be, saller.NET"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://googlesyncmod.sourceforge.net/"


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

Revision: 176
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=176&view=rev
Author:   floriwan
Date:     2011-04-16 07:07:16 +0000 (Sat, 16 Apr 2011)

Log Message:
-----------
FIX: added NullExceptionReference handling for MarshalObject and FindPhone

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactsMatcher.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/ContactsMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/ContactsMatcher.cs	2011-04-15 09:30:19 UTC (rev 175)
+++ trunk/GoogleContactsSync/ContactsMatcher.cs	2011-04-16 07:07:16 UTC (rev 176)
@@ -752,9 +752,12 @@
             if (string.IsNullOrEmpty(number))
                 return null;
 
+            if (phones == null)
+                return null;
+
             foreach (PhoneNumber phone in phones)
             {
-                if (phone.Value.Equals(number, StringComparison.InvariantCultureIgnoreCase))
+                if (phone != null && number.Equals(phone.Value, StringComparison.InvariantCultureIgnoreCase))
                 {
                     return phone;
                 }

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-04-15 09:30:19 UTC (rev 175)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-04-16 07:07:16 UTC (rev 176)
@@ -624,8 +624,11 @@
                 }
                 finally
                 {
-                    Marshal.ReleaseComObject(_outlookContacts);
-                    _outlookContacts = null;
+                    if (_outlookContacts != null)
+                    {
+                        Marshal.ReleaseComObject(_outlookContacts);
+                        _outlookContacts = null;
+                    }
                     _googleContacts = null;
                     _outlookContactDuplicates = null;
                     _googleContactDuplicates = null;
@@ -1244,8 +1247,11 @@
             }
             finally
             {
-                Marshal.ReleaseComObject(_outlookContacts);
-                _outlookContacts = null;
+                if (_outlookContacts != null)
+                {
+                    Marshal.ReleaseComObject(_outlookContacts);
+                    _outlookContacts = null;
+                }
                 _googleContacts = null;
             }
 						


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

Revision: 186
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=186&view=rev
Author:   floriwan
Date:     2011-07-10 13:19:37 +0000 (Sun, 10 Jul 2011)

Log Message:
-----------
added NotesSync (not working yet, but first draft)

Added Paths:
-----------
    trunk/GoogleContactsSync/NotePropertiesUtils.cs
    trunk/GoogleContactsSync/NotesMatcher.cs

Added: trunk/GoogleContactsSync/NotePropertiesUtils.cs
===================================================================
--- trunk/GoogleContactsSync/NotePropertiesUtils.cs	                        (rev 0)
+++ trunk/GoogleContactsSync/NotePropertiesUtils.cs	2011-07-10 13:19:37 UTC (rev 186)
@@ -0,0 +1,252 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Outlook = Microsoft.Office.Interop.Outlook;
+using Google.GData.Extensions;
+using System.Collections;
+using Google.Documents;
+using System.Runtime.InteropServices;
+
+namespace GoContactSyncMod
+{
+    internal static class NotePropertiesUtils
+    {
+        public static string GetOutlookId(Outlook.NoteItem outlookNote)
+        {
+            return outlookNote.EntryID;
+        }
+        public static string GetGoogleId(Document googleNote)
+        {
+            string id = googleNote.Id.ToString();
+            if (id == null)
+                throw new Exception();
+            return id;
+        }
+
+        //public static void SetGoogleOutlookNoteId(string syncProfile, Document googleNote, Outlook.NoteItem outlookNote)
+        //{
+        //    if (outlookNote.EntryID == null)
+        //        throw new Exception("Must save outlook note before getting id");
+
+        //    SetGoogleOutlookNoteId(syncProfile, googleNote, GetOutlookId(outlookNote));
+        //}
+        //public static void SetGoogleOutlookNoteId(string syncProfile, Document googleNote, string outlookNoteId)
+        //{
+        //    // check if exists
+        //    bool found = false;
+        //    foreach (Google.GData.Extensions.ExtendedProperty p in googleNote.ExtendedProperties)
+        //    {
+        //        if (p.Name == "gos:oid:" + syncProfile + "")
+        //        {
+        //            p.Value = outlookNoteId;
+        //            found = true;
+        //            break;
+        //        }
+        //    }
+        //    if (!found)
+        //    {
+        //        Google.GData.Extensions.ExtendedProperty prop = new ExtendedProperty(outlookNoteId, "gos:oid:" + syncProfile + "");
+        //        prop.Value = outlookNoteId;
+        //        googleNote.ExtendedProperties.Add(prop);
+        //    }
+
+        //}
+        //public static string GetGoogleOutlookNoteId(string syncProfile, Document googleNote)
+        //{
+        //    // get extended prop
+        //    foreach (Google.GData.Extensions.ExtendedProperty p in googleNote.DocumentEntry.ExtendedProperties)
+        //    {
+        //        if (p.Name == "gos:oid:" + syncProfile + "")
+        //            return (string)p.Value;
+        //    }
+        //    return null;
+        //}
+        //public static void ResetGoogleOutlookNoteId(string syncProfile, Document googleNote)
+        //{
+        //    // get extended prop
+        //    foreach (Google.GData.Extensions.ExtendedProperty p in googleNote.ExtendedProperties)
+        //    {
+        //        if (p.Name == "gos:oid:" + syncProfile + "")
+        //        {
+        //            // remove 
+        //            googleNote.ExtendedProperties.Remove(p);
+        //            return;
+        //        }
+        //    }
+        //}
+
+        /// <summary>
+        /// Sets the syncId of the Outlook note and the last sync date. 
+        /// Please assure to always call this function when saving OutlookItem
+        /// </summary>
+        /// <param name="sync"></param>
+        /// <param name="outlookNote"></param>
+        /// <param name="googleNote"></param>
+        public static void SetOutlookGoogleNoteId(Syncronizer sync, Outlook.NoteItem outlookNote, Document googleNote)
+        {
+            if (googleNote.DocumentEntry.Id.Uri == null)
+                throw new NullReferenceException("GoogleNote must have a valid Id");
+
+            //check if outlook note aready has google id property.
+            Outlook.ItemProperties userProperties = outlookNote.ItemProperties;
+            try
+            {
+                Outlook.ItemProperty prop = userProperties[sync.OutlookPropertyNameId];
+                if (prop == null)
+                    prop = userProperties.Add(sync.OutlookPropertyNameId, Outlook.OlUserPropertyType.olText, true);
+                try
+                {
+                    prop.Value = googleNote.DocumentEntry.Id.Uri.Content;
+                }
+                finally
+                {
+                    Marshal.ReleaseComObject(prop);
+                }
+            }
+            finally
+            {
+                Marshal.ReleaseComObject(userProperties);
+            }
+
+            //save last google's updated date as property
+            /*prop = outlookNote.UserProperties[OutlookPropertyNameUpdated];
+            if (prop == null)
+                prop = outlookNote.UserProperties.Add(OutlookPropertyNameUpdated, Outlook.OlUserPropertyType.olDateTime, null, null);
+            prop.Value = googleNote.Updated;*/
+
+            //Also set the OutlookLastSync date when setting a match between Outlook and Google to assure the lastSync updated when Outlook note is saved afterwards
+            SetOutlookLastSync(sync, outlookNote);
+        }
+
+        public static void SetOutlookLastSync(Syncronizer sync, Outlook.NoteItem outlookNote)
+        {
+            //save sync datetime
+            Outlook.ItemProperties userProperties = outlookNote.ItemProperties;
+            try
+            {
+                Outlook.ItemProperty prop = userProperties[sync.OutlookPropertyNameSynced];
+                if (prop == null)
+                    prop = userProperties.Add(sync.OutlookPropertyNameSynced, Outlook.OlUserPropertyType.olDateTime, true);
+                try
+                {
+                    prop.Value = DateTime.Now;
+                }
+                finally
+                {
+                    Marshal.ReleaseComObject(prop);
+                }
+            }
+            finally
+            {
+                Marshal.ReleaseComObject(userProperties);
+            }
+        }
+
+        public static DateTime? GetOutlookLastSync(Syncronizer sync, Outlook.NoteItem outlookNote)
+        {
+            DateTime? result = null;
+            Outlook.ItemProperties userProperties = outlookNote.ItemProperties;
+            try
+            {
+                Outlook.ItemProperty prop = userProperties[sync.OutlookPropertyNameSynced];
+                if (prop != null)
+                {
+                    try
+                    {
+                        result = (DateTime)prop.Value;
+                    }
+                    finally
+                    {
+                        Marshal.ReleaseComObject(prop);
+                    }
+                }
+            }
+            finally
+            {
+                Marshal.ReleaseComObject(userProperties);
+            }
+            return result;
+        }
+        public static string GetOutlookGoogleNoteId(Syncronizer sync, Outlook.NoteItem outlookNote)
+        {
+            string id = null;
+            Outlook.ItemProperties userProperties = outlookNote.ItemProperties;
+            try
+            {
+                Outlook.ItemProperty idProp = userProperties[sync.OutlookPropertyNameId];
+                if (idProp != null)
+                {
+                    try
+                    {
+                        id = (string)idProp.Value;
+                        if (id == null)
+                            throw new Exception();
+                    }
+                    finally
+                    {
+                        Marshal.ReleaseComObject(idProp);
+                    }
+                }
+            }
+            finally
+            {
+                Marshal.ReleaseComObject(userProperties);
+            }
+            return id;
+        }
+        //public static void ResetOutlookGoogleNoteId(Syncronizer sync, Outlook.NoteItem outlookNote)
+        //{
+        //    Outlook.UserProperties userProperties = outlookNote.UserProperties;
+        //    try
+        //    {
+        //        Outlook.UserProperty idProp = userProperties[sync.OutlookPropertyNameId];
+        //        try
+        //        {
+        //            Outlook.UserProperty lastSyncProp = userProperties[sync.OutlookPropertyNameSynced];
+        //            try
+        //            {
+        //                if (idProp == null && lastSyncProp == null)
+        //                    return;
+
+        //                List<int> indexesToBeRemoved = new List<int>();
+        //                IEnumerator en = userProperties.GetEnumerator();
+        //                en.Reset();
+        //                int index = 1; // 1 based collection            
+        //                while (en.MoveNext())
+        //                {
+        //                    Outlook.UserProperty userProperty = en.Current as Outlook.UserProperty;
+        //                    if (userProperty == idProp || userProperty == lastSyncProp)
+        //                    {
+        //                        indexesToBeRemoved.Add(index);
+        //                        //outlookNote.UserProperties.Remove(index);
+        //                        //Don't return to remove both properties, googleId and lastSynced
+        //                        //return;
+        //                    }
+        //                    index++;
+        //                    Marshal.ReleaseComObject(userProperty);
+        //                }
+
+        //                for (int i = indexesToBeRemoved.Count - 1; i >= 0; i--)
+        //                    userProperties.Remove(indexesToBeRemoved[i]);
+        //                //throw new Exception("Did not find prop.");
+        //            }
+        //            finally
+        //            {
+        //                if (lastSyncProp != null)
+        //                    Marshal.ReleaseComObject(lastSyncProp);
+        //            }
+        //        }
+        //        finally
+        //        {
+        //            if (idProp != null)
+        //                Marshal.ReleaseComObject(idProp);
+        //        }
+        //    }
+        //    finally
+        //    {
+        //        Marshal.ReleaseComObject(userProperties);
+        //    }
+        //}
+                
+    }
+}

Added: trunk/GoogleContactsSync/NotesMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/NotesMatcher.cs	                        (rev 0)
+++ trunk/GoogleContactsSync/NotesMatcher.cs	2011-07-10 13:19:37 UTC (rev 186)
@@ -0,0 +1,697 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Google.GData.Client;
+using Google.GData.Extensions;
+using Outlook = Microsoft.Office.Interop.Outlook;
+using Google.Documents;
+using System.Runtime.InteropServices;
+
+namespace GoContactSyncMod
+{
+    internal static class NotesMatcher
+    {
+        /// <summary>
+        /// Time tolerance in seconds - used when comparing date modified.
+        /// Less than 60 seconds doesn't make sense, as the lastSync is saved without seconds and if it is compared
+        /// with the LastUpdate dates of Google and Outlook, in the worst case you compare e.g. 15:59 with 16:00 and 
+        /// after truncating to minutes you compare 15:00 wiht 16:00
+        /// </summary>
+        public static int TimeTolerance = 60;
+
+        public delegate void NotificationHandler(string message);
+        public static event NotificationHandler NotificationReceived;
+
+        /// <summary>
+        /// Matches outlook and google note by a) google id b) properties.
+        /// </summary>
+        /// <param name="outlookNotes"></param>
+        /// <param name="googleNotes"></param>
+        /// <returns>Returns a list of match pairs (outlook note + google note) for all note. Those that weren't matche will have it's peer set to null</returns>
+        public static List<NoteMatch> MatchNotes(Syncronizer sync)
+        {
+            Logger.Log("Matching Outlook and Google notes...", EventType.Information);
+            List<NoteMatch> result = new List<NoteMatch>();
+
+            //string duplicateGoogleMatches = "";
+            //string duplicateOutlookNotes = "";
+            //sync.GoogleNoteDuplicates = new Collection<NoteMatch>();
+            //sync.OutlookNoteDuplicates = new Collection<NoteMatch>();
+
+            List<string> skippedOutlookIds = new List<string>();
+
+            //for each outlook note try to get google note id from user properties
+            //if no match - try to match by properties
+            //if no match - create a new match pair without google note. 
+            //foreach (Outlook._NoteItem olc in outlookNotes)
+            Collection<Outlook.NoteItem> outlookNotesWithoutOutlookGoogleId = new Collection<Outlook.NoteItem>();
+            #region Match first all outlookNotes by sync id
+            for (int i = 1; i <= sync.OutlookNotes.Count; i++)
+            {
+                Outlook.NoteItem oln = null;
+                try
+                {
+                    oln = sync.OutlookNotes[i] as Outlook.NoteItem;
+                    if (oln == null)
+                    {
+                        Logger.Log("Empty Outlook note found. Skipping", EventType.Warning);
+                        sync.SkippedCount++;
+                        sync.SkippedCountNotMatches++;
+                        continue;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    //this is needed because some notes throw exceptions
+                    Logger.Log("Accessing Outlook note threw and exception. Skipping: " + ex.Message, EventType.Warning);
+                    sync.SkippedCount++;
+                    sync.SkippedCountNotMatches++;
+                    continue;
+                }
+
+                //try
+                //{
+                    
+                    if (NotificationReceived != null)
+                        NotificationReceived(String.Format("Matching note {0} of {1} by id: {2} ...", i, sync.OutlookNotes.Count, oln.Subject));
+
+                    // Create our own info object to go into collections/lists, so we can free the Outlook objects and not run out of resources / exceed policy limits.
+                    //OutlookNoteInfo olci = new OutlookNoteInfo(oln, sync);
+
+                    //try to match this note to one of google notes
+                    Outlook.ItemProperties userProperties = oln.ItemProperties;
+                    Outlook.ItemProperty idProp = userProperties[sync.OutlookPropertyNameId];
+                    try
+                    {
+                        if (idProp != null)
+                        {
+                            string googleNoteId = string.Copy((string)idProp.Value);
+                            Document foundNote = sync.GetGoogleNoteById(googleNoteId);
+                            NoteMatch match = new NoteMatch(oln, null);
+
+                            //Check first, that this is not a duplicate 
+                            //e.g. by copying an existing Outlook note
+                            //or by Outlook checked this as duplicate, but the user selected "Add new"
+                        //    Collection<OutlookNoteInfo> duplicates = sync.OutlookNoteByProperty(sync.OutlookPropertyNameId, googleNoteId);
+                        //    if (duplicates.Count > 1)
+                        //    {
+                        //        foreach (OutlookNoteInfo duplicate in duplicates)
+                        //        {
+                        //            if (!string.IsNullOrEmpty(googleNoteId))
+                        //            {
+                        //                Logger.Log("Duplicate Outlook note found, resetting match and try to match again: " + duplicate.FileAs, EventType.Warning);
+                        //                idProp.Value = "";
+                        //            }
+                        //        }
+
+                        //        if (foundNote != null && !foundNote.Deleted)
+                        //        {
+                        //            NotePropertiesUtils.ResetGoogleOutlookNoteId(sync.SyncProfile, foundNote);
+                        //        }
+
+                        //        outlookNotesWithoutOutlookGoogleId.Add(olci);
+                        //    }
+                        //    else
+                        //    {
+
+                            if (foundNote != null)
+                            {
+                                //we found a match by google id, that is not deleted yet
+                                match.AddGoogleNote(foundNote);
+                                result.Add(match);
+                                //Remove the note from the list to not sync it twice
+                                sync.GoogleNotes.Remove(foundNote);
+                            }
+                            else
+                            {
+                                ////If no match found, is the note either deleted on Google side or was a copy on Outlook side 
+                                ////If it is a copy on Outlook side, the idProp.Value must be emptied to assure, the note is created on Google side and not deleted on Outlook side
+                                ////bool matchIsDuplicate = false;
+                                //foreach (NoteMatch existingMatch in result)
+                                //{
+                                //    if (existingMatch.OutlookNote.UserProperties[sync.OutlookPropertyNameId].Value.Equals(idProp.Value))
+                                //    {
+                                //        //matchIsDuplicate = true;
+                                //        idProp.Value = "";
+                                //        break;
+                                //    }
+
+                                //}
+                                outlookNotesWithoutOutlookGoogleId.Add(oln);
+
+                                //if (!matchIsDuplicate)
+                                //    result.Add(match);
+                            }
+                        //    }
+                        }
+                        else
+                            outlookNotesWithoutOutlookGoogleId.Add(oln);
+                    }
+                    finally
+                    {
+                        if (idProp != null)
+                            Marshal.ReleaseComObject(idProp);
+                        Marshal.ReleaseComObject(userProperties);
+                    }
+                //}
+
+                //finally
+                //{
+                //    Marshal.ReleaseComObject(oln);
+                //    oln = null;
+                //}
+
+            }
+            #endregion
+            #region Match the remaining notes by properties
+
+            for (int i = 0; i < outlookNotesWithoutOutlookGoogleId.Count; i++)
+            {
+                Outlook.NoteItem oln = outlookNotesWithoutOutlookGoogleId[i];
+
+                if (NotificationReceived != null)
+                    NotificationReceived(String.Format("Matching note {0} of {1} by unique properties: {2} ...", i + 1, outlookNotesWithoutOutlookGoogleId.Count, oln.Subject));
+
+                //no match found by id => match by subject/title
+                //create a default match pair with just outlook note.
+                NoteMatch match = new NoteMatch(oln, null);
+
+                //foreach google contac try to match and create a match pair if found some match(es)
+                for (int j = sync.GoogleNotes.Count - 1; j >= 0; j--)
+                {
+                    Document entry = sync.GoogleNotes[j];                    
+
+                    // only match if there is either an email or telephone or else
+                    // a matching google note will be created at each sync
+                    //1. try to match by Subject/Title
+                    //2. try to match by Body                    
+                    if (!string.IsNullOrEmpty(oln.Subject) && !string.IsNullOrEmpty(entry.Title) && oln.Subject.Equals(entry.Title, StringComparison.InvariantCultureIgnoreCase) ||
+                        !string.IsNullOrEmpty(oln.Body) && !string.IsNullOrEmpty(entry.Content) && oln.Subject.Equals(entry.Content.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase)
+                        )
+                    {
+                        match.AddGoogleNote(entry);
+                        sync.GoogleNotes.Remove(entry);
+                    }
+
+                }
+
+                #region find duplicates not needed now
+                //if (match.GoogleNote == null && match.OutlookNote != null)
+                //{//If GoogleNote, we have to expect a conflict because of Google insert of duplicates
+                //    foreach (Note entry in sync.GoogleNotes)
+                //    {                        
+                //        if (!string.IsNullOrEmpty(olc.FullName) && olc.FullName.Equals(entry.Title, StringComparison.InvariantCultureIgnoreCase) ||
+                //         !string.IsNullOrEmpty(olc.FileAs) && olc.FileAs.Equals(entry.Title, StringComparison.InvariantCultureIgnoreCase) ||
+                //         !string.IsNullOrEmpty(olc.Email1Address) && FindEmail(olc.Email1Address, entry.Emails) != null ||
+                //         !string.IsNullOrEmpty(olc.Email2Address) && FindEmail(olc.Email1Address, entry.Emails) != null ||
+                //         !string.IsNullOrEmpty(olc.Email3Address) && FindEmail(olc.Email1Address, entry.Emails) != null ||
+                //         olc.MobileTelephoneNumber != null && FindPhone(olc.MobileTelephoneNumber, entry.Phonenumbers) != null
+                //         )
+                //    }
+                //// check for each email 1,2 and 3 if a duplicate exists with same email, because Google doesn't like inserting new notes with same email
+                //Collection<Outlook.NoteItem> duplicates1 = new Collection<Outlook.NoteItem>();
+                //Collection<Outlook.NoteItem> duplicates2 = new Collection<Outlook.NoteItem>();
+                //Collection<Outlook.NoteItem> duplicates3 = new Collection<Outlook.NoteItem>();
+                //if (!string.IsNullOrEmpty(olc.Email1Address))
+                //    duplicates1 = sync.OutlookNoteByEmail(olc.Email1Address);
+
+                //if (!string.IsNullOrEmpty(olc.Email2Address))
+                //    duplicates2 = sync.OutlookNoteByEmail(olc.Email2Address);
+
+                //if (!string.IsNullOrEmpty(olc.Email3Address))
+                //    duplicates3 = sync.OutlookNoteByEmail(olc.Email3Address);
+
+
+                //if (duplicates1.Count > 1 || duplicates2.Count > 1 || duplicates3.Count > 1)
+                //{
+                //    if (string.IsNullOrEmpty(duplicatesEmailList))
+                //        duplicatesEmailList = "Outlook notes with the same email have been found and cannot be synchronized. Please delete duplicates of:";
+
+                //    if (duplicates1.Count > 1)
+                //        foreach (Outlook.NoteItem duplicate in duplicates1)
+                //        {
+                //            string str = olc.FileAs + " (" + olc.Email1Address + ")";
+                //            if (!duplicatesEmailList.Contains(str))
+                //                duplicatesEmailList += Environment.NewLine + str;
+                //        }
+                //    if (duplicates2.Count > 1)
+                //        foreach (Outlook.NoteItem duplicate in duplicates2)
+                //        {
+                //            string str = olc.FileAs + " (" + olc.Email2Address + ")";
+                //            if (!duplicatesEmailList.Contains(str))
+                //                duplicatesEmailList += Environment.NewLine + str;
+                //        }
+                //    if (duplicates3.Count > 1)
+                //        foreach (Outlook.NoteItem duplicate in duplicates3)
+                //        {
+                //            string str = olc.FileAs + " (" + olc.Email3Address + ")";
+                //            if (!duplicatesEmailList.Contains(str))
+                //                duplicatesEmailList += Environment.NewLine + str;
+                //        }
+                //    continue;
+                //}
+                //else if (!string.IsNullOrEmpty(olc.Email1Address))
+                //{
+                //    NoteMatch dup = result.Find(delegate(NoteMatch match)
+                //    {
+                //        return match.OutlookNote != null && match.OutlookNote.Email1Address == olc.Email1Address;
+                //    });
+                //    if (dup != null)
+                //    {
+                //        Logger.Log(string.Format("Duplicate note found by Email1Address ({0}). Skipping", olc.FileAs), EventType.Information);
+                //        continue;
+                //    }
+                //}
+
+                //// check for unique mobile phone, because this sync tool uses the also the mobile phone to identify matches between Google and Outlook
+                //Collection<Outlook.NoteItem> duplicatesMobile = new Collection<Outlook.NoteItem>();
+                //if (!string.IsNullOrEmpty(olc.MobileTelephoneNumber))
+                //    duplicatesMobile = sync.OutlookNoteByProperty("MobileTelephoneNumber", olc.MobileTelephoneNumber);
+
+                //if (duplicatesMobile.Count > 1)
+                //{
+                //    if (string.IsNullOrEmpty(duplicatesMobileList))
+                //        duplicatesMobileList = "Outlook notes with the same mobile phone have been found and cannot be synchronized. Please delete duplicates of:";
+
+                //    foreach (Outlook.NoteItem duplicate in duplicatesMobile)
+                //    {
+                //        sync.OutlookNoteDuplicates.Add(olc);
+                //        string str = olc.FileAs + " (" + olc.MobileTelephoneNumber + ")";
+                //        if (!duplicatesMobileList.Contains(str))
+                //            duplicatesMobileList += Environment.NewLine + str;
+                //    }
+                //    continue;
+                //}
+                //else if (!string.IsNullOrEmpty(olc.MobileTelephoneNumber))
+                //{
+                //    NoteMatch dup = result.Find(delegate(NoteMatch match)
+                //    {
+                //        return match.OutlookNote != null && match.OutlookNote.MobileTelephoneNumber == olc.MobileTelephoneNumber;
+                //    });
+                //    if (dup != null)
+                //    {
+                //        Logger.Log(string.Format("Duplicate note found by MobileTelephoneNumber ({0}). Skipping", olc.FileAs), EventType.Information);
+                //        continue;
+                //    }
+                //}
+
+                #endregion
+
+            //    if (match.AllGoogleNoteMatches == null || match.AllGoogleNoteMatches.Count == 0)
+            //    {
+            //        //Check, if this Outlook note has a match in the google duplicates
+            //        bool duplicateFound = false;
+            //        foreach (NoteMatch duplicate in sync.GoogleNoteDuplicates)
+            //        {
+            //            if (duplicate.AllGoogleNoteMatches.Count > 0 &&
+            //                (!string.IsNullOrEmpty(olci.FileAs) && !string.IsNullOrEmpty(duplicate.AllGoogleNoteMatches[0].Title) && olci.FileAs.Equals(duplicate.AllGoogleNoteMatches[0].Title.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||  //Replace twice to not replace a \r\n by \r\r\n. This is necessary because \r\n are saved as \n only to google
+            //                 !string.IsNullOrEmpty(olci.FileAs) && !string.IsNullOrEmpty(duplicate.AllGoogleNoteMatches[0].Name.FullName) && olci.FileAs.Equals(duplicate.AllGoogleNoteMatches[0].Name.FullName.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||
+            //                 !string.IsNullOrEmpty(olci.FullName) && !string.IsNullOrEmpty(duplicate.AllGoogleNoteMatches[0].Name.FullName) && olci.FullName.Equals(duplicate.AllGoogleNoteMatches[0].Name.FullName.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase) ||
+            //                 !string.IsNullOrEmpty(olci.Email1Address) && duplicate.AllGoogleNoteMatches[0].Emails.Count > 0 && olci.Email1Address.Equals(duplicate.AllGoogleNoteMatches[0].Emails[0].Address, StringComparison.InvariantCultureIgnoreCase) ||
+            //                //!string.IsNullOrEmpty(olci.Email2Address) && FindEmail(olci.Email2Address, duplicate.AllGoogleNoteMatches[0].Emails) != null ||
+            //                //!string.IsNullOrEmpty(olci.Email3Address) && FindEmail(olci.Email3Address, duplicate.AllGoogleNoteMatches[0].Emails) != null ||
+            //                 olci.MobileTelephoneNumber != null && FindPhone(olci.MobileTelephoneNumber, duplicate.AllGoogleNoteMatches[0].Phonenumbers) != null ||
+            //                 !string.IsNullOrEmpty(olci.FileAs) && string.IsNullOrEmpty(duplicate.AllGoogleNoteMatches[0].Title) && duplicate.AllGoogleNoteMatches[0].Organizations.Count > 0 && olci.FileAs.Equals(duplicate.AllGoogleNoteMatches[0].Organizations[0].Name, StringComparison.InvariantCultureIgnoreCase)
+            //                ) ||
+            //                !string.IsNullOrEmpty(olci.FileAs) && olci.FileAs.Equals(duplicate.OutlookNote.Subject, StringComparison.InvariantCultureIgnoreCase) ||
+            //                !string.IsNullOrEmpty(olci.FullName) && olci.FullName.Equals(duplicate.OutlookNote.FullName, StringComparison.InvariantCultureIgnoreCase) ||
+            //                !string.IsNullOrEmpty(olci.Email1Address) && olci.Email1Address.Equals(duplicate.OutlookNote.Email1Address, StringComparison.InvariantCultureIgnoreCase) ||
+            //                //                                              olci.Email1Address.Equals(duplicate.OutlookNote.Email2Address, StringComparison.InvariantCultureIgnoreCase) ||
+            //                //                                              olci.Email1Address.Equals(duplicate.OutlookNote.Email3Address, StringComparison.InvariantCultureIgnoreCase)
+            //                //                                              ) ||
+            //                //!string.IsNullOrEmpty(olci.Email2Address) && (olci.Email2Address.Equals(duplicate.OutlookNote.Email1Address, StringComparison.InvariantCultureIgnoreCase) ||
+            //                //                                              olci.Email2Address.Equals(duplicate.OutlookNote.Email2Address, StringComparison.InvariantCultureIgnoreCase) ||
+            //                //                                              olci.Email2Address.Equals(duplicate.OutlookNote.Email3Address, StringComparison.InvariantCultureIgnoreCase)
+            //                //                                              ) ||
+            //                //!string.IsNullOrEmpty(olci.Email3Address) && (olci.Email3Address.Equals(duplicate.OutlookNote.Email1Address, StringComparison.InvariantCultureIgnoreCase) ||
+            //                //                                              olci.Email3Address.Equals(duplicate.OutlookNote.Email2Address, StringComparison.InvariantCultureIgnoreCase) ||
+            //                //                                              olci.Email3Address.Equals(duplicate.OutlookNote.Email3Address, StringComparison.InvariantCultureIgnoreCase)
+            //                //                                              ) ||
+            //                olci.MobileTelephoneNumber != null && olci.MobileTelephoneNumber.Equals(duplicate.OutlookNote.MobileTelephoneNumber) ||
+            //                !string.IsNullOrEmpty(olci.FileAs) && string.IsNullOrEmpty(duplicate.GoogleNote.Title) && duplicate.GoogleNote.Organizations.Count > 0 && olci.FileAs.Equals(duplicate.GoogleNote.Organizations[0].Name, StringComparison.InvariantCultureIgnoreCase)
+            //               )
+            //            {
+            //                duplicateFound = true;
+            //                sync.OutlookNoteDuplicates.Add(match);
+            //                if (string.IsNullOrEmpty(duplicateOutlookNotes))
+            //                    duplicateOutlookNotes = "Outlook note found that has been already identified as duplicate Google note (either same email, Mobile or FullName) and cannot be synchronized. Please delete or resolve duplicates of:";
+
+            //                string str = olci.FileAs + " (" + olci.Email1Address + ", " + olci.MobileTelephoneNumber + ")";
+            //                if (!duplicateOutlookNotes.Contains(str))
+            //                    duplicateOutlookNotes += Environment.NewLine + str;
+            //            }
+            //        }
+
+            //        if (!duplicateFound)
+            //            Logger.Log(string.Format("No match found for outlook note ({0})", olci.FileAs), EventType.Information);
+            //    }
+            //    else
+            //    {
+            //        //Remember Google duplicates to later react to it when resetting matches or syncing
+            //        //ResetMatches: Also reset the duplicates
+            //        //Sync: Skip duplicates (don't sync duplicates to be fail safe)
+            //        if (match.AllGoogleNoteMatches.Count > 1)
+            //        {
+            //            sync.GoogleNoteDuplicates.Add(match);
+            //            foreach (Note entry in match.AllGoogleNoteMatches)
+            //            {
+            //                //Create message for duplicatesFound exception
+            //                if (string.IsNullOrEmpty(duplicateGoogleMatches))
+            //                    duplicateGoogleMatches = "Outlook notes matching with multiple Google notes have been found (either same email, Mobile, FullName or company) and cannot be synchronized. Please delete or resolve duplicates of:";
+
+            //                string str = olci.FileAs + " (" + olci.Email1Address + ", " + olci.MobileTelephoneNumber + ")";
+            //                if (!duplicateGoogleMatches.Contains(str))
+            //                    duplicateGoogleMatches += Environment.NewLine + str;
+            //            }
+            //        }
+
+
+
+            //    }
+
+                result.Add(match);
+            }
+            #endregion
+
+            //if (!string.IsNullOrEmpty(duplicateGoogleMatches) || !string.IsNullOrEmpty(duplicateOutlookNotes))
+            //    duplicatesFound = new DuplicateDataException(duplicateGoogleMatches + Environment.NewLine + Environment.NewLine + duplicateOutlookNotes);
+            //else
+            //    duplicatesFound = null;
+
+            //return result;
+
+            //for each google note that's left (they will be nonmatched) create a new match pair without outlook note. 
+            for (int i = 0; i < sync.GoogleNotes.Count; i++)
+            {
+                Document entry = sync.GoogleNotes[i];               
+                if (NotificationReceived != null)
+                    NotificationReceived(String.Format("Adding new Google note {0} of {1} by unique properties: {2} ...", i + 1, sync.GoogleNotes.Count, entry.Title));
+
+                //string googleOutlookId = NotePropertiesUtils.GetGoogleOutlookNoteId(sync.SyncProfile, entry);
+                //if (!String.IsNullOrEmpty(googleOutlookId) && skippedOutlookIds.Contains(googleOutlookId))
+                //{
+                //    Logger.Log("Skipped GoogleNote because Outlook note couldn't be matched beacause of previous problem (see log): " + entry.Title, EventType.Warning);
+                //}
+                //else 
+                if (string.IsNullOrEmpty(entry.Title) && string.IsNullOrEmpty(entry.Content))
+                {
+                    // no title or content
+                    sync.SkippedCount++;
+                    sync.SkippedCountNotMatches++;
+                    Logger.Log("Skipped GoogleNote because no unique property found (Title or Content):" + entry.Title, EventType.Warning);
+                }
+                else
+                {
+                    NoteMatch match = new NoteMatch(null, entry);
+                    result.Add(match);
+                }
+            }
+            return result;
+        }
+
+
+
+        public static void SyncNotes(Syncronizer sync)
+        {
+            for (int i = 0; i < sync.Notes.Count; i++)
+            {
+                NoteMatch match = sync.Notes[i];
+                if (NotificationReceived != null)
+                {
+                    string name = string.Empty;
+                    if (match.OutlookNote != null)
+                        name = match.OutlookNote.Subject;
+                    else if (match.GoogleNote != null)
+                        name = match.GoogleNote.Title;
+                    NotificationReceived(String.Format("Syncing note {0} of {1}: {2} ...", i + 1, sync.Notes.Count, name));
+                }
+
+                SyncNote(match, sync);
+            }
+        }
+        public static void SyncNote(NoteMatch match, Syncronizer sync)
+        {
+            Outlook.NoteItem outlookNoteItem = match.OutlookNote;
+            //try
+            //{
+                if (match.GoogleNote == null && match.OutlookNote != null)
+                {
+                    //no google note                               
+                    string googleNotetId = NotePropertiesUtils.GetOutlookGoogleNoteId(sync, outlookNoteItem);
+                    if (!string.IsNullOrEmpty(googleNotetId))
+                    {
+                        //Avoid recreating a GoogleNote already existing
+                        //==> Delete this outlookNote instead if previous match existed but no match exists anymore
+                        //Redundant check if exist, but in case an error occurred in MatchNotes
+                        Document matchingGoogleNote = sync.GetGoogleNoteById(googleNotetId);
+                        if (matchingGoogleNote == null)
+                            return;
+                    }
+
+                    if (sync.SyncOption == SyncOption.GoogleToOutlookOnly)
+                    {
+                        sync.SkippedCount++;
+                        Logger.Log(string.Format("Outlook Note not added to Google, because of SyncOption " + sync.SyncOption.ToString() + ": {0}", match.OutlookNote.Subject), EventType.Information);
+                        return;
+                    }
+
+                    //create a Google note from Outlook note
+                    match.GoogleNote = new Document();
+                    match.GoogleNote.Categories.Add(new AtomCategory("http://schemas.google.com/docs/2007#document"));
+
+                    sync.UpdateNote(outlookNoteItem, match.GoogleNote);
+
+                }
+                else if (match.OutlookNote == null && match.GoogleNote != null)
+                {
+
+                    // no outlook note
+                    //string outlookId = NotePropertiesUtils.GetGoogleOutlookNoteId(sync.SyncProfile, match.GoogleNote);
+                    //if (outlookId != null)
+                    //{
+                    //    //Avoid recreating a OutlookNote already existing
+                    //    //==> Delete this googleNote instead if previous match existed but no match exists anymore                
+                    //    return;
+
+                    //}
+
+
+                    if (sync.SyncOption == SyncOption.OutlookToGoogleOnly)
+                    {
+                        sync.SkippedCount++;
+                        Logger.Log(string.Format("Google Note not added to Outlook, because of SyncOption " + sync.SyncOption.ToString() + ": {0}", match.GoogleNote.Title), EventType.Information);
+                        return;
+                    }
+
+                    //create a Outlook note from Google note
+                    outlookNoteItem = sync.OutlookApplication.CreateItem(Outlook.OlItemType.olNoteItem) as Outlook.NoteItem;
+
+                    sync.UpdateNote(match.GoogleNote, outlookNoteItem);
+                    match.OutlookNote = outlookNoteItem;
+                }
+                else if (match.OutlookNote != null && match.GoogleNote != null)
+                {
+                    //merge note details                
+
+                    //determine if this note pair were syncronized
+                    //DateTime? lastUpdated = GetOutlookPropertyValueDateTime(match.OutlookNote, sync.OutlookPropertyNameUpdated);
+                    DateTime? lastSynced = NotePropertiesUtils.GetOutlookLastSync(sync,outlookNoteItem);
+                    if (lastSynced.HasValue)
+                    {
+                        //note pair was syncronysed before.
+
+                        //determine if google note was updated since last sync
+
+                        //lastSynced is stored without seconds. take that into account.
+                        DateTime lastUpdatedOutlook = match.OutlookNote.LastModificationTime.AddSeconds(-match.OutlookNote.LastModificationTime.Second);
+                        DateTime lastUpdatedGoogle = match.GoogleNote.Updated.AddSeconds(-match.GoogleNote.Updated.Second);
+
+                        //check if both outlok and google notes where updated sync last sync
+                        if (lastUpdatedOutlook.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance
+                            && lastUpdatedGoogle.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance)
+                        {
+                            //both notes were updated.
+                            //options: 1) ignore 2) loose one based on SyncOption
+                            //throw new Exception("Both notes were updated!");
+
+                            switch (sync.SyncOption)
+                            {
+                                case SyncOption.MergeOutlookWins:
+                                case SyncOption.OutlookToGoogleOnly:
+                                    //overwrite google note
+                                    Logger.Log("Outlook and Google note have been updated, Outlook note is overwriting Google because of SyncOption " + sync.SyncOption + ": " + match.OutlookNote.Subject + ".", EventType.Information);
+                                    sync.UpdateNote(outlookNoteItem, match.GoogleNote);
+                                    break;
+                                case SyncOption.MergeGoogleWins:
+                                case SyncOption.GoogleToOutlookOnly:
+                                    //overwrite outlook note
+                                    Logger.Log("Outlook and Google note have been updated, Google note is overwriting Outlook because of SyncOption " + sync.SyncOption + ": " + match.OutlookNote.Subject + ".", EventType.Information);
+                                    sync.UpdateNote(match.GoogleNote, outlookNoteItem);
+                                    break;
+                                case SyncOption.MergePrompt:
+                                    //promp for sync option
+                                    ConflictResolver r = new ConflictResolver();
+                                    ConflictResolution res = r.Resolve(outlookNoteItem, match.GoogleNote);
+                                    switch (res)
+                                    {
+                                        case ConflictResolution.Skip:
+                                            break;
+                                        case ConflictResolution.Cancel:
+                                            throw new ApplicationException("Canceled");
+                                        case ConflictResolution.OutlookWins:
+                                            sync.UpdateNote(outlookNoteItem, match.GoogleNote);
+                                            break;
+                                        case ConflictResolution.GoogleWins:
+                                            sync.UpdateNote(match.GoogleNote, outlookNoteItem);
+                                            break;
+                                        default:
+                                            break;
+                                    }
+                                    break;
+                            }
+                            return;
+                        }
+
+
+                        //check if outlook note was updated (with X second tolerance)
+                        if (sync.SyncOption != SyncOption.GoogleToOutlookOnly &&
+                            (lastUpdatedOutlook.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance ||
+                             lastUpdatedGoogle.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance &&
+                             sync.SyncOption == SyncOption.OutlookToGoogleOnly
+                            )
+                           )
+                        {
+                            //outlook note was changed or changed Google note will be overwritten
+
+                            if (lastUpdatedGoogle.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance &&
+                                sync.SyncOption == SyncOption.OutlookToGoogleOnly)
+                                Logger.Log("Google note has been updated since last sync, but Outlook note is overwriting Google because of SyncOption " + sync.SyncOption + ": " + match.OutlookNote.Subject + ".", EventType.Information);
+
+                            sync.UpdateNote(outlookNoteItem, match.GoogleNote);
+
+                            //at the moment use outlook as "master" source of notes - in the event of a conflict google note will be overwritten.
+                            //TODO: control conflict resolution by SyncOption
+                            return;
+                        }
+
+                        //check if google note was updated (with X second tolerance)
+                        if (sync.SyncOption != SyncOption.OutlookToGoogleOnly &&
+                            (lastUpdatedGoogle.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance ||
+                             lastUpdatedOutlook.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance &&
+                             sync.SyncOption == SyncOption.GoogleToOutlookOnly
+                            )
+                           )
+                        {
+                            //google note was changed or changed Outlook note will be overwritten
+
+                            if (lastUpdatedOutlook.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance &&
+                                sync.SyncOption == SyncOption.GoogleToOutlookOnly)
+                                Logger.Log("Outlook note has been updated since last sync, but Google note is overwriting Outlook because of SyncOption " + sync.SyncOption + ": " + match.OutlookNote.Subject + ".", EventType.Information);
+
+                            sync.UpdateNote(match.GoogleNote, outlookNoteItem);
+                        }
+                    }
+                    else
+                    {
+                        //notes were never synced.
+                        //merge notes.
+                        switch (sync.SyncOption)
+                        {
+                            case SyncOption.MergeOutlookWins:
+                            case SyncOption.OutlookToGoogleOnly:
+                                //overwrite google note
+                                sync.UpdateNote(outlookNoteItem, match.GoogleNote);
+                                break;
+                            case SyncOption.MergeGoogleWins:
+                            case SyncOption.GoogleToOutlookOnly:
+                                //overwrite outlook note
+                                sync.UpdateNote(match.GoogleNote, outlookNoteItem);
+                                break;
+                            case SyncOption.MergePrompt:
+                                //promp for sync option
+                                ConflictResolver r = new ConflictResolver();
+                                ConflictResolution res = r.Resolve(outlookNoteItem, match.GoogleNote);
+                                switch (res)
+                                {
+                                    case ConflictResolution.Skip:
+                                        break;
+                                    case ConflictResolution.Cancel:
+                                        throw new ApplicationException("Canceled");
+                                    case ConflictResolution.OutlookWins:
+                                        sync.UpdateNote(outlookNoteItem, match.GoogleNote);
+                                        break;
+                                    case ConflictResolution.GoogleWins:
+                                        sync.UpdateNote(match.GoogleNote, outlookNoteItem);
+                                        break;
+                                    default:
+                                        break;
+                                }
+                                break;
+                        }
+                    }
+
+                }
+                else
+                    throw new ArgumentNullException("NotetMatch has all peers null.");
+            //}
+            //finally
+            //{
+            //    if (outlookNoteItem != null &&
+            //        match.OutlookNote != null)
+            //    {
+            //        match.OutlookNote.Update(outlookNoteItem, sync);
+            //        Marshal.ReleaseComObject(outlookNoteItem);
+            //        outlookNoteItem = null;
+            //    }
+            //}
+
+        }
+    }
+
+
+
+    internal class NoteMatch
+    {
+        //ToDo: OutlookNoteInfo
+        public Outlook.NoteItem OutlookNote;
+        public Document GoogleNote;
+        public readonly List<Document> AllGoogleNoteMatches = new List<Document>(1);
+        public Document LastGoogleNote;
+
+        public NoteMatch(Outlook.NoteItem outlookNote, Document googleNote)
+        {
+            OutlookNote = outlookNote;
+            GoogleNote = googleNote;
+        }
+
+        public void AddGoogleNote(Document googleNote)
+        {
+            if (googleNote == null)
+                return;
+            //throw new ArgumentNullException("googleNote must not be null.");
+
+            if (GoogleNote == null)
+                GoogleNote = googleNote;
+
+            //this to avoid searching the entire collection. 
+            //if last note it what we are trying to add the we have already added it earlier
+            if (LastGoogleNote == googleNote)
+                return;
+
+            if (!AllGoogleNoteMatches.Contains(googleNote))
+                AllGoogleNoteMatches.Add(googleNote);
+
+            LastGoogleNote = googleNote;
+        }
+
+        //public void Delete(NotesRequest googleService)
+        //{
+        //    if (GoogleNote != null)
+        //         googleService.Delete(GoogleNote);
+        //    if (OutlookNote != null)
+        //        OutlookNote.Delete();
+        //}
+    }
+    
+    		
+}


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

Revision: 187
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=187&view=rev
Author:   v2l
Date:     2011-07-11 10:42:35 +0000 (Mon, 11 Jul 2011)

Log Message:
-----------
added proxy setting form, and usage (in debug mode) this proxy setting 

Modified Paths:
--------------
    trunk/GoogleContactsSync/GoogleContactsSync.csproj
    trunk/GoogleContactsSync/SettingsForm.cs

Added Paths:
-----------
    trunk/GoogleContactsSync/ProxySettings.Designer.cs
    trunk/GoogleContactsSync/ProxySettings.cs
    trunk/GoogleContactsSync/ProxySettings.resx

Modified: trunk/GoogleContactsSync/GoogleContactsSync.csproj
===================================================================
--- trunk/GoogleContactsSync/GoogleContactsSync.csproj	2011-07-10 13:19:37 UTC (rev 186)
+++ trunk/GoogleContactsSync/GoogleContactsSync.csproj	2011-07-11 10:42:35 UTC (rev 187)
@@ -140,6 +140,12 @@
     <Compile Include="NotePropertiesUtils.cs" />
     <Compile Include="NotesMatcher.cs" />
     <Compile Include="OutlookContactInfo.cs" />
+    <Compile Include="ProxySettings.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ProxySettings.designer.cs">
+      <DependentUpon>ProxySettings.cs</DependentUpon>
+    </Compile>
     <Compile Include="SettingsForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -163,6 +169,9 @@
       <SubType>Designer</SubType>
       <DependentUpon>DeleteDuplicatesForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="ProxySettings.resx">
+      <DependentUpon>ProxySettings.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="SettingsForm.resx">
       <SubType>Designer</SubType>
       <DependentUpon>SettingsForm.cs</DependentUpon>

Added: trunk/GoogleContactsSync/ProxySettings.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/ProxySettings.Designer.cs	                        (rev 0)
+++ trunk/GoogleContactsSync/ProxySettings.Designer.cs	2011-07-11 10:42:35 UTC (rev 187)
@@ -0,0 +1,240 @@
+namespace GoContactSyncMod
+{
+    partial class ProxySettingsForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.cancelButton = new System.Windows.Forms.Button();
+            this.okButton = new System.Windows.Forms.Button();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.UserName = new System.Windows.Forms.TextBox();
+            this.Password = new System.Windows.Forms.TextBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.Authorization = new System.Windows.Forms.CheckBox();
+            this.CustomProxy = new System.Windows.Forms.RadioButton();
+            this.SystemProxy = new System.Windows.Forms.RadioButton();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.Address = new System.Windows.Forms.TextBox();
+            this.Port = new System.Windows.Forms.TextBox();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // cancelButton
+            // 
+            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.cancelButton.Location = new System.Drawing.Point(181, 216);
+            this.cancelButton.Name = "cancelButton";
+            this.cancelButton.Size = new System.Drawing.Size(98, 25);
+            this.cancelButton.TabIndex = 1;
+            this.cancelButton.Text = "&Cancel";
+            this.cancelButton.UseVisualStyleBackColor = true;
+            this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
+            // 
+            // okButton
+            // 
+            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.okButton.Location = new System.Drawing.Point(12, 216);
+            this.okButton.Name = "okButton";
+            this.okButton.Size = new System.Drawing.Size(98, 25);
+            this.okButton.TabIndex = 0;
+            this.okButton.Text = "&OK";
+            this.okButton.UseVisualStyleBackColor = true;
+            this.okButton.Click += new System.EventHandler(this.okButton_Click);
+            // 
+            // label2
+            // 
+            this.label2.Location = new System.Drawing.Point(7, 142);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(75, 17);
+            this.label2.TabIndex = 9;
+            this.label2.Text = "&User:";
+            // 
+            // label3
+            // 
+            this.label3.Location = new System.Drawing.Point(7, 165);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(75, 16);
+            this.label3.TabIndex = 10;
+            this.label3.Text = "&Password:";
+            // 
+            // UserName
+            // 
+            this.UserName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.UserName.Location = new System.Drawing.Point(100, 139);
+            this.UserName.Name = "UserName";
+            this.UserName.Size = new System.Drawing.Size(167, 20);
+            this.UserName.TabIndex = 5;
+            this.UserName.TextChanged += new System.EventHandler(this.Form_Changed);
+            // 
+            // Password
+            // 
+            this.Password.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.Password.Location = new System.Drawing.Point(100, 165);
+            this.Password.Name = "Password";
+            this.Password.PasswordChar = '*';
+            this.Password.Size = new System.Drawing.Size(167, 20);
+            this.Password.TabIndex = 6;
+            this.Password.TextChanged += new System.EventHandler(this.Form_Changed);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox1.Controls.Add(this.label2);
+            this.groupBox1.Controls.Add(this.label3);
+            this.groupBox1.Controls.Add(this.Authorization);
+            this.groupBox1.Controls.Add(this.UserName);
+            this.groupBox1.Controls.Add(this.CustomProxy);
+            this.groupBox1.Controls.Add(this.Password);
+            this.groupBox1.Controls.Add(this.SystemProxy);
+            this.groupBox1.Controls.Add(this.label1);
+            this.groupBox1.Controls.Add(this.label4);
+            this.groupBox1.Controls.Add(this.Address);
+            this.groupBox1.Controls.Add(this.Port);
+            this.groupBox1.Location = new System.Drawing.Point(12, 12);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(275, 198);
+            this.groupBox1.TabIndex = 6;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Proxy";
+            // 
+            // Authorization
+            // 
+            this.Authorization.AutoSize = true;
+            this.Authorization.Location = new System.Drawing.Point(10, 122);
+            this.Authorization.Name = "Authorization";
+            this.Authorization.Size = new System.Drawing.Size(87, 17);
+            this.Authorization.TabIndex = 4;
+            this.Authorization.Text = "A&uthorization";
+            this.Authorization.UseVisualStyleBackColor = true;
+            this.Authorization.CheckedChanged += new System.EventHandler(this.Form_Changed);
+            // 
+            // CustomProxy
+            // 
+            this.CustomProxy.AutoSize = true;
+            this.CustomProxy.Location = new System.Drawing.Point(10, 42);
+            this.CustomProxy.Name = "CustomProxy";
+            this.CustomProxy.Size = new System.Drawing.Size(147, 17);
+            this.CustomProxy.TabIndex = 1;
+            this.CustomProxy.Text = "Use custom HTTP  proxy ";
+            this.CustomProxy.UseVisualStyleBackColor = true;
+            this.CustomProxy.CheckedChanged += new System.EventHandler(this.Form_Changed);
+            // 
+            // SystemProxy
+            // 
+            this.SystemProxy.AutoSize = true;
+            this.SystemProxy.Checked = true;
+            this.SystemProxy.Location = new System.Drawing.Point(10, 19);
+            this.SystemProxy.Name = "SystemProxy";
+            this.SystemProxy.Size = new System.Drawing.Size(88, 17);
+            this.SystemProxy.TabIndex = 0;
+            this.SystemProxy.TabStop = true;
+            this.SystemProxy.Text = "System Proxy";
+            this.SystemProxy.UseVisualStyleBackColor = true;
+            this.SystemProxy.CheckedChanged += new System.EventHandler(this.Form_Changed);
+            // 
+            // label1
+            // 
+            this.label1.Location = new System.Drawing.Point(7, 73);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(48, 17);
+            this.label1.TabIndex = 7;
+            this.label1.Text = "&Address:";
+            // 
+            // label4
+            // 
+            this.label4.Location = new System.Drawing.Point(7, 96);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(48, 16);
+            this.label4.TabIndex = 8;
+            this.label4.Text = "P&ort:";
+            // 
+            // Address
+            // 
+            this.Address.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.Address.Location = new System.Drawing.Point(61, 70);
+            this.Address.Name = "Address";
+            this.Address.Size = new System.Drawing.Size(206, 20);
+            this.Address.TabIndex = 2;
+            this.Address.TextChanged += new System.EventHandler(this.Form_Changed);
+            // 
+            // Port
+            // 
+            this.Port.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.Port.Location = new System.Drawing.Point(61, 96);
+            this.Port.Name = "Port";
+            this.Port.Size = new System.Drawing.Size(37, 20);
+            this.Port.TabIndex = 3;
+            this.Port.TextChanged += new System.EventHandler(this.Form_Changed);
+            // 
+            // ProxySettingsForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.cancelButton;
+            this.ClientSize = new System.Drawing.Size(299, 260);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.cancelButton);
+            this.Controls.Add(this.okButton);
+            this.Name = "ProxySettingsForm";
+            this.Text = "Proxy Settings";
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button cancelButton;
+        private System.Windows.Forms.Button okButton;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox UserName;
+        private System.Windows.Forms.TextBox Password;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.RadioButton SystemProxy;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.TextBox Address;
+        private System.Windows.Forms.TextBox Port;
+        private System.Windows.Forms.RadioButton CustomProxy;
+        private System.Windows.Forms.CheckBox Authorization;
+
+    }
+}
\ No newline at end of file

Added: trunk/GoogleContactsSync/ProxySettings.cs
===================================================================
--- trunk/GoogleContactsSync/ProxySettings.cs	                        (rev 0)
+++ trunk/GoogleContactsSync/ProxySettings.cs	2011-07-11 10:42:35 UTC (rev 187)
@@ -0,0 +1,167 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using Microsoft.Win32;
+using System.Text.RegularExpressions;
+using System.Net;
+
+namespace GoContactSyncMod
+{
+    partial class ProxySettingsForm : Form
+    {
+
+        private void Form_Changed(object sender, EventArgs e)
+        {
+            FormSettings();
+        }
+
+        private void setBgColor(TextBox box, bool isValid)
+        {
+            if (box.Enabled)
+            {
+                if (!isValid)
+                    box.BackColor = Color.LightPink;
+                else
+                    box.BackColor = Color.LightGreen;
+            }
+        }
+
+        private bool ValidCredentials
+        {
+            get
+            {
+                bool userNameIsValid = Regex.IsMatch(UserName.Text, @"^(?'id'[a-z0-9\@\'\%\._\+\-]+)$", RegexOptions.IgnoreCase);
+                bool passwordIsValid = Password.Text.Length != 0;
+                bool AddressIsValid  = Regex.IsMatch(Address.Text, @"^(?'domain'[a-z0-9\'\%\._\+\-]+)\.(?'ext'[a-z]{2,6})$", RegexOptions.IgnoreCase);
+                bool PortIsValid     = Regex.IsMatch(Port.Text, @"^(?'port'[0-9]{2,6})$", RegexOptions.IgnoreCase);
+
+
+                setBgColor(UserName, userNameIsValid);
+                setBgColor(Password, passwordIsValid);
+                setBgColor(Address,  AddressIsValid);
+                setBgColor(Port,     PortIsValid);
+                return (userNameIsValid && passwordIsValid || !Authorization.Checked) && AddressIsValid && PortIsValid || SystemProxy.Checked;
+            }
+        }
+
+        private void FormSettings()
+        {
+            Address.Enabled       = CustomProxy.Checked;
+            Port.Enabled          = CustomProxy.Checked;
+            Authorization.Enabled = CustomProxy.Checked; 
+            UserName.Enabled      = CustomProxy.Checked && Authorization.Checked;
+            Password.Enabled      = CustomProxy.Checked && Authorization.Checked;
+
+            bool isValid = ValidCredentials;
+        }
+
+        private void ProxySet()
+        {
+            if (CustomProxy.Checked)
+            {
+                System.Net.WebProxy myProxy = new System.Net.WebProxy(Address.Text, Convert.ToInt16(Port.Text));
+                myProxy.BypassProxyOnLocal = false;
+
+                if (Authorization.Checked)
+                {
+                    myProxy.Credentials = new System.Net.NetworkCredential(UserName.Text, Password.Text);
+                }
+                GlobalProxySelection.Select = myProxy;
+            }
+            else
+                GlobalProxySelection.Select = null;
+        }
+
+        public ProxySettingsForm()
+        {
+            InitializeComponent();
+            LoadSettings();
+            
+            ProxySet();
+        }
+
+        private void LoadSettings()
+        {   // Load Proxy Settings
+            RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(@"Software\Webgear\GOContactSync");
+            if (regKeyAppRoot.GetValue("ProxyUsage") != null)
+            {
+                if (Convert.ToBoolean (regKeyAppRoot.GetValue("ProxyUsage")))
+                {
+                    CustomProxy.Checked = true;
+                    SystemProxy.Checked = !CustomProxy.Checked;
+
+                    if (regKeyAppRoot.GetValue("ProxyURL") != null)
+                        Address.Text = (string)regKeyAppRoot.GetValue("ProxyURL");
+
+                    if (regKeyAppRoot.GetValue("ProxyPort") != null)
+                        Port.Text = (string)regKeyAppRoot.GetValue("ProxyPort");
+
+                    if (Convert.ToBoolean (regKeyAppRoot.GetValue("ProxyAuth"))) 
+                    {
+
+                         Authorization.Checked = true;
+
+                        if (regKeyAppRoot.GetValue("ProxyUsername") != null)
+                        {
+                            UserName.Text = regKeyAppRoot.GetValue("ProxyUsername") as string;
+                            if (regKeyAppRoot.GetValue("ProxyPassword") != null)
+                                Password.Text = Encryption.DecryptPassword(UserName.Text, regKeyAppRoot.GetValue("ProxyPassword") as string);
+                        }
+                    }
+                }
+            }
+
+            FormSettings();
+        }
+
+        private void SaveSettings()
+        {
+            RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(@"Software\Webgear\GOContactSync");
+            regKeyAppRoot.SetValue("ProxyUsage", CustomProxy.Checked);
+
+            if (CustomProxy.Checked)
+            {
+
+                if (!string.IsNullOrEmpty(Address.Text))
+                {
+                    regKeyAppRoot.SetValue("ProxyURL", Address.Text);
+                    if (!string.IsNullOrEmpty(Port.Text))
+                        regKeyAppRoot.SetValue("ProxyPort", Port.Text);
+                }
+
+                regKeyAppRoot.SetValue("ProxyAuth", Authorization.Checked);
+                if (Authorization.Checked) 
+                {
+                    if (!string.IsNullOrEmpty(UserName.Text))
+                    {
+                        regKeyAppRoot.SetValue("ProxyUsername", UserName.Text);
+                        if (!string.IsNullOrEmpty(Password.Text))
+                            regKeyAppRoot.SetValue("ProxyPassword", Encryption.EncryptPassword(UserName.Text, Password.Text));
+                    }
+                }
+            }
+        }
+
+
+        private void cancelButton_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void okButton_Click(object sender, EventArgs e)
+        {
+            if (!ValidCredentials)
+                return;
+
+            SaveSettings();
+            ProxySet();
+            this.Close();
+        }
+
+    }
+}
+

Added: trunk/GoogleContactsSync/ProxySettings.resx
===================================================================
--- trunk/GoogleContactsSync/ProxySettings.resx	                        (rev 0)
+++ trunk/GoogleContactsSync/ProxySettings.resx	2011-07-11 10:42:35 UTC (rev 187)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-07-10 13:19:37 UTC (rev 186)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-07-11 10:42:35 UTC (rev 187)
@@ -22,6 +22,9 @@
 		private DateTime lastSync;
 		private bool requestClose = false;
         private bool boolShowBalloonTip = true;
+#if debug
+        private ProxySettingsForm _proxy = new ProxySettingsForm(); 
+#endif
 
         //register window for lock/unlock messages of workstation
         private bool registered = false;
@@ -763,9 +766,11 @@
 		private void proxySettingsLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
 		{
 			// TODO: Implement a dialog with proxy settings and use them when connecting with Google
-
+#if debug
+            if (_proxy != null) _proxy.Show();
+#else
 			// Alpha quick'm'dirty workaround solution
-			try
+		  try
 			{
 				if (MessageBox.Show("The proxy configuration is in beta stage, a more comfortable solution is to come. For now, you have to edit the Applications Config file with administrator privileges.\n\nOpen Configuration file now?",
 					"GO Contact Sync Mod", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == System.Windows.Forms.DialogResult.OK)
@@ -793,7 +798,8 @@
 			{
 				ErrorHandler.Handle(ex);
 			}
-		}
+#endif
+        }
 
 		FileSystemWatcher fsw = null;
 		


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

Revision: 190
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=190&view=rev
Author:   v2l
Date:     2011-08-20 06:02:25 +0000 (Sat, 20 Aug 2011)

Log Message:
-----------
1. FIX: proxy url validation mask
2. FIX: Exception "System.ArgumentException: Stream was not readable" when is proxy auth failed.

Modified Paths:
--------------
    trunk/GoogleContactsSync/ProxySettings.cs
    trunk/GoogleContactsSync/SettingsForm.cs

Modified: trunk/GoogleContactsSync/ProxySettings.cs
===================================================================
--- trunk/GoogleContactsSync/ProxySettings.cs	2011-08-19 05:44:47 UTC (rev 189)
+++ trunk/GoogleContactsSync/ProxySettings.cs	2011-08-20 06:02:25 UTC (rev 190)
@@ -36,7 +36,7 @@
             {
                 bool userNameIsValid = Regex.IsMatch(UserName.Text, @"^(?'id'[a-z0-9\\\/\@\'\%\._\+\-]+)$", RegexOptions.IgnoreCase);
                 bool passwordIsValid = Password.Text.Length != 0;
-                bool AddressIsValid = Regex.IsMatch(Address.Text, @"^(?'url'((https?):(//))?[\w\d:#@%/;$()~_?\+-=\\\.&]*)$", RegexOptions.IgnoreCase);
+                bool AddressIsValid = Regex.IsMatch(Address.Text, @"^(?'url'[\w\d#@%;$()~_?\\\.&]*)$", RegexOptions.IgnoreCase);
                 bool PortIsValid     = Regex.IsMatch(Port.Text, @"^(?'port'[0-9]{2,6})$", RegexOptions.IgnoreCase);
 
 
@@ -63,14 +63,21 @@
         {
             if (CustomProxy.Checked)
             {
-                System.Net.WebProxy myProxy = new System.Net.WebProxy(Address.Text, Convert.ToInt16(Port.Text));
-                myProxy.BypassProxyOnLocal = false;
+                try
+                {
+                    System.Net.WebProxy myProxy = new System.Net.WebProxy(Address.Text, Convert.ToInt16(Port.Text));
+                    myProxy.BypassProxyOnLocal = false;
 
-                if (Authorization.Checked)
+                    if (Authorization.Checked)
+                    {
+                        myProxy.Credentials = new System.Net.NetworkCredential(UserName.Text, Password.Text);
+                    }
+                    GlobalProxySelection.Select = myProxy;
+                }
+                catch (Exception ex)
                 {
-                    myProxy.Credentials = new System.Net.NetworkCredential(UserName.Text, Password.Text);
+                    ErrorHandler.Handle(ex);
                 }
-                GlobalProxySelection.Select = myProxy;
             }
             else
                 GlobalProxySelection.Select = null;

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-08-19 05:44:47 UTC (rev 189)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-08-20 06:02:25 UTC (rev 190)
@@ -268,7 +268,8 @@
                 SetLastSyncText("Sync failed.");
                 notifyIcon.Text = Application.ProductName + "\nSync failed";
 
-                string responseString = ex.ResponseString;
+                string responseString = (null != ex.InnerException) ? ex.ResponseString : ex.Message;
+
                 if (ex.InnerException is System.Net.WebException)
                 {
                     string message = "Cannot connect to Google, please check for available internet connection and proxy settings if applicable: " + ((System.Net.WebException)ex.InnerException).Message + "\r\n" + responseString;


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

Revision: 195
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=195&view=rev
Author:   floriwan
Date:     2011-09-04 10:53:18 +0000 (Sun, 04 Sep 2011)
Log Message:
-----------
FIX: set _sync.SyncContacts properly when resetting matches (fixes https://sourceforge.net/tracker/index.php?func=detail&aid=3403819&group_id=369321&atid=1539126)

Modified Paths:
--------------
    trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
    trunk/GoogleContactsSync/SettingsForm.cs

Modified: trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
===================================================================
--- trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-08-27 15:06:13 UTC (rev 194)
+++ trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2011-09-04 10:53:18 UTC (rev 195)
@@ -31,6 +31,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.5.4.*")]
-//[assembly: AssemblyFileVersion("3.5.4")]
+[assembly: AssemblyVersion("3.5.5.*")]
+//[assembly: AssemblyFileVersion("3.5.5")]
 [assembly: NeutralResourcesLanguageAttribute("en-GB")]

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-08-27 15:06:13 UTC (rev 194)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-09-04 10:53:18 UTC (rev 195)
@@ -621,6 +621,9 @@
                 SetSyncConsoleText("");
                 Logger.Log("Reset Matches started.", EventType.Information);
 
+                _sync.SyncNotes = btSyncNotes.Checked;
+                _sync.SyncContacts = btSyncContacts.Checked;
+
 				_sync.LoginToGoogle(UserName.Text, Password.Text);
 				_sync.LoginToOutlook();
                 _sync.SyncProfile = tbSyncProfile.Text;

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

Revision: 202
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=202&view=rev
Author:   floriwan
Date:     2011-09-11 23:03:35 +0000 (Sun, 11 Sep 2011)
Log Message:
-----------
FIX: Improved NotesSync after GoogleAPI update to version 1.9. Everything is working now, except for the upload of Notes content to Google. Seems to be a API bug, have opened a tracker issue for that on Google API

Modified Paths:
--------------
    trunk/GoogleContactsSync/ILogger.cs
    trunk/GoogleContactsSync/NotePropertiesUtils.cs
    trunk/GoogleContactsSync/NotesMatcher.cs
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/ILogger.cs
===================================================================
--- trunk/GoogleContactsSync/ILogger.cs	2011-09-11 16:21:13 UTC (rev 201)
+++ trunk/GoogleContactsSync/ILogger.cs	2011-09-11 23:03:35 UTC (rev 202)
@@ -31,14 +31,15 @@
         public static event LogUpdatedHandler LogUpdated;
         private static StreamWriter logwriter;
 
+        public static readonly string Folder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\GoContactSyncMOD\\";
+
         static Logger()
         {
-            String path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\GoContactSyncMOD";
-            if (!Directory.Exists(path))
-                Directory.CreateDirectory(path);
+            if (!Directory.Exists(Folder))
+                Directory.CreateDirectory(Folder);
             try
             {
-                logwriter = new StreamWriter(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\GoContactSyncMOD\\log.txt", true);
+                logwriter = new StreamWriter(Folder + "log.txt", true);
             }
             catch (Exception ex)
             {

Modified: trunk/GoogleContactsSync/NotePropertiesUtils.cs
===================================================================
--- trunk/GoogleContactsSync/NotePropertiesUtils.cs	2011-09-11 16:21:13 UTC (rev 201)
+++ trunk/GoogleContactsSync/NotePropertiesUtils.cs	2011-09-11 23:03:35 UTC (rev 202)
@@ -6,6 +6,7 @@
 using System.Collections;
 using Google.Documents;
 using System.Runtime.InteropServices;
+using System.IO;
 
 namespace GoContactSyncMod
 {
@@ -194,59 +195,127 @@
             }
             return id;
         }
-        //public static void ResetOutlookGoogleNoteId(Syncronizer sync, Outlook.NoteItem outlookNote)
-        //{
-        //    Outlook.UserProperties userProperties = outlookNote.UserProperties;
-        //    try
-        //    {
-        //        Outlook.UserProperty idProp = userProperties[sync.OutlookPropertyNameId];
-        //        try
-        //        {
-        //            Outlook.UserProperty lastSyncProp = userProperties[sync.OutlookPropertyNameSynced];
-        //            try
-        //            {
-        //                if (idProp == null && lastSyncProp == null)
-        //                    return;
+        public static void ResetOutlookGoogleNoteId(Syncronizer sync, Outlook.NoteItem outlookNote)
+        {
+            Outlook.ItemProperties userProperties = outlookNote.ItemProperties;
+            try
+            {
+                Outlook.ItemProperty idProp = userProperties[sync.OutlookPropertyNameId];
+                try
+                {
+                    Outlook.ItemProperty lastSyncProp = userProperties[sync.OutlookPropertyNameSynced];
+                    try
+                    {
+                        if (idProp == null && lastSyncProp == null)
+                            return;
 
-        //                List<int> indexesToBeRemoved = new List<int>();
-        //                IEnumerator en = userProperties.GetEnumerator();
-        //                en.Reset();
-        //                int index = 1; // 1 based collection            
-        //                while (en.MoveNext())
-        //                {
-        //                    Outlook.UserProperty userProperty = en.Current as Outlook.UserProperty;
-        //                    if (userProperty == idProp || userProperty == lastSyncProp)
-        //                    {
-        //                        indexesToBeRemoved.Add(index);
-        //                        //outlookNote.UserProperties.Remove(index);
-        //                        //Don't return to remove both properties, googleId and lastSynced
-        //                        //return;
-        //                    }
-        //                    index++;
-        //                    Marshal.ReleaseComObject(userProperty);
-        //                }
+                        List<int> indexesToBeRemoved = new List<int>();
+                        IEnumerator en = userProperties.GetEnumerator();
+                        en.Reset();
+                        int index = 0; // 0 based collection            
+                        while (en.MoveNext())
+                        {
+                            Outlook.ItemProperty userProperty = en.Current as Outlook.ItemProperty;
+                            if (userProperty == idProp || userProperty == lastSyncProp)
+                            {
+                                indexesToBeRemoved.Add(index);
+                                //outlookNote.UserProperties.Remove(index);
+                                //Don't return to remove both properties, googleId and lastSynced
+                                //return;
+                            }
+                            index++;
+                            Marshal.ReleaseComObject(userProperty);
+                        }
 
-        //                for (int i = indexesToBeRemoved.Count - 1; i >= 0; i--)
-        //                    userProperties.Remove(indexesToBeRemoved[i]);
-        //                //throw new Exception("Did not find prop.");
-        //            }
-        //            finally
-        //            {
-        //                if (lastSyncProp != null)
-        //                    Marshal.ReleaseComObject(lastSyncProp);
-        //            }
-        //        }
-        //        finally
-        //        {
-        //            if (idProp != null)
-        //                Marshal.ReleaseComObject(idProp);
-        //        }
-        //    }
-        //    finally
-        //    {
-        //        Marshal.ReleaseComObject(userProperties);
-        //    }
-        //}
+                        for (int i = indexesToBeRemoved.Count - 1; i >= 0; i--)
+                            userProperties.Remove(indexesToBeRemoved[i]);
+                        //throw new Exception("Did not find prop.");
+                    }
+                    finally
+                    {
+                        if (lastSyncProp != null)
+                            Marshal.ReleaseComObject(lastSyncProp);
+                    }
+                }
+                finally
+                {
+                    if (idProp != null)
+                        Marshal.ReleaseComObject(idProp);
+                }
+            }
+            finally
+            {
+                Marshal.ReleaseComObject(userProperties);
+            }
+        }
+
+        public static string GetFileName(string Id)
+        {
+            string fileName = "Note_" + Id + ".txt";
+
+
+            foreach (char c in System.IO.Path.GetInvalidFileNameChars())
+            {
+                fileName = fileName.Replace(c, '_');
+            }
+
+            fileName = Logger.Folder + "\\" + fileName;
+            return fileName;
+        }
+
+        public static string GetBody(Syncronizer sync, Document entry)
+        {
+            string body = null;
+            System.IO.StreamReader reader = null;
+            try
+            {
+                reader = new System.IO.StreamReader(sync.DocumentsRequest.Download(entry, Document.DownloadType.txt));
+                body = reader.ReadToEnd();
+            }
+            finally
+            {
+                if (reader != null)
+                    reader.Close();
+            }
+            return body;
+        }
+
+        public static bool NoteFileExists(string Id)
+        {
+            if (System.IO.File.Exists(GetFileName(Id)))
+                return true;
+
+            return false;
+        }
+
+        public static string CreateNoteFile(string Id, string body)
+        {
+            string fileName = NotePropertiesUtils.GetFileName(Id);
+
+            StreamWriter writer = null;
+            try
+            {
+                FileStream filestream = new FileStream(fileName, FileMode.OpenOrCreate);
+                writer = new StreamWriter(filestream);
+                writer.Write(body);
+            }
+            finally
+            {
+                if (writer != null)
+                    writer.Close();
+            }
+
+            return fileName;
+        }
+
+        public static void DeleteNoteFiles()        
+        {
+            string[] files = Directory.GetFiles(Logger.Folder,@"Note_*.txt");
+
+            foreach (string file in files)
+                File.Delete(file);
+        }
+
                 
     }
 }

Modified: trunk/GoogleContactsSync/NotesMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/NotesMatcher.cs	2011-09-11 16:21:13 UTC (rev 201)
+++ trunk/GoogleContactsSync/NotesMatcher.cs	2011-09-11 23:03:35 UTC (rev 202)
@@ -176,17 +176,16 @@
                 //create a default match pair with just outlook note.
                 NoteMatch match = new NoteMatch(oln, null);
 
-                //foreach google contac try to match and create a match pair if found some match(es)
+                //foreach google contact try to match and create a match pair if found some match(es)
                 for (int j = sync.GoogleNotes.Count - 1; j >= 0; j--)
                 {
-                    Document entry = sync.GoogleNotes[j];                    
+                    Document entry = sync.GoogleNotes[j];
 
-                    // only match if there is either an email or telephone or else
-                    // a matching google note will be created at each sync
-                    //1. try to match by Subject/Title
-                    //2. try to match by Body                    
-                    if (!string.IsNullOrEmpty(oln.Subject) && !string.IsNullOrEmpty(entry.Title) && oln.Subject.Equals(entry.Title, StringComparison.InvariantCultureIgnoreCase) ||
-                        !string.IsNullOrEmpty(oln.Body) && !string.IsNullOrEmpty(entry.Content) && oln.Subject.Equals(entry.Content.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase)
+                    string body = NotePropertiesUtils.GetBody(sync, entry);
+
+                    // only match if there is a note body, else
+                    // a matching google note will be created at each sync                
+                    if (!string.IsNullOrEmpty(oln.Body) && !string.IsNullOrEmpty(body) && oln.Body.Equals(body.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase)
                         )
                     {
                         match.AddGoogleNote(entry);
@@ -409,8 +408,10 @@
             return result;
         }
 
+        
 
 
+
         public static void SyncNotes(Syncronizer sync)
         {
             for (int i = 0; i < sync.Notes.Count; i++)
@@ -466,16 +467,14 @@
                 {
 
                     // no outlook note
-                    //string outlookId = NotePropertiesUtils.GetGoogleOutlookNoteId(sync.SyncProfile, match.GoogleNote);
-                    //if (outlookId != null)
-                    //{
-                    //    //Avoid recreating a OutlookNote already existing
-                    //    //==> Delete this googleNote instead if previous match existed but no match exists anymore                
-                    //    return;
+                    if (NotePropertiesUtils.NoteFileExists(match.GoogleNote.Id))
+                    {
+                        //Avoid recreating a OutlookNote already existing
+                        //==> Delete this googleNote instead if previous match existed but no match exists anymore                
+                        return;
+                    }
 
-                    //}
 
-
                     if (sync.SyncOption == SyncOption.OutlookToGoogleOnly)
                     {
                         sync.SkippedCount++;

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-09-11 16:21:13 UTC (rev 201)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-09-11 23:03:35 UTC (rev 202)
@@ -629,10 +629,22 @@
                 _sync.SyncProfile = tbSyncProfile.Text;
 
                 //Load matches, but match them by properties, not sync id
-				_sync.LoadContacts();                
 
-				_sync.ResetMatches();
+                if (_sync.SyncContacts)
+                {
+                    _sync.LoadContacts();
+                    _sync.ResetContactMatches();
+                }
 
+                //TODO: Syncing notes is not completely working yet. Until it is working, this feature will not be switched on for users
+                if (_sync.SyncNotes)
+                {
+                    _sync.LoadNotes();
+                    _sync.ResetNoteMatches();
+                }
+
+
+
                 lastSync = DateTime.Now;
                 SetLastSyncText("Matches reset at " + lastSync.ToString());
                 Logger.Log("Matches reset.", EventType.Information);                

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-09-11 16:21:13 UTC (rev 201)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-09-11 23:03:35 UTC (rev 202)
@@ -745,6 +745,8 @@
                         if (_noteMatches == null)
                             return;
 
+                        _totalCount += _noteMatches.Count;
+
                         Logger.Log("Syncing notes...", EventType.Information);
                         NotesMatcher.SyncNotes(this);
 
@@ -958,6 +960,12 @@
                         //try
                         //{
                             item.Delete();
+                            try
+                            { //Delete also the according temporary NoteFile
+                                File.Delete(NotePropertiesUtils.GetFileName(NotePropertiesUtils.GetOutlookGoogleNoteId(this,match.OutlookNote)));
+                            }
+                            catch (Exception)
+                            { }
                             _deletedCount++;
                             Logger.Log("Deleted Outlook note: \"" + name + "\".", EventType.Information);
                         //}
@@ -969,37 +977,38 @@
                     }
                 }
             }
-            //else if (match.GoogleNote != null && match.OutlookNote == null)
-            //{
-            //    if (NotePropertiesUtils.GetGoogleOutlookNoteId(SyncProfile, match.GoogleNote) != null)
-            //    {
-            //        string name = match.GoogleNote.Title;
-            //        if (string.IsNullOrEmpty(name))
-            //            name = match.GoogleNote.Name.FullName;
-            //        if (string.IsNullOrEmpty(name) && match.GoogleNote.Organizations.Count > 0)
-            //            name = match.GoogleNote.Organizations[0].Name;
-            //        if (string.IsNullOrEmpty(name) && match.GoogleNote.Emails.Count > 0)
-            //            name = match.GoogleNote.Emails[0].Address;
+            else if (match.GoogleNote != null && match.OutlookNote == null)
+            {
+                if (NotePropertiesUtils.NoteFileExists(match.GoogleNote.Id))
+                {
+                    string name = match.GoogleNote.Title;                    
 
-            //        if (_syncOption == SyncOption.GoogleToOutlookOnly)
-            //        {
-            //            _skippedCount++;
-            //            Logger.Log("Skipped Deletion of Google note because of SyncOption " + _syncOption + ":" + name + ".", EventType.Information);
-            //        }
-            //        else if (!_syncDelete)
-            //        {
-            //            _skippedCount++;
-            //            Logger.Log("Skipped Deletion of Google note because SyncDeletion is switched off :" + name + ".", EventType.Information);
-            //        }
-            //        else
-            //        {
-            //            // peer outlook note was deleted, delete google note
-            //            _notesRequest.Delete(match.GoogleNote);
-            //            _deletedCount++;
-            //            Logger.Log("Deleted Google note: \"" + name + "\".", EventType.Information);
-            //        }
-            //    }
-            //}
+                    if (_syncOption == SyncOption.GoogleToOutlookOnly)
+                    {
+                        _skippedCount++;
+                        Logger.Log("Skipped Deletion of Google note because of SyncOption " + _syncOption + ":" + name + ".", EventType.Information);
+                    }
+                    else if (!_syncDelete)
+                    {
+                        _skippedCount++;
+                        Logger.Log("Skipped Deletion of Google note because SyncDeletion is switched off :" + name + ".", EventType.Information);
+                    }
+                    else
+                    {
+                        // peer outlook note was deleted, delete google note
+                         _documentsRequest.Delete(match.GoogleNote);
+                         try
+                         {//Delete also the according temporary NoteFile
+                             File.Delete(NotePropertiesUtils.GetFileName(match.GoogleNote.Id));
+                         }
+                         catch (Exception)
+                         {}
+
+                        _deletedCount++;
+                        Logger.Log("Deleted Google note: \"" + name + "\".", EventType.Information);
+                    }
+                }
+            }
             else
             {
                 //TODO: ignore for now: 
@@ -1074,10 +1083,13 @@
             Outlook.NoteItem outlookNoteItem = match.OutlookNote;
             //try
             //{
-                //NotePropertiesUtils.SetGoogleOutlookContactId(SyncProfile, match.GoogleNote, outlookNoteItem);
-                match.GoogleNote = SaveGoogleNote(match.GoogleNote);
+                match.GoogleNote = SaveGoogleNote(match.GoogleNote);                
                 NotePropertiesUtils.SetOutlookGoogleNoteId(this, outlookNoteItem, match.GoogleNote);
-                outlookNoteItem.Save();               
+                outlookNoteItem.Save();
+
+                //As GoogleDocuments don't have UserProperties, we have to use the file to check, if Note was already synced or not
+                File.Delete(NotePropertiesUtils.GetFileName(match.GoogleNote.Id));
+                File.Move(NotePropertiesUtils.GetFileName(outlookNoteItem.EntryID), NotePropertiesUtils.GetFileName(match.GoogleNote.Id));
             //}
             //finally
             //{
@@ -1199,9 +1211,8 @@
             {
                 try
                 {
+                    googleNote.DocumentEntry.Update();
                     //note already present in google. just update
-
-                    //ToDo: This doesn't work because the "Updated" tag always returns the error "This element must not contain a text"
                     Document updated = _documentsRequest.Update(googleNote);
                     return updated;
                 }
@@ -1438,17 +1449,29 @@
         public void UpdateNote(Outlook.NoteItem master, Document slave)
         {
             slave.Title = master.Subject;
-            slave.Content = master.Body; //TODO: Content is not the document content, check how this can be done
+
+            string fileName = NotePropertiesUtils.CreateNoteFile(master.EntryID, master.Body);
+
+            string contentType = MediaFileSource.GetContentTypeForFileName(fileName);
+
+            //ToDo: Somewhow, the content is not uploaded to Google, only an empty document
+            slave.MediaSource = new MediaFileSource(fileName, contentType);
+
         }
 
+        
+
+
         /// <summary>
         /// Updates Outlook contact from Google
         /// </summary>
         public void UpdateNote(Document master, Outlook.NoteItem slave)
         {
-            //slave.Subject = master.Title;
-            //ToDo: This doesn't work (not found exception)
-            slave.Body = _documentsRequest.Download(master,Document.DownloadType.txt).ToString();
+            //slave.Subject = master.Title; //The Subject is readonly and set automatically by Outlook
+            slave.Body = NotePropertiesUtils.GetBody(this, master);
+
+            NotePropertiesUtils.CreateNoteFile(master.Id, NotePropertiesUtils.GetBody(this, master));
+
         }
 
 		/// <summary>
@@ -1534,7 +1557,7 @@
 		/// Resets associantions of Outlook contacts with Google contacts via user props
 		/// and resets associantions of Google contacts with Outlook contacts via extended properties.
 		/// </summary>
-		public void ResetMatches()
+		public void ResetContactMatches()
 		{
 			Debug.Assert(_outlookContacts != null, "Outlook Contacts object is null - this should not happen. Please inform Developers.");
             Debug.Assert(_googleContacts != null, "Google Contacts object is null - this should not happen. Please inform Developers.");
@@ -1550,7 +1573,7 @@
 
 			    lock (_syncRoot)
 			    {
-                    Logger.Log("Resetting Google matches...", EventType.Information);
+                    Logger.Log("Resetting Google Contact matches...", EventType.Information);
 				    foreach (Contact googleContact in _googleContacts)
 				    {
                         try
@@ -1572,7 +1595,7 @@
                         }
 				    }
 
-                    Logger.Log("Resetting Outlook matches...", EventType.Information);
+                    Logger.Log("Resetting Outlook Contact matches...", EventType.Information);
                     //1 based array
                     for (int i=1; i <= _outlookContacts.Count; i++)
                     {
@@ -1618,6 +1641,84 @@
 						
 		}
 
+        /// <summary>
+        /// Resets associantions of Outlook notes with Google contacts via user props
+        /// and resets associantions of Google contacts with Outlook contacts via extended properties.
+        /// </summary>
+        public void ResetNoteMatches()
+        {
+            Debug.Assert(_outlookNotes != null, "Outlook Notes object is null - this should not happen. Please inform Developers.");            
+
+            //try
+            //{
+                if (_syncProfile.Length == 0)
+                {
+                    Logger.Log("Must set a sync profile. This should be different on each user/computer you sync on.", EventType.Error);
+                    return;
+                }
+
+
+                lock (_syncRoot)
+                {
+                    Logger.Log("Resetting Google Note matches...", EventType.Information);
+
+                    try
+                    {
+                        NotePropertiesUtils.DeleteNoteFiles();
+                    }
+                    catch (Exception ex)
+                    {                           
+                        Logger.Log("The Google Note matches couldn't be reset: " + ex.Message, EventType.Warning);
+                    }
+                    
+
+                    Logger.Log("Resetting Outlook Note matches...", EventType.Information);
+                    //1 based array
+                    for (int i = 1; i <= _outlookNotes.Count; i++)
+                    {
+                        Outlook.NoteItem outlookNote = null;
+
+                        try
+                        {
+                            outlookNote = _outlookNotes[i] as Outlook.NoteItem;
+                            if (outlookNote == null)
+                            {
+                                Logger.Log("Empty Outlook Note found (maybe distribution list). Skipping", EventType.Warning);
+                                continue;
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            //this is needed because some notes throw exceptions
+                            Logger.Log("Accessing Outlook Note threw and exception. Skipping: " + ex.Message, EventType.Warning);
+                            continue;
+                        }
+
+                        try
+                        {
+                            ResetMatch(outlookNote);
+                        }
+                        catch (Exception ex)
+                        {
+                            Logger.Log("The match of Outlook note " + outlookNote.Subject + " couldn't be reset: " + ex.Message, EventType.Warning);
+                        }
+                    }
+
+                }
+            //}
+            //finally
+            //{
+            //    if (_outlookContacts != null)
+            //    {
+            //        Marshal.ReleaseComObject(_outlookContacts);
+            //        _outlookContacts = null;
+            //    }
+            //    _googleContacts = null;
+            //}
+
+        }
+
+
         ///// <summary>
         ///// Reset the match link between Google and Outlook contact
         ///// </summary>
@@ -1699,6 +1800,30 @@
 
         }
 
+        /// <summary>
+        /// Reset the match link between Outlook and Google note
+        /// </summary>
+        public void ResetMatch(Outlook.NoteItem outlookNote)
+        {
+
+            if (outlookNote != null)
+            {
+                //try
+                //{
+                    NotePropertiesUtils.ResetOutlookGoogleNoteId(this, outlookNote);
+                    outlookNote.Save();
+                //}
+                //finally
+                //{
+                //    Marshal.ReleaseComObject(outlookNote);
+                //    outlookNote = null;
+                //}
+
+            }
+
+
+        }
+
         public ContactMatch ContactByProperty(string name, string email)
         {
             foreach (ContactMatch m in Contacts)

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

Revision: 204
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=204&view=rev
Author:   floriwan
Date:     2011-09-12 09:38:11 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.Designer.cs
    trunk/GoogleContactsSync/Syncronizer.cs
    trunk/GoogleContactsSync/Utilities.cs

Modified: trunk/GoogleContactsSync/SettingsForm.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.Designer.cs	2011-09-12 07:07:12 UTC (rev 203)
+++ trunk/GoogleContactsSync/SettingsForm.Designer.cs	2011-09-12 09:38:11 UTC (rev 204)
@@ -360,7 +360,6 @@
                     "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
                     "ice versa.");
             this.btSyncContacts.UseVisualStyleBackColor = true;
-            this.btSyncContacts.Visible = false;
             // 
             // btSyncNotes
             // 
@@ -374,7 +373,6 @@
                     "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
                     "ice versa.");
             this.btSyncNotes.UseVisualStyleBackColor = true;
-            this.btSyncNotes.Visible = false;
             // 
             // panel1
             // 

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-09-12 07:07:12 UTC (rev 203)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-09-12 09:38:11 UTC (rev 204)
@@ -1211,9 +1211,11 @@
             {
                 try
                 {
-                    googleNote.DocumentEntry.Update();
                     //note already present in google. just update
                     Document updated = _documentsRequest.Update(googleNote);
+
+                    //ToDo: Workaround also doesn't help: Utilities.SaveGoogleNoteContent(this, updated, googleNote);                   
+
                     return updated;
                 }
                 catch (Exception ex)

Modified: trunk/GoogleContactsSync/Utilities.cs
===================================================================
--- trunk/GoogleContactsSync/Utilities.cs	2011-09-12 07:07:12 UTC (rev 203)
+++ trunk/GoogleContactsSync/Utilities.cs	2011-09-12 09:38:11 UTC (rev 204)
@@ -304,5 +304,44 @@
             outlookContact.Categories = outlookContact.Categories.Replace(", " + group, "");
             outlookContact.Categories = outlookContact.Categories.Replace(group, "");
         }
+
+        //ToDo: Workaround to save google Content is also not working, beause of error when closing the StreamWriter
+        //public static bool SaveGoogleNoteContent(Syncronizer sync, Google.Documents.Document updated, Google.Documents.Document googleNote)
+        //{
+
+        //    if (googleNote.DocumentEntry.MediaUri == null || googleNote.MediaSource == null)
+        //        throw new Exception("Must reload note from google.");
+
+        //    StreamWriter writer=null;
+        //    StreamReader reader=null;
+        //    WebClient client = null;
+        //    try
+        //    {
+        //        client = new WebClient();
+        //        client.Headers.Add(HttpRequestHeader.Authorization, "GoogleLogin auth=" + sync.DocumentsRequest.Service.QueryClientLoginToken());
+        //        client.Headers.Add(HttpRequestHeader.ContentType, googleNote.MediaSource.ContentType);
+        //        Stream s = client.OpenWrite(updated.DocumentEntry.MediaUri.ToString(), "PUT");
+        //        writer = new StreamWriter(s);
+        //        reader = new StreamReader(googleNote.MediaSource.GetDataStream());
+        //        string body = reader.ReadToEnd();
+        //        writer.Write(body);
+        //    }
+        //    catch
+        //    {
+        //        return false;
+        //    }
+        //    finally
+        //    {
+        //        if (client != null)
+        //            client.Dispose();
+        //        if (writer != null)
+        //            writer.Close(); //This throws an exception 400 (Ung\xFCltige Anforderung)
+        //        if (reader != null)
+        //            reader.Close();
+                
+        //    }
+
+        //    return true;
+        //}
     }
 }

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

Revision: 206
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=206&view=rev
Author:   floriwan
Date:     2011-09-18 07:39:45 +0000 (Sun, 18 Sep 2011)
Log Message:
-----------
renamed button4_Click
added Exception if whether Notes nor Contacts are synced

Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.Designer.cs
    trunk/GoogleContactsSync/SettingsForm.cs

Modified: trunk/GoogleContactsSync/SettingsForm.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.Designer.cs	2011-09-12 10:06:08 UTC (rev 205)
+++ trunk/GoogleContactsSync/SettingsForm.Designer.cs	2011-09-18 07:39:45 UTC (rev 206)
@@ -134,7 +134,7 @@
             this.syncButton.TabIndex = 1;
             this.syncButton.Text = "S&ync";
             this.syncButton.UseVisualStyleBackColor = true;
-            this.syncButton.Click += new System.EventHandler(this.button4_Click);
+            this.syncButton.Click += new System.EventHandler(this.syncButton_Click);
             // 
             // syncOptionBox
             // 

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-09-12 10:06:08 UTC (rev 205)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-09-18 07:39:45 UTC (rev 206)
@@ -171,7 +171,7 @@
 				box.BackColor = Color.LightGreen;
 		}
 
-		private void button4_Click(object sender, EventArgs e)
+		private void syncButton_Click(object sender, EventArgs e)
 		{
 			Sync();
 		}
@@ -223,6 +223,10 @@
                 _sync.SyncDelete = btSyncDelete.Checked;
                 _sync.SyncNotes = btSyncNotes.Checked;
                 _sync.SyncContacts = btSyncContacts.Checked;
+
+                if (!_sync.SyncContacts && !_sync.SyncNotes)
+                    throw new NotSupportedException("Wether notes nor contacts are switched on for syncing. Please choose at least one option. Sync aborted!");
+
                    
                 _sync.LoginToGoogle(UserName.Text, Password.Text);
                 _sync.LoginToOutlook();

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

Revision: 207
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=207&view=rev
Author:   floriwan
Date:     2011-09-25 08:42:08 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
FIX: Save Notes to notes subfolder
FIX: Save OutlookGoogleId when saving Note

Modified Paths:
--------------
    trunk/GoogleContactsSync/NotesMatcher.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/NotesMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/NotesMatcher.cs	2011-09-18 07:39:45 UTC (rev 206)
+++ trunk/GoogleContactsSync/NotesMatcher.cs	2011-09-25 08:42:08 UTC (rev 207)
@@ -459,6 +459,7 @@
                     //create a Google note from Outlook note
                     match.GoogleNote = new Document();
                     match.GoogleNote.Categories.Add(new AtomCategory("http://schemas.google.com/docs/2007#document"));
+                    //match.GoogleNote.Categories.Add(new AtomCategory("document"));
 
                     sync.UpdateNote(outlookNoteItem, match.GoogleNote);
 

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-09-18 07:39:45 UTC (rev 206)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-09-25 08:42:08 UTC (rev 207)
@@ -140,6 +140,8 @@
 			get { return _googleGroups; }
 		}
 
+        private Document _googleNotesFolder;
+
 		private string _propertyPrefix;
 		public string OutlookPropertyPrefix
 		{
@@ -562,16 +564,40 @@
                 Logger.Log("Loading Google Notes...", EventType.Information);
 
                 _googleNotes = new Collection<Document>();
+                
+                //First get the Notes folder or create it, if not yet existing
+                _googleNotesFolder = null;
+                DocumentQuery query = new DocumentQuery(_documentsRequest.BaseUri);
+                query.Categories.Add(new QueryCategory(new AtomCategory("folder")));
+                query.Title = "Notes";//ToDo: Make the folder configurable in SettingsForm, for now hardcode to "Notes"
+                Feed<Document> feed = _documentsRequest.Get<Document>(query);
 
-                DocumentQuery query = new DocumentQuery(_documentsRequest.BaseUri);
-                //query.Categories.Add(new QueryCategory(new AtomCategory("document")));
+                if (feed != null)
+                {
+                    foreach (Document a in feed.Entries)
+                    {
+                        _googleNotesFolder = a;
+                        break;
+                    }                    
+                }
+
+                if (_googleNotesFolder == null)
+                {
+                    _googleNotesFolder = new Document();
+                    _googleNotesFolder.Categories.Add(new AtomCategory("folder"));
+                    _googleNotesFolder.Title = query.Title;
+                    SaveGoogleNote(_googleNotesFolder);
+                }
+
+                query = new DocumentQuery(_googleNotesFolder.DocumentEntry.Content.AbsoluteUri);
+                query.Categories.Add(new QueryCategory(new AtomCategory("document")));
                 query.NumberToRetrieve = 256;
-                query.StartIndex = 0;
+                query.StartIndex = 0;                
 
                 //query.ShowDeleted = false;
                 //query.OrderBy = "lastmodified";
 
-                Feed<Document> feed = _documentsRequest.Get<Document>(query);
+                feed = _documentsRequest.Get<Document>(query);
 
                 while (feed != null)
                 {
@@ -931,6 +957,7 @@
                 if (!match.OutlookNote.Saved)// || outlookChanged)
                 {
                     //outlook note was modified. save.
+                    NotePropertiesUtils.SetOutlookGoogleNoteId(this, match.OutlookNote, match.GoogleNote);
                     match.OutlookNote.Save();
                     Logger.Log("Updated Outlook note from Google: \"" + match.OutlookNote.Subject + "\".", EventType.Information);
                 }                
@@ -1190,7 +1217,8 @@
             if (googleNote.DocumentEntry.Id.Uri == null)
             {
                 //insert contact.
-                Uri feedUri = new Uri(_documentsRequest.BaseUri);
+                //Uri feedUri = new Uri(_documentsRequest.BaseUri);
+                Uri feedUri = new Uri(_googleNotesFolder.DocumentEntry.Content.AbsoluteUri);
 
                 try
                 {

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

Revision: 209
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=209&view=rev
Author:   floriwan
Date:     2011-09-30 23:37:29 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
Enabled NotesSync after Workaround has been found

Modified Paths:
--------------
    trunk/GoogleContactsSync/NotesMatcher.cs
    trunk/GoogleContactsSync/SettingsForm.Designer.cs
    trunk/GoogleContactsSync/Syncronizer.cs
    trunk/GoogleContactsSync/Utilities.cs

Modified: trunk/GoogleContactsSync/NotesMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/NotesMatcher.cs	2011-09-25 20:24:27 UTC (rev 208)
+++ trunk/GoogleContactsSync/NotesMatcher.cs	2011-09-30 23:37:29 UTC (rev 209)
@@ -182,10 +182,16 @@
                     Document entry = sync.GoogleNotes[j];
 
                     string body = NotePropertiesUtils.GetBody(sync, entry);
+                    if (!String.IsNullOrEmpty(body))
+                        body = body.Replace("\r\n", string.Empty).Replace(" ", string.Empty).Replace("\xA0", string.Empty);
 
+                    string outlookBody = null;
+                    if (!string.IsNullOrEmpty(oln.Body))
+                        outlookBody = oln.Body.Replace("\t", "        ").Replace("\r\n", string.Empty).Replace(" ", string.Empty).Replace("\xA0", string.Empty);
+
                     // only match if there is a note body, else
                     // a matching google note will be created at each sync                
-                    if (!string.IsNullOrEmpty(oln.Body) && !string.IsNullOrEmpty(body) && oln.Body.Equals(body.Replace("\r\n", "\n").Replace("\n", "\r\n"), StringComparison.InvariantCultureIgnoreCase)
+                    if (!string.IsNullOrEmpty(outlookBody) && !string.IsNullOrEmpty(body) && outlookBody.Equals(body, StringComparison.InvariantCultureIgnoreCase)
                         )
                     {
                         match.AddGoogleNote(entry);
@@ -458,7 +464,8 @@
 
                     //create a Google note from Outlook note
                     match.GoogleNote = new Document();
-                    match.GoogleNote.Categories.Add(new AtomCategory("http://schemas.google.com/docs/2007#document"));
+                    match.GoogleNote.Type = Document.DocumentType.Document;
+                    //match.GoogleNote.Categories.Add(new AtomCategory("http://schemas.google.com/docs/2007#document"));
                     //match.GoogleNote.Categories.Add(new AtomCategory("document"));
 
                     sync.UpdateNote(outlookNoteItem, match.GoogleNote);

Modified: trunk/GoogleContactsSync/SettingsForm.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.Designer.cs	2011-09-25 20:24:27 UTC (rev 208)
+++ trunk/GoogleContactsSync/SettingsForm.Designer.cs	2011-09-30 23:37:29 UTC (rev 209)
@@ -374,13 +374,6 @@
                     "ice versa.");
             this.btSyncNotes.UseVisualStyleBackColor = true;
 
-
-#if !debug
-            //ToDo: Remove the following lines, as soon as NotesSync implementation is finished
-            this.btSyncNotes.Visible = false;
-            this.btSyncContacts.Visible = false;
-#endif
-
             // 
             // panel1
             // 

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-09-25 20:24:27 UTC (rev 208)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2011-09-30 23:37:29 UTC (rev 209)
@@ -555,14 +555,22 @@
             }
 
 		}
+
         private void LoadGoogleNotes()
         {
+            LoadGoogleNotes(null);
+        }
+
+        private Document LoadGoogleNotes(AtomId id)
+        {
             string message = "Error Loading Google Notes. Cannot connect to Google.\r\nPlease ensure you are connected to the internet. If you are behind a proxy, change your proxy configuration!";
+
+            Document ret = null;
             try
             {
+                if (id == null) // Only log, if not specific Google Notes are searched
+                    Logger.Log("Loading Google Notes...", EventType.Information);
 
-                Logger.Log("Loading Google Notes...", EventType.Information);
-
                 _googleNotes = new Collection<Document>();
                 
                 //First get the Notes folder or create it, if not yet existing
@@ -584,12 +592,16 @@
                 if (_googleNotesFolder == null)
                 {
                     _googleNotesFolder = new Document();
-                    _googleNotesFolder.Categories.Add(new AtomCategory("folder"));
+                    _googleNotesFolder.Type = Document.DocumentType.Folder;
+                    //_googleNotesFolder.Categories.Add(new AtomCategory("http://schemas.google.com/docs/2007#folder"));
                     _googleNotesFolder.Title = query.Title;
-                    SaveGoogleNote(_googleNotesFolder);
+                    _googleNotesFolder = SaveGoogleNote(_googleNotesFolder);
                 }
 
-                query = new DocumentQuery(_googleNotesFolder.DocumentEntry.Content.AbsoluteUri);
+                if (id == null)
+                    query = new DocumentQuery(_googleNotesFolder.DocumentEntry.Content.AbsoluteUri);
+                else //if newly created
+                    query = new DocumentQuery(_documentsRequest.BaseUri);
                 query.Categories.Add(new QueryCategory(new AtomCategory("document")));
                 query.NumberToRetrieve = 256;
                 query.StartIndex = 0;                
@@ -604,6 +616,8 @@
                     foreach (Document a in feed.Entries)
                     {
                         _googleNotes.Add(a);
+                        if (id != null && id.Equals(a.DocumentEntry.Id))
+                            ret = a;
                     }
                     query.StartIndex += query.NumberToRetrieve;
                     feed = _documentsRequest.Get<Document>(feed, FeedRequestType.Next);
@@ -620,7 +634,9 @@
             {
                 //Logger.Log(message, EventType.Error);
                 throw new GDataRequestException(message, new System.Net.WebException("Error accessing feed", ex));
-            }            
+            }
+
+            return ret;
         }
         /// <summary>
         /// Load the contacts from Google and Outlook
@@ -1024,7 +1040,13 @@
                     {
                         // peer outlook note was deleted, delete google note
                          _documentsRequest.Delete(match.GoogleNote);
-                         try
+                         
+                        //ToDo: Currently, the Delete only removes the Notes label from the document but keeps the document in the root folder, therefore the following workaround
+                         Document deletedNote = LoadGoogleNotes(match.GoogleNote.DocumentEntry.Id);
+                         if (deletedNote != null)
+                             _documentsRequest.Delete(deletedNote);
+                        
+                        try
                          {//Delete also the according temporary NoteFile
                              File.Delete(NotePropertiesUtils.GetFileName(match.GoogleNote.Id));
                          }
@@ -1109,8 +1131,27 @@
         {
             Outlook.NoteItem outlookNoteItem = match.OutlookNote;
             //try
-            //{
-                match.GoogleNote = SaveGoogleNote(match.GoogleNote);                
+            //{  
+
+                //ToDo: Somewhow, the content is not uploaded to Google, only an empty document                
+                //match.GoogleNote = SaveGoogleNote(match.GoogleNote);
+
+                //ToDo: Therefoe I use DocumentService.UploadDocument instead and move it to the NotesFolder
+                if (match.GoogleNote.DocumentEntry.Id.Uri != null)
+                {
+                    _documentsRequest.Delete(match.GoogleNote);
+
+                    //ToDo: Currently, the Delete only removes the Notes label from the document but keeps the document in the root folder
+                    Document deletedNote = LoadGoogleNotes(match.GoogleNote.DocumentEntry.Id);
+                    if (deletedNote != null)
+                        _documentsRequest.Delete(deletedNote);
+
+                }
+
+                Google.GData.Documents.DocumentEntry entry = _documentsRequest.Service.UploadDocument(NotePropertiesUtils.GetFileName(outlookNoteItem.EntryID), match.GoogleNote.Title.Replace(":", String.Empty));                               
+                Document newNote = LoadGoogleNotes(entry.Id);
+                match.GoogleNote = _documentsRequest.MoveDocumentTo(_googleNotesFolder, newNote);               
+                
                 NotePropertiesUtils.SetOutlookGoogleNoteId(this, outlookNoteItem, match.GoogleNote);
                 outlookNoteItem.Save();
 
@@ -1217,12 +1258,22 @@
             if (googleNote.DocumentEntry.Id.Uri == null)
             {
                 //insert contact.
-                //Uri feedUri = new Uri(_documentsRequest.BaseUri);
-                Uri feedUri = new Uri(_googleNotesFolder.DocumentEntry.Content.AbsoluteUri);
+                Uri feedUri = null;
 
                 try
+                {//In case of Notes folder creation, the _googleNotesFolder.DocumentEntry.Content.AbsoluteUri throws a NullReferenceException
+                    feedUri = new Uri(_googleNotesFolder.DocumentEntry.Content.AbsoluteUri);
+                }
+                catch (Exception)
+                { }
+
+                if (feedUri == null)                
+                    feedUri = new Uri(_documentsRequest.BaseUri);               
+
+                try
                 {
                     Document createdEntry = _documentsRequest.Insert(feedUri, googleNote);
+                    //ToDo: Workaround also doesn't help: Utilities.SaveGoogleNoteContent(this, createdEntry, googleNote);    
                     return createdEntry;
                 }
                 catch (Exception ex)
@@ -1485,6 +1536,7 @@
             string contentType = MediaFileSource.GetContentTypeForFileName(fileName);
 
             //ToDo: Somewhow, the content is not uploaded to Google, only an empty document
+            //Therefoe I use DocumentService.UploadDocument instead.
             slave.MediaSource = new MediaFileSource(fileName, contentType);
 
         }

Modified: trunk/GoogleContactsSync/Utilities.cs
===================================================================
--- trunk/GoogleContactsSync/Utilities.cs	2011-09-25 20:24:27 UTC (rev 208)
+++ trunk/GoogleContactsSync/Utilities.cs	2011-09-30 23:37:29 UTC (rev 209)
@@ -309,18 +309,18 @@
         //public static bool SaveGoogleNoteContent(Syncronizer sync, Google.Documents.Document updated, Google.Documents.Document googleNote)
         //{
 
-        //    if (googleNote.DocumentEntry.MediaUri == null || googleNote.MediaSource == null)
+        //    if (updated.DocumentEntry.EditUri == null || googleNote.MediaSource == null)
         //        throw new Exception("Must reload note from google.");
 
-        //    StreamWriter writer=null;
-        //    StreamReader reader=null;
+        //    StreamWriter writer = null;
+        //    StreamReader reader = null;
         //    WebClient client = null;
         //    try
         //    {
         //        client = new WebClient();
         //        client.Headers.Add(HttpRequestHeader.Authorization, "GoogleLogin auth=" + sync.DocumentsRequest.Service.QueryClientLoginToken());
         //        client.Headers.Add(HttpRequestHeader.ContentType, googleNote.MediaSource.ContentType);
-        //        Stream s = client.OpenWrite(updated.DocumentEntry.MediaUri.ToString(), "PUT");
+        //        Stream s = client.OpenWrite(updated.DocumentEntry.EditUri.ToString(), "PUT");
         //        writer = new StreamWriter(s);
         //        reader = new StreamReader(googleNote.MediaSource.GetDataStream());
         //        string body = reader.ReadToEnd();
@@ -338,7 +338,7 @@
         //            writer.Close(); //This throws an exception 400 (Ung\xFCltige Anforderung)
         //        if (reader != null)
         //            reader.Close();
-                
+
         //    }
 
         //    return true;

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

Revision: 210
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=210&view=rev
Author:   v2l
Date:     2011-10-03 07:00:13 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
FIX: remove warning in compile GoContactSync
FIX: restore default/system proxy
ADD: move proxy settings to release

Modified Paths:
--------------
    trunk/GoogleContactsSync/ProxySettings.cs
    trunk/GoogleContactsSync/SettingsForm.cs

Modified: trunk/GoogleContactsSync/ProxySettings.cs
===================================================================
--- trunk/GoogleContactsSync/ProxySettings.cs	2011-09-30 23:37:29 UTC (rev 209)
+++ trunk/GoogleContactsSync/ProxySettings.cs	2011-10-03 07:00:13 UTC (rev 210)
@@ -13,6 +13,7 @@
 {
     partial class ProxySettingsForm : Form
     {
+        private static IWebProxy _systemProxy = new System.Net.WebProxy();
 
         private void Form_Changed(object sender, EventArgs e)
         {
@@ -36,7 +37,7 @@
             {
                 bool userNameIsValid = Regex.IsMatch(UserName.Text, @"^(?'id'[a-z0-9\\\/\@\'\%\._\+\-]+)$", RegexOptions.IgnoreCase);
                 bool passwordIsValid = Password.Text.Length != 0;
-                bool AddressIsValid = Regex.IsMatch(Address.Text, @"^(?'url'[\w\d#@%;$()~_?\\\.&]*)$", RegexOptions.IgnoreCase);
+                bool AddressIsValid = Regex.IsMatch(Address.Text, @"^(?'url'[\w\d#@%;$()~_?\\\.&]+)$", RegexOptions.IgnoreCase);
                 bool PortIsValid     = Regex.IsMatch(Port.Text, @"^(?'port'[0-9]{2,6})$", RegexOptions.IgnoreCase);
 
 
@@ -72,22 +73,23 @@
                     {
                         myProxy.Credentials = new System.Net.NetworkCredential(UserName.Text, Password.Text);
                     }
-                    GlobalProxySelection.Select = myProxy;
+                    WebRequest.DefaultWebProxy = myProxy;
                 }
                 catch (Exception ex)
                 {
                     ErrorHandler.Handle(ex);
                 }
             }
-            else
-                GlobalProxySelection.Select = null;
+            else // to do set defaul system proxy
+                WebRequest.DefaultWebProxy = _systemProxy;
         }
 
         public ProxySettingsForm()
         {
             InitializeComponent();
+            _systemProxy = WebRequest.DefaultWebProxy;
             LoadSettings();
-            
+            FormSettings();            
             ProxySet();
         }
 
@@ -121,8 +123,6 @@
                     }
                 }
             }
-
-            FormSettings();
         }
 
         private void SaveSettings()
@@ -161,11 +161,12 @@
 
         private void okButton_Click(object sender, EventArgs e)
         {
-            if (!ValidCredentials)
+            if (!ValidCredentials) 
                 return;
 
+            ProxySet();
             SaveSettings();
-            ProxySet();
+
             this.Hide();
         }
 

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-09-30 23:37:29 UTC (rev 209)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-10-03 07:00:13 UTC (rev 210)
@@ -22,9 +22,7 @@
 		private DateTime lastSync;
 		private bool requestClose = false;
         private bool boolShowBalloonTip = true;
-#if debug
         private ProxySettingsForm _proxy = new ProxySettingsForm(); 
-#endif
 
         //register window for lock/unlock messages of workstation
         private bool registered = false;
@@ -784,67 +782,9 @@
 
 		private void proxySettingsLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
 		{
-			// TODO: Implement a dialog with proxy settings and use them when connecting with Google
-#if debug
             if (_proxy != null) _proxy.Show();
-#else
-			// Alpha quick'm'dirty workaround solution
-		  try
-			{
-				if (MessageBox.Show("The proxy configuration is in beta stage, a more comfortable solution is to come. For now, you have to edit the Applications Config file with administrator privileges.\n\nOpen Configuration file now?",
-					"GO Contact Sync Mod", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == System.Windows.Forms.DialogResult.OK)
-				{
-					StartFileSystemWatcher();
-					try
-					{
-						ProcessStartInfo psi = new ProcessStartInfo();
-						psi.Arguments = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
-						// full path not required, notepad is usually installed in system directory
-						psi.FileName = "notepad.exe";
-						// Vista and Win7 UAC Control
-						psi.Verb = "runas";
-						Process.Start(psi);
-					}
-					catch (Exception)
-					{
-						// fallback if notepad is not found/installed
-						// in default configuration this will open Internet Explorer, but user can then see the path and open an editor himself
-						Process.Start(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile);
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				ErrorHandler.Handle(ex);
-			}
-#endif
         }
 
-		FileSystemWatcher fsw = null;
-		
-        private void StartFileSystemWatcher()
-		{
-			if (fsw == null)
-			{
-				fsw = new FileSystemWatcher();
-				fsw.Path = Path.GetDirectoryName(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile);
-				fsw.Filter = Path.GetFileName(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile);
-				fsw.NotifyFilter = NotifyFilters.LastWrite;
-				fsw.Changed += delegate
-				{
-					this.BeginInvoke((MethodInvoker)delegate
-					{
-						MessageBox.Show(this, "If you have changed your proxy configuration, restart the Program to take effect.", "GO Contact Sync Mod");
-					});
-					// cleanup after we've notified the user
-					fsw.EnableRaisingEvents = false;
-					fsw.Dispose();
-					fsw = null;
-				};
-				fsw.EnableRaisingEvents = true;
-			}
-		}
-
 		private void SettingsForm_HelpButtonClicked(object sender, CancelEventArgs e)
 		{
 			ShowHelp();

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

Revision: 217
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=217&view=rev
Author:   floriwan
Date:     2011-11-06 08:41:54 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
IMPROVEMENT: added balloon after first run, see https://sourceforge.net/tracker/?func=detail&aid=3429308&group_id=369321&atid=1539126

Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.Designer.cs
    trunk/GoogleContactsSync/SettingsForm.cs

Modified: trunk/GoogleContactsSync/SettingsForm.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.Designer.cs	2011-11-04 06:49:15 UTC (rev 216)
+++ trunk/GoogleContactsSync/SettingsForm.Designer.cs	2011-11-06 08:41:54 UTC (rev 217)
@@ -74,6 +74,7 @@
             this.hideButton = new System.Windows.Forms.Button();
             this.MainPanel = new System.Windows.Forms.Panel();
             this.MainSplitter = new System.Windows.Forms.Splitter();
+            this.cmbFolders = new System.Windows.Forms.ComboBox();
             this.systemTrayMenu.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.autoSyncInterval)).BeginInit();
             this.groupBox1.SuspendLayout();
@@ -373,7 +374,6 @@
                     "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
                     "ice versa.");
             this.btSyncNotes.UseVisualStyleBackColor = true;
-
             // 
             // panel1
             // 
@@ -577,6 +577,16 @@
             this.MainSplitter.TabIndex = 5;
             this.MainSplitter.TabStop = false;
             // 
+            // comboBox1
+            // 
+            this.cmbFolders.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbFolders.FormattingEnabled = true;
+            this.cmbFolders.Location = new System.Drawing.Point(172, 450);
+            this.cmbFolders.Name = "comboBox1";
+            this.cmbFolders.Size = new System.Drawing.Size(303, 21);
+            this.cmbFolders.Sorted = true;
+            this.cmbFolders.TabIndex = 6;
+            // 
             // SettingsForm
             // 
             this.AcceptButton = this.syncButton;
@@ -584,6 +594,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.hideButton;
             this.ClientSize = new System.Drawing.Size(722, 490);
+            this.Controls.Add(this.cmbFolders);
             this.Controls.Add(this.Donate);
             this.Controls.Add(this.MainPanel);
             this.Controls.Add(this.resetMatchesLinkLabel);
@@ -668,6 +679,7 @@
         private System.Windows.Forms.CheckBox reportSyncResultCheckBox;
         private System.Windows.Forms.CheckBox btSyncNotes;
         private System.Windows.Forms.CheckBox btSyncContacts;
+        private System.Windows.Forms.ComboBox cmbFolders;
     }
 }
 

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-11-04 06:49:15 UTC (rev 216)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2011-11-06 08:41:54 UTC (rev 217)
@@ -673,6 +673,23 @@
 
         private void ShowForm()
         {
+#if debug
+            //ToDo: Implement folders to be used
+            cmbFolders.Visible = true;
+            try
+            {
+                this.cmbFolders.Items.Clear();
+                Microsoft.Office.Interop.Outlook.Folders folders = Syncronizer.OutlookNameSpace.Folders;
+                foreach (Microsoft.Office.Interop.Outlook.Folder folder in folders)
+                    this.cmbFolders.Items.Add(folder.Name);
+            }
+            catch (Exception e)
+            {
+                Logger.Log("Error getting available Outlook folders: " + e.Message, EventType.Warning);
+            }
+#else
+            cmbFolders.Visible = false;
+#endif
             Show();
             WindowState = FormWindowState.Normal;
         }
@@ -715,6 +732,10 @@
 				// this is the first load, show form
 				ShowForm();
 				UserName.Focus();
+                ShowBalloonToolTip(Application.ProductName,
+                        "Application started and visible in your PC's system tray, click on this balloon or the icon below to open the settings form and enter your Google credentials there.",
+                        ToolTipIcon.Info,
+                        5000);
 			}
 			else
 				HideForm();
@@ -800,8 +821,7 @@
 			// go to the page showing the help and howto instructions
 			Process.Start("http://googlesyncmod.sourceforge.net/");
 		}
-
-     
+    
 	}
 
 	//internal class EventLogger : ILogger

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

Revision: 223
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=223&view=rev
Author:   floriwan
Date:     2012-01-03 13:00:51 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
FIX: handled OleAut Date exceptions when updating birthday
IMPROVEMENT: open Settings GUI of running GCSM process when starting new instance (instead of error message, that a process is already running)

Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactSync.cs
    trunk/GoogleContactsSync/Program.cs
    trunk/GoogleContactsSync/SettingsForm.Designer.cs
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/ContactSync.cs
===================================================================
--- trunk/GoogleContactsSync/ContactSync.cs	2011-12-12 12:10:08 UTC (rev 222)
+++ trunk/GoogleContactsSync/ContactSync.cs	2012-01-03 13:00:51 UTC (rev 223)
@@ -467,10 +467,17 @@
             #endregion Name
 
             #region Birtday
-            if (master.Birthday.Equals(outlookDateNone)) //earlier also || master.Birthday.Year < 1900
-                slave.ContactEntry.Birthday = null;
-            else
-                slave.ContactEntry.Birthday = master.Birthday.ToString("yyyy-MM-dd");
+            try
+            {
+                if (master.Birthday.Equals(outlookDateNone)) //earlier also || master.Birthday.Year < 1900
+                    slave.ContactEntry.Birthday = null;
+                else
+                    slave.ContactEntry.Birthday = master.Birthday.ToString("yyyy-MM-dd");
+            }            
+            catch (Exception ex)
+            {
+                Logger.Log("Birthday couldn't be updated from Outlook to Google for '" + master.FileAs + "': " + ex.Message, EventType.Error);
+            }
             #endregion Birthday
 
             slave.ContactEntry.Nickname = master.NickName;
@@ -500,16 +507,23 @@
                     break;
                 }
             }
-            //Then add it again if existing
-            if (!master.Anniversary.Equals(outlookDateNone)) //earlier also || master.Birthday.Year < 1900
+            try
             {
-                Event ev = new Event();
-                ev.Relation = relAnniversary;
-                ev.When = new When();
-                ev.When.AllDay = true;
-                ev.When.StartTime = master.Anniversary.Date;            
-                slave.ContactEntry.Events.Add(ev);
+                //Then add it again if existing
+                if (!master.Anniversary.Equals(outlookDateNone)) //earlier also || master.Birthday.Year < 1900
+                {
+                    Event ev = new Event();
+                    ev.Relation = relAnniversary;
+                    ev.When = new When();
+                    ev.When.AllDay = true;
+                    ev.When.StartTime = master.Anniversary.Date;            
+                    slave.ContactEntry.Events.Add(ev);
+                }
             }
+            catch (Exception ex)
+            {
+                Logger.Log("Anniversary couldn't be updated from Outlook to Google for '" + master.FileAs + "': " + ex.Message, EventType.Error);
+            }
             #endregion anniversary
 
             #region relations (spouse, child, manager and assistant)

Modified: trunk/GoogleContactsSync/Program.cs
===================================================================
--- trunk/GoogleContactsSync/Program.cs	2011-12-12 12:10:08 UTC (rev 222)
+++ trunk/GoogleContactsSync/Program.cs	2012-01-03 13:00:51 UTC (rev 223)
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
 
 namespace GoContactSyncMod
 {
@@ -8,6 +10,14 @@
     {
 		private static SettingsForm instance;
 
+        public const int HWND_BROADCAST = 0xffff;
+        public static readonly int WM_SHOWME = RegisterWindowMessage("WM_SHOWME");
+        [DllImport("user32")]
+        public static extern bool PostMessage(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam);
+        [DllImport("user32")]
+        public static extern int RegisterWindowMessage(string message);
+
+
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
@@ -20,7 +30,9 @@
 
             if (!ok)
             {
-                MessageBox.Show("Another instance of Go Contact Sync Mod is already running.","GO Contact Sync Mod",MessageBoxButtons.OK);
+                //Message.Create((IntPtr)HWND_BROADCAST, WM_SHOWME, IntPtr.Zero, IntPtr.Zero);                
+                PostMessage((IntPtr)HWND_BROADCAST, WM_SHOWME, IntPtr.Zero, IntPtr.Zero);                
+                //MessageBox.Show("Another instance of Go Contact Sync Mod is already running.","GO Contact Sync Mod",MessageBoxButtons.OK);
                 return;
             }
             AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);

Modified: trunk/GoogleContactsSync/SettingsForm.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.Designer.cs	2011-12-12 12:10:08 UTC (rev 222)
+++ trunk/GoogleContactsSync/SettingsForm.Designer.cs	2012-01-03 13:00:51 UTC (rev 223)
@@ -361,6 +361,7 @@
                     "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
                     "ice versa.");
             this.btSyncContacts.UseVisualStyleBackColor = true;
+            this.btSyncContacts.CheckedChanged += new System.EventHandler(this.btSyncContacts_CheckedChanged);
             // 
             // btSyncNotes
             // 
@@ -374,6 +375,7 @@
                     "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
                     "ice versa.");
             this.btSyncNotes.UseVisualStyleBackColor = true;
+            this.btSyncNotes.CheckedChanged += new System.EventHandler(this.btSyncNotes_CheckedChanged);
             // 
             // panel1
             // 
@@ -577,12 +579,12 @@
             this.MainSplitter.TabIndex = 5;
             this.MainSplitter.TabStop = false;
             // 
-            // comboBox1
+            // cmbFolders
             // 
             this.cmbFolders.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbFolders.FormattingEnabled = true;
             this.cmbFolders.Location = new System.Drawing.Point(172, 450);
-            this.cmbFolders.Name = "comboBox1";
+            this.cmbFolders.Name = "cmbFolders";
             this.cmbFolders.Size = new System.Drawing.Size(303, 21);
             this.cmbFolders.Sorted = true;
             this.cmbFolders.TabIndex = 6;

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2011-12-12 12:10:08 UTC (rev 222)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2012-01-03 13:00:51 UTC (rev 223)
@@ -223,7 +223,10 @@
                 _sync.SyncContacts = btSyncContacts.Checked;
 
                 if (!_sync.SyncContacts && !_sync.SyncNotes)
-                    throw new NotSupportedException("Wether notes nor contacts are switched on for syncing. Please choose at least one option. Sync aborted!");
+                {
+                    ShowForm();
+                    throw new NotSupportedException("Neither notes nor contacts are switched on for syncing. Please choose at least one option. Sync aborted!");
+                }
 
                    
                 _sync.LoginToGoogle(UserName.Text, Password.Text);
@@ -286,7 +289,7 @@
             {
                 SetLastSyncText("Sync failed.");
                 notifyIcon.Text = Application.ProductName + "\nSync failed";
-                ErrorHandler.Handle(ex);
+                ErrorHandler.Handle(ex);                                
             }							
 			finally
 			{                        
@@ -498,6 +501,9 @@
                     OnSessionUnlock(); // Do something when unlocked
             }*/
 			// If this is WM_QUERYENDSESSION, the form must exit and not just hide
+
+            if (m.Msg == Program.WM_SHOWME)
+                ShowForm();
 			base.WndProc(ref m);
 		} 
 
@@ -671,8 +677,16 @@
 			}
 		}
 
+        private delegate void InvokeCallback(); 
+
         private void ShowForm()
         {
+            if (this.InvokeRequired)
+            {
+                Invoke(new InvokeCallback(ShowForm));
+            }
+            else
+            {
 #if debug
             //ToDo: Implement folders to be used
             cmbFolders.Visible = true;
@@ -688,10 +702,12 @@
                 Logger.Log("Error getting available Outlook folders: " + e.Message, EventType.Warning);
             }
 #else
-            cmbFolders.Visible = false;
+                cmbFolders.Visible = false;
 #endif
-            Show();
-            WindowState = FormWindowState.Normal;
+                Show();
+                Activate();
+                WindowState = FormWindowState.Normal;
+            }
         }
 		private void HideForm()
 		{
@@ -821,6 +837,24 @@
 			// go to the page showing the help and howto instructions
 			Process.Start("http://googlesyncmod.sourceforge.net/");
 		}
+
+        private void btSyncContacts_CheckedChanged(object sender, EventArgs e)
+        {
+            if (!btSyncContacts.Checked && !btSyncNotes.Checked)
+            {
+                MessageBox.Show("Neither notes nor contacts are switched on for syncing. Please choose at least one option (automatically switched on notes for syncing now).", "No sync switched on");
+                btSyncNotes.Checked = true;
+            }
+        }
+
+        private void btSyncNotes_CheckedChanged(object sender, EventArgs e)
+        {
+            if (!btSyncContacts.Checked && !btSyncNotes.Checked)
+            {
+                MessageBox.Show("Neither notes nor contacts are switched on for syncing. Please choose at least one option (automatically switched on contacts for syncing now).", "No sync switched on");
+                btSyncContacts.Checked = true;
+            }
+        }
     
 	}
 

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2011-12-12 12:10:08 UTC (rev 222)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2012-01-03 13:00:51 UTC (rev 223)
@@ -715,8 +715,7 @@
 
                     if (_syncContacts)
                         MatchContacts();
-                    
-                    //TODO: Syncing notes is not completely working yet. Until it is working, this feature will not be switched on for users
+                                       
                     if (_syncNotes)
                         MatchNotes();
 

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

Revision: 226
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=226&view=rev
Author:   floriwan
Date:     2012-01-29 10:07:20 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/GoogleContactsSync/ContactsMatcher.cs
    trunk/GoogleContactsSync/SettingsForm.cs

Modified: trunk/GoogleContactsSync/ContactsMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/ContactsMatcher.cs	2012-01-24 09:06:53 UTC (rev 225)
+++ trunk/GoogleContactsSync/ContactsMatcher.cs	2012-01-29 10:07:20 UTC (rev 226)
@@ -654,7 +654,7 @@
                                 case SyncOption.GoogleToOutlookOnly:
                                     //overwrite outlook contact
                                     Logger.Log("Outlook and Google contact have been updated, Google contact is overwriting Outlook because of SyncOption " + sync.SyncOption + ": " + match.OutlookContact.FileAs + ".", EventType.Information);
-                                    sync.UpdateContact(match.GoogleContact, outlookContactItem);                                
+                                    sync.UpdateContact(match.GoogleContact, outlookContactItem);
                                     break;
                                 case SyncOption.MergePrompt:
                                     //promp for sync option
@@ -670,7 +670,7 @@
                                             sync.UpdateContact(outlookContactItem, match.GoogleContact);
                                             break;
                                         case ConflictResolution.GoogleWins:
-                                            sync.UpdateContact(match.GoogleContact, outlookContactItem);                                        
+                                            sync.UpdateContact(match.GoogleContact, outlookContactItem);
                                             break;
                                         default:
                                             break;
@@ -679,8 +679,8 @@
                             }
                             return;
                         }
-                    
 
+
                         //check if outlook contact was updated (with X second tolerance)
                         if (sync.SyncOption != SyncOption.GoogleToOutlookOnly &&
                             (lastUpdatedOutlook.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance ||
@@ -691,7 +691,7 @@
                         {
                             //outlook contact was changed or changed Google contact will be overwritten
 
-                            if (lastUpdatedGoogle.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance && 
+                            if (lastUpdatedGoogle.Subtract(lastSynced.Value).TotalSeconds > TimeTolerance &&
                                 sync.SyncOption == SyncOption.OutlookToGoogleOnly)
                                 Logger.Log("Google contact has been updated since last sync, but Outlook contact is overwriting Google because of SyncOption " + sync.SyncOption + ": " + match.OutlookContact.FileAs + ".", EventType.Information);
 
@@ -699,7 +699,7 @@
 
                             //at the moment use outlook as "master" source of contacts - in the event of a conflict google contact will be overwritten.
                             //TODO: control conflict resolution by SyncOption
-                            return;                        
+                            return;
                         }
 
                         //check if google contact was updated (with X second tolerance)
@@ -754,7 +754,7 @@
                                     default:
                                         break;
                                 }
-                                break;                        
+                                break;
                         }
                     }
 
@@ -762,6 +762,14 @@
                 else
                     throw new ArgumentNullException("ContactMatch has all peers null.");
             }
+            catch (ArgumentNullException e)
+            {
+                throw e;
+            }
+            catch (Exception e)
+            {
+                throw new Exception("Error syncing contact " + (match.OutlookContact != null ? match.OutlookContact.FileAs : match.GoogleContact.Title) + ": " + e.Message, e);
+            }
             finally
             {
                 if (outlookContactItem != null &&

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2012-01-24 09:06:53 UTC (rev 225)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2012-01-29 10:07:20 UTC (rev 226)
@@ -449,6 +449,16 @@
         private const int WM_WTSSESSION_CHANGE = 0x02B1;
         private const int WTS_SESSION_LOCK = 0x7;
         private const int WTS_SESSION_UNLOCK = 0x8;
+
+        //Code to find if workstation is resumed
+        const int WM_POWERBROADCAST = 0x0218;
+        const int PBT_APMSUSPEND = 0x0004;
+        const int PBT_APMSTANDBY = 0x0005;
+        const int PBT_APMRESUMECRITICAL = 0x0006;
+        const int PBT_APMRESUMESUSPEND = 0x0007;
+        const int PBT_APMRESUMESTANDBY = 0x0008;
+        const int PBT_APMRESUMEAUTOMATIC = 0x0012;
+
         
         /*
         protected void OnSessionLock()
@@ -486,6 +496,25 @@
                             boolShowBalloonTip = true; // Do something when unlocked
                         }
                      break;
+                    }                
+                case WM_POWERBROADCAST:
+                    {
+                        if (m.WParam.ToInt32() == PBT_APMRESUMEAUTOMATIC ||
+                            m.WParam.ToInt32() == PBT_APMRESUMECRITICAL ||
+                            m.WParam.ToInt32() == PBT_APMRESUMESTANDBY ||
+                            m.WParam.ToInt32() == PBT_APMRESUMESUSPEND)
+                        {
+                            //If PC resumes, give him 90 seconds to recover everything before the sync starts
+                            if (lastSync <= DateTime.Now - new TimeSpan(0, (int)autoSyncInterval.Value, 0))
+                                lastSync = DateTime.Now.AddSeconds(90) - new TimeSpan(0, (int)autoSyncInterval.Value, 0);
+                            TimerSwitch(true);
+                        }
+                        else if (m.WParam.ToInt32() == PBT_APMSUSPEND ||
+                            m.WParam.ToInt32() == PBT_APMSTANDBY)
+                        {
+                            TimerSwitch(false);
+                        }
+                        break;
                     }
                 default:
                     break;

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

Revision: 227
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=227&view=rev
Author:   floriwan
Date:     2012-01-29 11:18:40 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
FIX: Improved error handling, especially when invalid credentials=> show the settings form

Modified Paths:
--------------
    trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
    trunk/GoogleContactsSync/SettingsForm.cs

Modified: trunk/GoogleContactsSync/Properties/AssemblyInfo.cs
===================================================================
--- trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2012-01-29 10:07:20 UTC (rev 226)
+++ trunk/GoogleContactsSync/Properties/AssemblyInfo.cs	2012-01-29 11:18:40 UTC (rev 227)
@@ -31,6 +31,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.5.8.*")]
-//[assembly: AssemblyFileVersion("3.5.8")]
+[assembly: AssemblyVersion("3.5.9.*")]
+//[assembly: AssemblyFileVersion("3.5.9")]
 [assembly: NeutralResourcesLanguageAttribute("en-GB")]

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2012-01-29 10:07:20 UTC (rev 226)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2012-01-29 11:18:40 UTC (rev 227)
@@ -198,26 +198,26 @@
 
 		private void Sync_ThreadStarter()
 		{
-			try
-			{
-				TimerSwitch(false);
-				SetLastSyncText("Syncing...");
+            try
+            {
+                TimerSwitch(false);
+                SetLastSyncText("Syncing...");
                 notifyIcon.Text = Application.ProductName + "\nSyncing...";
-				SetFormEnabled(false);
+                SetFormEnabled(false);
 
-				if (_sync == null)
-				{
-					_sync = new Syncronizer();
-					_sync.DuplicatesFound += new Syncronizer.DuplicatesFoundHandler(OnDuplicatesFound);
-					_sync.ErrorEncountered += new Syncronizer.ErrorNotificationHandler(OnErrorEncountered);                    
-				}
+                if (_sync == null)
+                {
+                    _sync = new Syncronizer();
+                    _sync.DuplicatesFound += new Syncronizer.DuplicatesFoundHandler(OnDuplicatesFound);
+                    _sync.ErrorEncountered += new Syncronizer.ErrorNotificationHandler(OnErrorEncountered);
+                }
 
-				Logger.ClearLog();
-				SetSyncConsoleText("");
-				Logger.Log("Sync started.", EventType.Information);
-				//SetSyncConsoleText(Logger.GetText());
-				_sync.SyncProfile = tbSyncProfile.Text;
-				_sync.SyncOption = _syncOption;
+                Logger.ClearLog();
+                SetSyncConsoleText("");
+                Logger.Log("Sync started.", EventType.Information);
+                //SetSyncConsoleText(Logger.GetText());
+                _sync.SyncProfile = tbSyncProfile.Text;
+                _sync.SyncOption = _syncOption;
                 _sync.SyncDelete = btSyncDelete.Checked;
                 _sync.SyncNotes = btSyncNotes.Checked;
                 _sync.SyncContacts = btSyncContacts.Checked;
@@ -228,12 +228,12 @@
                     throw new NotSupportedException("Neither notes nor contacts are switched on for syncing. Please choose at least one option. Sync aborted!");
                 }
 
-                   
+
                 _sync.LoginToGoogle(UserName.Text, Password.Text);
                 _sync.LoginToOutlook();
 
                 _sync.Sync();
-                    
+
                 lastSync = DateTime.Now;
                 SetLastSyncText("Last synced at " + lastSync.ToString());
 
@@ -272,11 +272,11 @@
                 SetLastSyncText("Sync failed.");
                 notifyIcon.Text = Application.ProductName + "\nSync failed";
 
-                string responseString = (null != ex.InnerException) ? ex.ResponseString : ex.Message;
+                //string responseString = (null != ex.InnerException) ? ex.ResponseString : ex.Message;
 
                 if (ex.InnerException is System.Net.WebException)
                 {
-                    string message = "Cannot connect to Google, please check for available internet connection and proxy settings if applicable: " + ((System.Net.WebException)ex.InnerException).Message + "\r\n" + responseString;
+                    string message = "Cannot connect to Google, please check for available internet connection and proxy settings if applicable: " + ex.InnerException.Message + "\r\n" + ex.ResponseString;
                     Logger.Log(message, EventType.Warning);
                     Program.Instance.ShowBalloonToolTip("Error", message, ToolTipIcon.Error, 5000);
                 }
@@ -285,11 +285,20 @@
                     ErrorHandler.Handle(ex);
                 }
             }
+            catch (Google.GData.Client.InvalidCredentialsException ex)
+            {
+                SetLastSyncText("Sync failed.");
+                notifyIcon.Text = Application.ProductName + "\nSync failed";
+
+                Exception exc = new Exception("The credentials are invalid, please correct them in the settings form before you sync again", ex);
+                ErrorHandler.Handle(exc);
+                ShowForm();
+            }
             catch (Exception ex)
             {
                 SetLastSyncText("Sync failed.");
                 notifyIcon.Text = Application.ProductName + "\nSync failed";
-                ErrorHandler.Handle(ex);                                
+                ErrorHandler.Handle(ex);
             }							
 			finally
 			{                        
@@ -422,14 +431,14 @@
 					{
 						autoSyncInterval.Enabled = autoSyncCheckBox.Checked;
 						syncTimer.Enabled = autoSyncCheckBox.Checked;
-						nextSyncLabel.Visible = autoSyncCheckBox.Checked;
+						nextSyncLabel.Visible = autoSyncCheckBox.Checked;                        
 					}
 				}
 				else
 				{                    
 					autoSyncInterval.Enabled = value;
                     syncTimer.Enabled = value;
-					nextSyncLabel.Visible = value;
+					nextSyncLabel.Visible = value;                    
 				}
 			}
 		}
@@ -514,6 +523,8 @@
                         {
                             TimerSwitch(false);
                         }
+                            
+
                         break;
                     }
                 default:

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

Revision: 229
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=229&view=rev
Author:   floriwan
Date:     2012-01-29 17:43:44 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Improvement: Added ComException special handling for not reachable RPC, e.g. if Outlook was closed during sync

Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2012-01-29 16:09:50 UTC (rev 228)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2012-01-29 17:43:44 UTC (rev 229)
@@ -290,15 +290,27 @@
                 SetLastSyncText("Sync failed.");
                 notifyIcon.Text = Application.ProductName + "\nSync failed";
 
-                Exception exc = new Exception("The credentials are invalid, please correct them in the settings form before you sync again", ex);
-                ErrorHandler.Handle(exc);
+                string message = "The credentials (Google Account username and/or password) are invalid, please correct them in the settings form before you sync again";
+                Logger.Log(message, EventType.Error);
                 ShowForm();
+                Program.Instance.ShowBalloonToolTip("Error", message, ToolTipIcon.Error, 5000);
+
             }
             catch (Exception ex)
             {
                 SetLastSyncText("Sync failed.");
                 notifyIcon.Text = Application.ProductName + "\nSync failed";
-                ErrorHandler.Handle(ex);
+
+                if (ex is COMException)
+                {
+                    string message = "Outlook exception, please assure that Outlook is running and not closed when syncing";
+                    Logger.Log(message + ": " + ex.Message, EventType.Warning);
+                    Program.Instance.ShowBalloonToolTip("Error", message, ToolTipIcon.Error, 5000);
+                }
+                else
+                {
+                    ErrorHandler.Handle(ex);
+                }
             }							
 			finally
 			{                        
@@ -506,11 +518,11 @@
                         {                            
                             TimerSwitch(true);
                         }
-                        else if (m.WParam.ToInt32() == PBT_APMSUSPEND ||
-                                 m.WParam.ToInt32() == PBT_APMSTANDBY)
-                        {
-                            TimerSwitch(false);
-                        }
+                        //else if (m.WParam.ToInt32() == PBT_APMSUSPEND ||
+                        //         m.WParam.ToInt32() == PBT_APMSTANDBY)
+                        //{
+                        //    TimerSwitch(false);
+                        //}
                             
 
                         break;

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2012-01-29 16:09:50 UTC (rev 228)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2012-01-29 17:43:44 UTC (rev 229)
@@ -268,7 +268,7 @@
 			{
                 CreateOutlookInstance();
 			}
-			catch (System.Runtime.InteropServices.COMException)
+			catch (COMException)
 			{
 				try
 				{

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

Revision: 235
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=235&view=rev
Author:   v2l
Date:     2012-02-16 08:24:47 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
IMPROVEMENT: work with multiple profiles (in debug mode)

Modified Paths:
--------------
    trunk/GoogleContactsSync/GoogleContactsSync.csproj
    trunk/GoogleContactsSync/ProxySettings.Designer.cs
    trunk/GoogleContactsSync/ProxySettings.cs
    trunk/GoogleContactsSync/SettingsForm.Designer.cs
    trunk/GoogleContactsSync/SettingsForm.cs

Added Paths:
-----------
    trunk/GoogleContactsSync/AddEditProfile.Designer.cs
    trunk/GoogleContactsSync/AddEditProfile.cs
    trunk/GoogleContactsSync/AddEditProfile.resx
    trunk/GoogleContactsSync/ConfigurationManager.Designer.cs
    trunk/GoogleContactsSync/ConfigurationManager.cs
    trunk/GoogleContactsSync/ConfigurationManager.resx

Added: trunk/GoogleContactsSync/AddEditProfile.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/AddEditProfile.Designer.cs	                        (rev 0)
+++ trunk/GoogleContactsSync/AddEditProfile.Designer.cs	2012-02-16 08:24:47 UTC (rev 235)
@@ -0,0 +1,110 @@
+namespace GoContactSyncMod
+{
+    partial class AddEditProfileForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.bbOk = new System.Windows.Forms.Button();
+            this.btCancel = new System.Windows.Forms.Button();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.tbProfileName = new System.Windows.Forms.TextBox();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // bbOk
+            // 
+            this.bbOk.AutoEllipsis = true;
+            this.bbOk.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.bbOk.Location = new System.Drawing.Point(21, 63);
+            this.bbOk.Name = "bbOk";
+            this.bbOk.Size = new System.Drawing.Size(75, 23);
+            this.bbOk.TabIndex = 0;
+            this.bbOk.Text = "OK";
+            this.bbOk.UseVisualStyleBackColor = true;
+            // 
+            // btCancel
+            // 
+            this.btCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btCancel.Location = new System.Drawing.Point(234, 63);
+            this.btCancel.Name = "btCancel";
+            this.btCancel.Size = new System.Drawing.Size(75, 23);
+            this.btCancel.TabIndex = 1;
+            this.btCancel.Text = "Cancel";
+            this.btCancel.UseVisualStyleBackColor = true;
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.label1);
+            this.groupBox1.Controls.Add(this.tbProfileName);
+            this.groupBox1.Location = new System.Drawing.Point(12, 12);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(313, 45);
+            this.groupBox1.TabIndex = 4;
+            this.groupBox1.TabStop = false;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(6, 16);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(68, 13);
+            this.label1.TabIndex = 5;
+            this.label1.Text = "Profile name:";
+            // 
+            // tbProfileName
+            // 
+            this.tbProfileName.Location = new System.Drawing.Point(80, 13);
+            this.tbProfileName.Name = "tbProfileName";
+            this.tbProfileName.Size = new System.Drawing.Size(217, 20);
+            this.tbProfileName.TabIndex = 4;
+            // 
+            // AddEditProfileForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(336, 94);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.btCancel);
+            this.Controls.Add(this.bbOk);
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Name = "AddEditProfileForm";
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button bbOk;
+        private System.Windows.Forms.Button btCancel;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TextBox tbProfileName;
+    }
+}
\ No newline at end of file

Added: trunk/GoogleContactsSync/AddEditProfile.cs
===================================================================
--- trunk/GoogleContactsSync/AddEditProfile.cs	                        (rev 0)
+++ trunk/GoogleContactsSync/AddEditProfile.cs	2012-02-16 08:24:47 UTC (rev 235)
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace GoContactSyncMod
+{
+    public partial class AddEditProfileForm : Form
+    {
+        public string ProfileName
+        {
+            get { return this.tbProfileName.Text; }
+        }
+        
+        public AddEditProfileForm()
+        {
+            InitializeComponent();
+        }
+
+        public AddEditProfileForm(string title, string profileName)
+        {
+            InitializeComponent();
+
+            if (!string.IsNullOrEmpty(title))
+                this.Text = title;
+
+            if (!string.IsNullOrEmpty(profileName))
+                this.tbProfileName.Text = profileName;
+        }
+
+    }
+}

Added: trunk/GoogleContactsSync/AddEditProfile.resx
===================================================================
--- trunk/GoogleContactsSync/AddEditProfile.resx	                        (rev 0)
+++ trunk/GoogleContactsSync/AddEditProfile.resx	2012-02-16 08:24:47 UTC (rev 235)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file

Added: trunk/GoogleContactsSync/ConfigurationManager.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/ConfigurationManager.Designer.cs	                        (rev 0)
+++ trunk/GoogleContactsSync/ConfigurationManager.Designer.cs	2012-02-16 08:24:47 UTC (rev 235)
@@ -0,0 +1,112 @@
+namespace GoContactSyncMod
+{
+    partial class ConfigurationManagerForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.btAdd = new System.Windows.Forms.Button();
+            this.btEdit = new System.Windows.Forms.Button();
+            this.btDel = new System.Windows.Forms.Button();
+            this.btClose = new System.Windows.Forms.Button();
+            this.lbProfiles = new System.Windows.Forms.CheckedListBox();
+            this.SuspendLayout();
+            // 
+            // btAdd
+            // 
+            this.btAdd.Location = new System.Drawing.Point(12, 228);
+            this.btAdd.Name = "btAdd";
+            this.btAdd.Size = new System.Drawing.Size(75, 23);
+            this.btAdd.TabIndex = 0;
+            this.btAdd.Text = "Add";
+            this.btAdd.UseVisualStyleBackColor = true;
+            this.btAdd.Click += new System.EventHandler(this.btAdd_Click);
+            // 
+            // btEdit
+            // 
+            this.btEdit.Location = new System.Drawing.Point(93, 228);
+            this.btEdit.Name = "btEdit";
+            this.btEdit.Size = new System.Drawing.Size(75, 23);
+            this.btEdit.TabIndex = 1;
+            this.btEdit.Text = "Edit";
+            this.btEdit.UseVisualStyleBackColor = true;
+            this.btEdit.Click += new System.EventHandler(this.btEdit_Click);
+            // 
+            // btDel
+            // 
+            this.btDel.Location = new System.Drawing.Point(174, 228);
+            this.btDel.Name = "btDel";
+            this.btDel.Size = new System.Drawing.Size(75, 23);
+            this.btDel.TabIndex = 2;
+            this.btDel.Text = "Del";
+            this.btDel.UseVisualStyleBackColor = true;
+            this.btDel.Click += new System.EventHandler(this.btDel_Click);
+            // 
+            // btClose
+            // 
+            this.btClose.Location = new System.Drawing.Point(299, 228);
+            this.btClose.Name = "btClose";
+            this.btClose.Size = new System.Drawing.Size(75, 23);
+            this.btClose.TabIndex = 3;
+            this.btClose.Text = "Close";
+            this.btClose.UseVisualStyleBackColor = true;
+            this.btClose.Click += new System.EventHandler(this.btClose_Click);
+            // 
+            // lbProfiles
+            // 
+            this.lbProfiles.FormattingEnabled = true;
+            this.lbProfiles.Location = new System.Drawing.Point(13, 8);
+            this.lbProfiles.Name = "lbProfiles";
+            this.lbProfiles.Size = new System.Drawing.Size(270, 214);
+            this.lbProfiles.TabIndex = 4;
+            // 
+            // ConfigurationManagerForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(382, 257);
+            this.Controls.Add(this.lbProfiles);
+            this.Controls.Add(this.btClose);
+            this.Controls.Add(this.btDel);
+            this.Controls.Add(this.btEdit);
+            this.Controls.Add(this.btAdd);
+            this.Name = "ConfigurationManagerForm";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Configuration Manager";
+            this.Load += new System.EventHandler(this.ConfigurationManagerForm_Load);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btAdd;
+        private System.Windows.Forms.Button btEdit;
+        private System.Windows.Forms.Button btDel;
+        private System.Windows.Forms.Button btClose;
+        private System.Windows.Forms.CheckedListBox lbProfiles;
+    }
+}
\ No newline at end of file

Added: trunk/GoogleContactsSync/ConfigurationManager.cs
===================================================================
--- trunk/GoogleContactsSync/ConfigurationManager.cs	                        (rev 0)
+++ trunk/GoogleContactsSync/ConfigurationManager.cs	2012-02-16 08:24:47 UTC (rev 235)
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using Microsoft.Win32;
+using System.Windows.Forms;
+
+namespace GoContactSyncMod
+{
+    public partial class ConfigurationManagerForm : Form
+    {
+        public ConfigurationManagerForm()
+        {
+            InitializeComponent();
+        }
+
+        public string AddProfile()
+        {
+            string vReturn = "";
+            AddEditProfileForm AddEditProfile = new AddEditProfileForm("New profile", null);
+            if (AddEditProfile.ShowDialog() == DialogResult.OK)
+            {
+                if (null != Registry.CurrentUser.OpenSubKey(SettingsForm.AppRootKey + '\\' + AddEditProfile.ProfileName))
+                {
+                    MessageBox.Show("Profile " + AddEditProfile.ProfileName + " exists, try again. ", "New profile");
+                }
+                else
+                {
+                    Registry.CurrentUser.CreateSubKey(SettingsForm.AppRootKey + '\\' + AddEditProfile.ProfileName);
+                    vReturn = AddEditProfile.ProfileName;
+                }
+            }
+
+            return vReturn;
+        }
+
+        private void fillListProfiles()
+        {
+            RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(SettingsForm.AppRootKey);
+
+            lbProfiles.Items.Clear();
+
+            foreach (string subKeyName in regKeyAppRoot.GetSubKeyNames())
+            {
+                lbProfiles.Items.Add(subKeyName);
+            }
+        }
+
+        //copy all the values
+        private void CopyKey(RegistryKey parent, string keyNameSource, string keyNameDestination)
+        {
+            RegistryKey destination = parent.CreateSubKey(keyNameDestination);
+            RegistryKey source = parent.OpenSubKey(keyNameSource);
+
+            foreach (string valueName in source.GetValueNames())
+            {
+                object objValue = source.GetValue(valueName);
+                RegistryValueKind valKind = source.GetValueKind(valueName);
+                destination.SetValue(valueName, objValue, valKind);
+            }
+        }
+
+        private void btClose_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void btAdd_Click(object sender, EventArgs e)
+        {
+            AddProfile();
+            fillListProfiles();
+        }
+
+        private void btEdit_Click(object sender, EventArgs e)
+        {
+            if (1 == lbProfiles.CheckedItems.Count)
+            {
+                AddEditProfileForm AddEditProfile = new AddEditProfileForm("Edit profile",lbProfiles.CheckedItems[0].ToString());
+                if (AddEditProfile.ShowDialog() == DialogResult.OK)
+                {
+                    if (null != Registry.CurrentUser.OpenSubKey(SettingsForm.AppRootKey + '\\' + AddEditProfile.ProfileName))
+                    {
+                        MessageBox.Show("Profile " + AddEditProfile.ProfileName + " exists, try again. ", "Edit profile");
+                    }
+                    else 
+                    {
+                        CopyKey(Registry.CurrentUser.CreateSubKey(SettingsForm.AppRootKey), lbProfiles.CheckedItems[0].ToString(), AddEditProfile.ProfileName);
+                        Registry.CurrentUser.DeleteSubKeyTree(SettingsForm.AppRootKey + '\\' + lbProfiles.CheckedItems[0].ToString());
+                    }
+                }
+            }
+            else
+            {
+                MessageBox.Show("Please, select one profile for editing", "Edit profile");
+            }
+
+            fillListProfiles();
+        }
+
+        private void btDel_Click(object sender, EventArgs e)
+        {
+            if (0 >= lbProfiles.CheckedItems.Count) 
+            {  
+                 MessageBox.Show("You don`t select any profile. Deletion imposble.", "Delete profile");
+            } else if (DialogResult.Yes == MessageBox.Show("Do you sure to delete selection ?", "Delete profile",
+                                                    MessageBoxButtons.YesNo, MessageBoxIcon.Question))
+            {
+                foreach (object itemChecked in lbProfiles.CheckedItems)
+                {
+                    Registry.CurrentUser.DeleteSubKeyTree(SettingsForm.AppRootKey + '\\' + itemChecked.ToString());
+                }
+            }
+
+            fillListProfiles();
+        }
+
+        private void ConfigurationManagerForm_Load(object sender, EventArgs e)
+        {
+            fillListProfiles();
+        }
+    }
+}

Added: trunk/GoogleContactsSync/ConfigurationManager.resx
===================================================================
--- trunk/GoogleContactsSync/ConfigurationManager.resx	                        (rev 0)
+++ trunk/GoogleContactsSync/ConfigurationManager.resx	2012-02-16 08:24:47 UTC (rev 235)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file

Modified: trunk/GoogleContactsSync/GoogleContactsSync.csproj
===================================================================
--- trunk/GoogleContactsSync/GoogleContactsSync.csproj	2012-02-15 17:19:56 UTC (rev 234)
+++ trunk/GoogleContactsSync/GoogleContactsSync.csproj	2012-02-16 08:24:47 UTC (rev 235)
@@ -110,6 +110,18 @@
     <Compile Include="AboutBox.Designer.cs">
       <DependentUpon>AboutBox.cs</DependentUpon>
     </Compile>
+    <Compile Include="AddEditProfile.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="AddEditProfile.designer.cs">
+      <DependentUpon>AddEditProfile.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ConfigurationManager.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ConfigurationManager.designer.cs">
+      <DependentUpon>ConfigurationManager.cs</DependentUpon>
+    </Compile>
     <Compile Include="ConflictResolverForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -157,6 +169,12 @@
     <EmbeddedResource Include="AboutBox.resx">
       <DependentUpon>AboutBox.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="AddEditProfile.resx">
+      <DependentUpon>AddEditProfile.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ConfigurationManager.resx">
+      <DependentUpon>ConfigurationManager.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ConflictResolverForm.resx">
       <SubType>Designer</SubType>
       <DependentUpon>ConflictResolverForm.cs</DependentUpon>

Modified: trunk/GoogleContactsSync/ProxySettings.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/ProxySettings.Designer.cs	2012-02-15 17:19:56 UTC (rev 234)
+++ trunk/GoogleContactsSync/ProxySettings.Designer.cs	2012-02-16 08:24:47 UTC (rev 235)
@@ -35,6 +35,7 @@
             this.UserName = new System.Windows.Forms.TextBox();
             this.Password = new System.Windows.Forms.TextBox();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.cbUseGlobalSettings = new System.Windows.Forms.CheckBox();
             this.Authorization = new System.Windows.Forms.CheckBox();
             this.CustomProxy = new System.Windows.Forms.RadioButton();
             this.SystemProxy = new System.Windows.Forms.RadioButton();
@@ -47,13 +48,13 @@
             // 
             // cancelButton
             // 
-            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                        | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelButton.Location = new System.Drawing.Point(181, 216);
+            this.cancelButton.Location = new System.Drawing.Point(181, 224);
             this.cancelButton.Name = "cancelButton";
-            this.cancelButton.Size = new System.Drawing.Size(98, 25);
+            this.cancelButton.Size = new System.Drawing.Size(98, 26);
             this.cancelButton.TabIndex = 1;
             this.cancelButton.Text = "&Cancel";
             this.cancelButton.UseVisualStyleBackColor = true;
@@ -61,12 +62,12 @@
             // 
             // okButton
             // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                        | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.Location = new System.Drawing.Point(12, 216);
+            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.okButton.Location = new System.Drawing.Point(12, 224);
             this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(98, 25);
+            this.okButton.Size = new System.Drawing.Size(98, 26);
             this.okButton.TabIndex = 0;
             this.okButton.Text = "&OK";
             this.okButton.UseVisualStyleBackColor = true;
@@ -74,7 +75,7 @@
             // 
             // label2
             // 
-            this.label2.Location = new System.Drawing.Point(7, 142);
+            this.label2.Location = new System.Drawing.Point(7, 158);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(75, 17);
             this.label2.TabIndex = 9;
@@ -82,7 +83,7 @@
             // 
             // label3
             // 
-            this.label3.Location = new System.Drawing.Point(7, 165);
+            this.label3.Location = new System.Drawing.Point(7, 181);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(75, 16);
             this.label3.TabIndex = 10;
@@ -90,9 +91,9 @@
             // 
             // UserName
             // 
-            this.UserName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
-            this.UserName.Location = new System.Drawing.Point(100, 139);
+            this.UserName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.UserName.Location = new System.Drawing.Point(100, 155);
             this.UserName.Name = "UserName";
             this.UserName.Size = new System.Drawing.Size(167, 20);
             this.UserName.TabIndex = 5;
@@ -100,9 +101,9 @@
             // 
             // Password
             // 
-            this.Password.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
-            this.Password.Location = new System.Drawing.Point(100, 165);
+            this.Password.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.Password.Location = new System.Drawing.Point(100, 181);
             this.Password.Name = "Password";
             this.Password.PasswordChar = '*';
             this.Password.Size = new System.Drawing.Size(167, 20);
@@ -111,8 +112,9 @@
             // 
             // groupBox1
             // 
-            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox1.Controls.Add(this.cbUseGlobalSettings);
             this.groupBox1.Controls.Add(this.label2);
             this.groupBox1.Controls.Add(this.label3);
             this.groupBox1.Controls.Add(this.Authorization);
@@ -126,15 +128,29 @@
             this.groupBox1.Controls.Add(this.Port);
             this.groupBox1.Location = new System.Drawing.Point(12, 12);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(275, 198);
+            this.groupBox1.Size = new System.Drawing.Size(275, 209);
             this.groupBox1.TabIndex = 6;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "Proxy";
             // 
+            // cbUseGlobalSettings
+            // 
+#if debug
+            this.cbUseGlobalSettings.AutoSize = true;
+            this.cbUseGlobalSettings.Checked = true;
+            this.cbUseGlobalSettings.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbUseGlobalSettings.Location = new System.Drawing.Point(10, 13);
+            this.cbUseGlobalSettings.Name = "cbUseGlobalSettings";
+            this.cbUseGlobalSettings.Size = new System.Drawing.Size(176, 17);
+            this.cbUseGlobalSettings.TabIndex = 11;
+            this.cbUseGlobalSettings.Text = "Use proxy settings for all profiles";
+            this.cbUseGlobalSettings.UseVisualStyleBackColor = true;
+#endif
+            // 
             // Authorization
             // 
             this.Authorization.AutoSize = true;
-            this.Authorization.Location = new System.Drawing.Point(10, 122);
+            this.Authorization.Location = new System.Drawing.Point(10, 138);
             this.Authorization.Name = "Authorization";
             this.Authorization.Size = new System.Drawing.Size(87, 17);
             this.Authorization.TabIndex = 4;
@@ -145,7 +161,7 @@
             // CustomProxy
             // 
             this.CustomProxy.AutoSize = true;
-            this.CustomProxy.Location = new System.Drawing.Point(10, 42);
+            this.CustomProxy.Location = new System.Drawing.Point(10, 58);
             this.CustomProxy.Name = "CustomProxy";
             this.CustomProxy.Size = new System.Drawing.Size(147, 17);
             this.CustomProxy.TabIndex = 1;
@@ -157,7 +173,7 @@
             // 
             this.SystemProxy.AutoSize = true;
             this.SystemProxy.Checked = true;
-            this.SystemProxy.Location = new System.Drawing.Point(10, 19);
+            this.SystemProxy.Location = new System.Drawing.Point(10, 35);
             this.SystemProxy.Name = "SystemProxy";
             this.SystemProxy.Size = new System.Drawing.Size(88, 17);
             this.SystemProxy.TabIndex = 0;
@@ -168,7 +184,7 @@
             // 
             // label1
             // 
-            this.label1.Location = new System.Drawing.Point(7, 73);
+            this.label1.Location = new System.Drawing.Point(7, 89);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(48, 17);
             this.label1.TabIndex = 7;
@@ -176,7 +192,7 @@
             // 
             // label4
             // 
-            this.label4.Location = new System.Drawing.Point(7, 96);
+            this.label4.Location = new System.Drawing.Point(7, 112);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(48, 16);
             this.label4.TabIndex = 8;
@@ -184,9 +200,9 @@
             // 
             // Address
             // 
-            this.Address.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
-            this.Address.Location = new System.Drawing.Point(61, 70);
+            this.Address.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.Address.Location = new System.Drawing.Point(61, 86);
             this.Address.Name = "Address";
             this.Address.Size = new System.Drawing.Size(206, 20);
             this.Address.TabIndex = 2;
@@ -194,9 +210,9 @@
             // 
             // Port
             // 
-            this.Port.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
-            this.Port.Location = new System.Drawing.Point(61, 96);
+            this.Port.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.Port.Location = new System.Drawing.Point(61, 112);
             this.Port.Name = "Port";
             this.Port.Size = new System.Drawing.Size(37, 20);
             this.Port.TabIndex = 3;
@@ -207,12 +223,13 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.cancelButton;
-            this.ClientSize = new System.Drawing.Size(299, 260);
+            this.ClientSize = new System.Drawing.Size(299, 261);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.cancelButton);
             this.Controls.Add(this.okButton);
             this.Name = "ProxySettingsForm";
             this.Text = "Proxy Settings";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             this.ResumeLayout(false);
@@ -235,6 +252,7 @@
         private System.Windows.Forms.TextBox Port;
         private System.Windows.Forms.RadioButton CustomProxy;
         private System.Windows.Forms.CheckBox Authorization;
+        private System.Windows.Forms.CheckBox cbUseGlobalSettings;
 
     }
 }
\ No newline at end of file

Modified: trunk/GoogleContactsSync/ProxySettings.cs
===================================================================
--- trunk/GoogleContactsSync/ProxySettings.cs	2012-02-15 17:19:56 UTC (rev 234)
+++ trunk/GoogleContactsSync/ProxySettings.cs	2012-02-16 08:24:47 UTC (rev 235)
@@ -20,6 +20,20 @@
             FormSettings();
         }
 
+        public ProxySettingsForm()
+        {
+            InitializeComponent();
+            if (null == _systemProxy)
+                _systemProxy = WebRequest.DefaultWebProxy;
+#if debug
+            cbUseGlobalSettings.Visible = true;
+#else
+            cbUseGlobalSettings.Checked = true;
+            cbUseGlobalSettings.Visible = false;
+            LoadSettings(null);
+#endif
+        }
+
         private void setBgColor(TextBox box, bool isValid)
         {
             if (box.Enabled)
@@ -40,7 +54,6 @@
                 bool AddressIsValid  = Regex.IsMatch(Address.Text, @"^(?'url'[\w\d#@%;$()~_?\-\\\.&]+)$", RegexOptions.IgnoreCase);
                 bool PortIsValid     = Regex.IsMatch(Port.Text, @"^(?'port'[0-9]{2,6})$", RegexOptions.IgnoreCase);
 
-
                 setBgColor(UserName, userNameIsValid);
                 setBgColor(Password, passwordIsValid);
                 setBgColor(Address,  AddressIsValid);
@@ -60,7 +73,7 @@
             bool isValid = ValidCredentials;
         }
 
-        private void ProxySet()
+        public void ProxySet()
         {
             if (CustomProxy.Checked)
             {
@@ -85,18 +98,15 @@
                 WebRequest.DefaultWebProxy = _systemProxy;
         }
 
-        public ProxySettingsForm()
+        public void LoadSettings(string _profile)
         {
-            InitializeComponent();
-            _systemProxy = WebRequest.DefaultWebProxy;
-            LoadSettings();
-            FormSettings();            
-            ProxySet();
-        }
+            RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(SettingsForm.AppRootKey);
 
-        private void LoadSettings()
-        {   // Load Proxy Settings
-            RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(@"Software\Webgear\GOContactSync");
+            if (null != regKeyAppRoot.GetValue("UseGlobalProxySettings"))
+                cbUseGlobalSettings.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("UseGlobalProxySettings"));
+
+            regKeyAppRoot = Registry.CurrentUser.CreateSubKey(SettingsForm.AppRootKey + (_profile != null && !cbUseGlobalSettings.Checked ? ('\\' + _profile) : ""));
+
             if (regKeyAppRoot.GetValue("ProxyUsage") != null)
             {
                 if (Convert.ToBoolean (regKeyAppRoot.GetValue("ProxyUsage")))
@@ -123,11 +133,26 @@
                     }
                 }
             }
+
+            FormSettings();
+            ProxySet();
         }
+        public void ClearSettings()
+        {
+            if (!cbUseGlobalSettings.Checked) {
+                SystemProxy.Checked = true;
+                CustomProxy.Checked = Authorization.Checked = !SystemProxy.Checked;
+                Address.Text = Port.Text = UserName.Text = Password.Text;
+            }
+        }
 
-        private void SaveSettings()
+        public void SaveSettings(string _profile)
         {
-            RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(@"Software\Webgear\GOContactSync");
+            RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(SettingsForm.AppRootKey);
+
+            regKeyAppRoot.SetValue("UseGlobalProxySettings", cbUseGlobalSettings.Checked);
+
+            regKeyAppRoot = Registry.CurrentUser.CreateSubKey(SettingsForm.AppRootKey + (_profile != null && !cbUseGlobalSettings.Checked ? ('\\' + _profile) : ""));
             regKeyAppRoot.SetValue("ProxyUsage", CustomProxy.Checked);
 
             if (CustomProxy.Checked)
@@ -163,10 +188,10 @@
         {
             if (!ValidCredentials) 
                 return;
-
+#if !debug
+            SaveSettings(null);
+#endif
             ProxySet();
-            SaveSettings();
-
             this.Hide();
         }
 

Modified: trunk/GoogleContactsSync/SettingsForm.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.Designer.cs	2012-02-15 17:19:56 UTC (rev 234)
+++ trunk/GoogleContactsSync/SettingsForm.Designer.cs	2012-02-16 08:24:47 UTC (rev 235)
@@ -59,7 +59,11 @@
             this.btSyncNotes = new System.Windows.Forms.CheckBox();
             this.panel1 = new System.Windows.Forms.Panel();
             this.btSyncDelete = new System.Windows.Forms.CheckBox();
+#if debug
+            this.cmbSyncProfile = new System.Windows.Forms.ComboBox();
+#else
             this.tbSyncProfile = new System.Windows.Forms.TextBox();
+#endif
             this.label5 = new System.Windows.Forms.Label();
             this.lastSyncLabel = new System.Windows.Forms.Label();
             this.logGroupBox = new System.Windows.Forms.GroupBox();
@@ -337,7 +341,11 @@
             this.groupBox2.Controls.Add(this.btSyncNotes);
             this.groupBox2.Controls.Add(this.panel1);
             this.groupBox2.Controls.Add(this.btSyncDelete);
+#if debug
+            this.groupBox2.Controls.Add(this.cmbSyncProfile);
+#else
             this.groupBox2.Controls.Add(this.tbSyncProfile);
+#endif
             this.groupBox2.Controls.Add(this.label5);
             this.groupBox2.Controls.Add(this.syncOptionBox);
             this.groupBox2.Location = new System.Drawing.Point(6, 115);
@@ -399,7 +407,21 @@
                     "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
                     "ice versa.");
             this.btSyncDelete.UseVisualStyleBackColor = true;
+#if debug
             // 
+            // cmbSyncProfile
+            // 
+            this.cmbSyncProfile.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbSyncProfile.FormattingEnabled = true;
+            this.cmbSyncProfile.Location = new System.Drawing.Point(100, 19);
+            this.cmbSyncProfile.Name = "cmbSyncProfile";
+            this.cmbSyncProfile.Size = new System.Drawing.Size(215, 21);
+            this.cmbSyncProfile.TabIndex = 1;
+            this.toolTip.SetToolTip(this.cmbSyncProfile, "This is a profile name of your choice.\r\nIt must be unique in each computer\r\nand a" +
+        "ccount you intend to sync with\r\nyour Google Mail account.");
+            this.cmbSyncProfile.SelectedIndexChanged += new System.EventHandler(this.cmbSyncProfile_SelectedIndexChanged);
+#else
+            // 
             // tbSyncProfile
             // 
             this.tbSyncProfile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
@@ -411,6 +433,7 @@
             this.toolTip.SetToolTip(this.tbSyncProfile, "This is a profile name of your choice.\r\nIt must be unique in each computer\r\nand a" +
                     "ccount you intend to sync with\r\nyour Google Mail account.");
             this.tbSyncProfile.TextChanged += new System.EventHandler(this.tbSyncProfile_TextChanged);
+#endif     
             // 
             // label5
             // 
@@ -665,7 +688,6 @@
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
         private System.Windows.Forms.CheckBox runAtStartupCheckBox;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5;
-        private System.Windows.Forms.TextBox tbSyncProfile;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.ToolTip toolTip;
         private System.Windows.Forms.CheckBox btSyncDelete;
@@ -682,6 +704,11 @@
         private System.Windows.Forms.CheckBox btSyncNotes;
         private System.Windows.Forms.CheckBox btSyncContacts;
         private System.Windows.Forms.ComboBox cmbFolders;
+#if debug
+        private System.Windows.Forms.ComboBox cmbSyncProfile;
+#else
+        private System.Windows.Forms.TextBox tbSyncProfile;
+#endif
     }
 }
 

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2012-02-15 17:19:56 UTC (rev 234)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2012-02-16 08:24:47 UTC (rev 235)
@@ -22,8 +22,27 @@
 		private DateTime lastSync;
 		private bool requestClose = false;
         private bool boolShowBalloonTip = true;
-        private ProxySettingsForm _proxy = new ProxySettingsForm(); 
 
+        public const string AppRootKey = @"Software\Webgear\GOContactSync";
+
+        private ProxySettingsForm _proxy = new ProxySettingsForm();
+
+        private string _syncProfile
+        {
+            get
+            {
+                RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(AppRootKey);
+                return (regKeyAppRoot.GetValue("SyncProfile") != null) ?
+                       (string)regKeyAppRoot.GetValue("SyncProfile") : null;
+            }
+            set
+            {
+                RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(AppRootKey);
+                if (!string.IsNullOrEmpty(value))
+                    regKeyAppRoot.SetValue("SyncProfile", value);
+            }
+        }
+
         //register window for lock/unlock messages of workstation
         private bool registered = false;
 
@@ -38,8 +57,14 @@
             NotesMatcher.NotificationReceived += new NotesMatcher.NotificationHandler(OnNotificationReceived);
 			PopulateSyncOptionBox();
 
-			LoadSettings();
-
+#if debug
+            if (fillSyncProfileItems()) 
+                LoadSettings(cmbSyncProfile.Text);
+            else 
+                LoadSettings(null);
+#else
+            LoadSettings();
+#endif
             TimerSwitch(true);
 			lastSyncLabel.Text = "Not synced";
 
@@ -88,9 +113,122 @@
 				syncOptionBox.Items.Add(str);
 			}
 		}
+#if debug
+        // Fill lists of sync profiles
+        private bool fillSyncProfileItems()
+        {
+            RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(AppRootKey);
+            bool vReturn = false;
 
-		private void LoadSettings()
+            cmbSyncProfile.Items.Clear();
+            cmbSyncProfile.Items.Add("[Add new profile...]");
+
+            foreach (string subKeyName in regKeyAppRoot.GetSubKeyNames())
+            {
+                cmbSyncProfile.Items.Add(subKeyName);
+            }
+
+            if (string.IsNullOrEmpty(_syncProfile))
+                _syncProfile = "Default";
+
+            if (cmbSyncProfile.Items.Count == 1)
+                cmbSyncProfile.Items.Add(_syncProfile);
+            else
+                vReturn = true;
+
+            cmbSyncProfile.Items.Add("[Configuration manager...]");
+            cmbSyncProfile.Text = _syncProfile;
+
+            return vReturn;
+        }
+
+        private void ClearSettings()
+        {
+            SetSyncOption(0);
+            UserName.Text = Password.Text = "";
+            autoSyncCheckBox.Checked = runAtStartupCheckBox.Checked = reportSyncResultCheckBox.Checked = btSyncDelete.Checked = false;
+            autoSyncInterval.Value = 120;
+            _proxy.ClearSettings();
+        }
+
+        private void LoadSettings(string _profile)
+        {
+            RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(AppRootKey  + (_profile != null ? ('\\' + _profile) : "")  );
+
+            if (regKeyAppRoot.GetValue("SyncOption") != null)
+            {
+                _syncOption = (SyncOption)regKeyAppRoot.GetValue("SyncOption");
+                SetSyncOption((int)_syncOption);
+            }
+
+            if (regKeyAppRoot.GetValue("Username") != null)
+            {
+                UserName.Text = regKeyAppRoot.GetValue("Username") as string;
+                if (regKeyAppRoot.GetValue("Password") != null)
+                    Password.Text = Encryption.DecryptPassword(UserName.Text, regKeyAppRoot.GetValue("Password") as string);
+            }
+            if (regKeyAppRoot.GetValue("AutoSync") != null)
+                autoSyncCheckBox.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("AutoSync"));
+            if (regKeyAppRoot.GetValue("AutoSyncInterval") != null)
+                autoSyncInterval.Value = Convert.ToDecimal(regKeyAppRoot.GetValue("AutoSyncInterval"));
+            if (regKeyAppRoot.GetValue("AutoStart") != null)
+                runAtStartupCheckBox.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("AutoStart"));
+            if (regKeyAppRoot.GetValue("ReportSyncResult") != null)
+                reportSyncResultCheckBox.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("ReportSyncResult"));
+            if (regKeyAppRoot.GetValue("SyncDeletion") != null)
+                btSyncDelete.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("SyncDeletion"));
+
+            _proxy.LoadSettings(_profile);
+        }
+
+		private void SaveSettings()
 		{
+            SaveSettings(cmbSyncProfile.Text);
+		}
+
+        private void SaveSettings(string _profile)
+        {
+            if (!string.IsNullOrEmpty(_profile))
+            {
+                _syncProfile = cmbSyncProfile.Text;
+                RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(AppRootKey + "\\" + _profile);
+                regKeyAppRoot.SetValue("SyncOption", (int)_syncOption);
+
+                if (!string.IsNullOrEmpty(UserName.Text))
+                {
+                    regKeyAppRoot.SetValue("Username", UserName.Text);
+                    if (!string.IsNullOrEmpty(Password.Text))
+                        regKeyAppRoot.SetValue("Password", Encryption.EncryptPassword(UserName.Text, Password.Text));
+                }
+                regKeyAppRoot.SetValue("AutoSync", autoSyncCheckBox.Checked.ToString());
+                regKeyAppRoot.SetValue("AutoSyncInterval", autoSyncInterval.Value.ToString());
+                regKeyAppRoot.SetValue("AutoStart", runAtStartupCheckBox.Checked);
+                regKeyAppRoot.SetValue("ReportSyncResult", reportSyncResultCheckBox.Checked);
+                regKeyAppRoot.SetValue("SyncDeletion", btSyncDelete.Checked);
+                regKeyAppRoot.SetValue("SyncNotes", btSyncNotes.Checked);
+                regKeyAppRoot.SetValue("SyncContacts", btSyncContacts.Checked);
+
+                _proxy.SaveSettings(cmbSyncProfile.Text);
+            }
+        }
+
+
+        private bool ValidCredentials
+		{
+			get
+			{
+				bool userNameIsValid = Regex.IsMatch(UserName.Text, @"^(?'id'[a-z0-9\'\%\._\+\-]+)@(?'domain'[a-z0-9\'\%\._\+\-]+)\.(?'ext'[a-z]{2,6})$", RegexOptions.IgnoreCase);
+				bool passwordIsValid = Password.Text.Length != 0;
+                bool syncProfileNameIsValid = (cmbSyncProfile.SelectedIndex > 0 && cmbSyncProfile.SelectedIndex < cmbSyncProfile.Items.Count);
+
+				setBgColor(UserName, userNameIsValid);
+				setBgColor(Password, passwordIsValid);
+				return userNameIsValid && passwordIsValid && syncProfileNameIsValid;
+			}
+		}
+#else
+        private void LoadSettings()
+		{
 			// default
 			SetSyncOption(0);
 
@@ -161,6 +299,8 @@
 				return userNameIsValid && passwordIsValid && syncProfileNameIsValid;
 			}
 		}
+#endif
+
 		private void setBgColor(TextBox box, bool isValid)
 		{
 			if (!isValid)
@@ -216,7 +356,11 @@
                 SetSyncConsoleText("");
                 Logger.Log("Sync started.", EventType.Information);
                 //SetSyncConsoleText(Logger.GetText());
+#if debug
+                _sync.SyncProfile = _syncProfile;
+#else
                 _sync.SyncProfile = tbSyncProfile.Text;
+#endif
                 _sync.SyncOption = _syncOption;
                 _sync.SyncDelete = btSyncDelete.Checked;
                 _sync.SyncNotes = btSyncNotes.Checked;
@@ -685,7 +829,11 @@
 
 				_sync.LoginToGoogle(UserName.Text, Password.Text);
 				_sync.LoginToOutlook();
+#if debug
+                _sync.SyncProfile = _syncProfile;
+#else
                 _sync.SyncProfile = tbSyncProfile.Text;
+#endif
 
                 //Load matches, but match them by properties, not sync id
 
@@ -795,7 +943,11 @@
 		{
 			if (string.IsNullOrEmpty(UserName.Text) ||
 				string.IsNullOrEmpty(Password.Text) ||
+#if debug
+                string.IsNullOrEmpty(cmbSyncProfile.Text))
+#else
 				string.IsNullOrEmpty(tbSyncProfile.Text))
+#endif
 			{
 				// this is the first load, show form
 				ShowForm();
@@ -871,7 +1023,7 @@
 
 		private void proxySettingsLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
 		{
-            if (_proxy != null) _proxy.Show();
+            if (_proxy != null) _proxy.ShowDialog();
         }
 
 		private void SettingsForm_HelpButtonClicked(object sender, CancelEventArgs e)
@@ -908,8 +1060,41 @@
             }
         }
     
+#if debug	
+        private void cmbSyncProfile_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            
+            ComboBox comboBox = (ComboBox)sender;
+
+            if ((0 == comboBox.SelectedIndex) || (comboBox.SelectedIndex == (comboBox.Items.Count - 1))) {
+                ConfigurationManagerForm _configs = new ConfigurationManagerForm();
+
+                if (0 == comboBox.SelectedIndex && _configs != null)
+                    _syncProfile = _configs.AddProfile();
+                
+                if (comboBox.SelectedIndex == (comboBox.Items.Count - 1) && _configs != null)
+                    _configs.ShowDialog();
+
+                fillSyncProfileItems();
+
+                comboBox.Text = _syncProfile;
+            }
+            if (comboBox.SelectedIndex < 0)
+                MessageBox.Show("Please select Sync Profile.", "No sync switched on");
+            else
+            {
+                ClearSettings();
+                LoadSettings(comboBox.Text);
+                _syncProfile = comboBox.Text;
+            }
+
+            ValidateSyncButton();
+
+        }
+#endif
 	}
 
+
 	//internal class EventLogger : ILogger
 	//{
 	//    private TextBox _box;

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

Revision: 236
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=236&view=rev
Author:   v2l
Date:     2012-02-27 12:18:48 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
IMPROVEMENT: base for select Outlook folder - save/restore value combobox (in debug mode)

Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.Designer.cs
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs
    trunk/GoogleContactsSync/Utilities.cs

Modified: trunk/GoogleContactsSync/SettingsForm.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.Designer.cs	2012-02-16 08:24:47 UTC (rev 235)
+++ trunk/GoogleContactsSync/SettingsForm.Designer.cs	2012-02-27 12:18:48 UTC (rev 236)
@@ -59,11 +59,7 @@
             this.btSyncNotes = new System.Windows.Forms.CheckBox();
             this.panel1 = new System.Windows.Forms.Panel();
             this.btSyncDelete = new System.Windows.Forms.CheckBox();
-#if debug
             this.cmbSyncProfile = new System.Windows.Forms.ComboBox();
-#else
-            this.tbSyncProfile = new System.Windows.Forms.TextBox();
-#endif
             this.label5 = new System.Windows.Forms.Label();
             this.lastSyncLabel = new System.Windows.Forms.Label();
             this.logGroupBox = new System.Windows.Forms.GroupBox();
@@ -93,8 +89,8 @@
             // 
             // Password
             // 
-            this.Password.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.Password.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.Password.Location = new System.Drawing.Point(100, 44);
             this.Password.Name = "Password";
             this.Password.PasswordChar = '*';
@@ -104,8 +100,8 @@
             // 
             // UserName
             // 
-            this.UserName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.UserName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.UserName.Location = new System.Drawing.Point(100, 18);
             this.UserName.Name = "UserName";
             this.UserName.Size = new System.Drawing.Size(217, 21);
@@ -130,9 +126,9 @@
             // 
             // syncButton
             // 
-            this.syncButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                        | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.syncButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.syncButton.Location = new System.Drawing.Point(3, 3);
             this.syncButton.Name = "syncButton";
             this.syncButton.Size = new System.Drawing.Size(98, 25);
@@ -143,9 +139,9 @@
             // 
             // syncOptionBox
             // 
-            this.syncOptionBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                        | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.syncOptionBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.syncOptionBox.BackColor = System.Drawing.SystemColors.Control;
             this.syncOptionBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.syncOptionBox.CheckOnClick = true;
@@ -281,8 +277,8 @@
             // 
             // groupBox1
             // 
-            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox1.Controls.Add(this.reportSyncResultCheckBox);
             this.groupBox1.Controls.Add(this.runAtStartupCheckBox);
             this.groupBox1.Controls.Add(this.nextSyncLabel);
@@ -334,18 +330,14 @@
             // 
             // groupBox2
             // 
-            this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                        | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox2.Controls.Add(this.btSyncContacts);
             this.groupBox2.Controls.Add(this.btSyncNotes);
             this.groupBox2.Controls.Add(this.panel1);
             this.groupBox2.Controls.Add(this.btSyncDelete);
-#if debug
             this.groupBox2.Controls.Add(this.cmbSyncProfile);
-#else
-            this.groupBox2.Controls.Add(this.tbSyncProfile);
-#endif
             this.groupBox2.Controls.Add(this.label5);
             this.groupBox2.Controls.Add(this.syncOptionBox);
             this.groupBox2.Location = new System.Drawing.Point(6, 115);
@@ -366,8 +358,8 @@
             this.btSyncContacts.TabIndex = 6;
             this.btSyncContacts.Text = "Sync &Contacts";
             this.toolTip.SetToolTip(this.btSyncContacts, "This specifies whether deletions are\r\nsynchronized. Enabling this option\r\nmeans i" +
-                    "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
-                    "ice versa.");
+        "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
+        "ice versa.");
             this.btSyncContacts.UseVisualStyleBackColor = true;
             this.btSyncContacts.CheckedChanged += new System.EventHandler(this.btSyncContacts_CheckedChanged);
             // 
@@ -380,15 +372,15 @@
             this.btSyncNotes.TabIndex = 5;
             this.btSyncNotes.Text = "Sync &Notes";
             this.toolTip.SetToolTip(this.btSyncNotes, "This specifies whether deletions are\r\nsynchronized. Enabling this option\r\nmeans i" +
-                    "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
-                    "ice versa.");
+        "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
+        "ice versa.");
             this.btSyncNotes.UseVisualStyleBackColor = true;
             this.btSyncNotes.CheckedChanged += new System.EventHandler(this.btSyncNotes_CheckedChanged);
             // 
             // panel1
             // 
-            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.panel1.Location = new System.Drawing.Point(7, 67);
             this.panel1.Name = "panel1";
@@ -404,10 +396,9 @@
             this.btSyncDelete.TabIndex = 2;
             this.btSyncDelete.Text = "Sync &Deletion";
             this.toolTip.SetToolTip(this.btSyncDelete, "This specifies whether deletions are\r\nsynchronized. Enabling this option\r\nmeans i" +
-                    "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
-                    "ice versa.");
+        "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
+        "ice versa.");
             this.btSyncDelete.UseVisualStyleBackColor = true;
-#if debug
             // 
             // cmbSyncProfile
             // 
@@ -420,21 +411,7 @@
             this.toolTip.SetToolTip(this.cmbSyncProfile, "This is a profile name of your choice.\r\nIt must be unique in each computer\r\nand a" +
         "ccount you intend to sync with\r\nyour Google Mail account.");
             this.cmbSyncProfile.SelectedIndexChanged += new System.EventHandler(this.cmbSyncProfile_SelectedIndexChanged);
-#else
             // 
-            // tbSyncProfile
-            // 
-            this.tbSyncProfile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbSyncProfile.Location = new System.Drawing.Point(100, 19);
-            this.tbSyncProfile.Name = "tbSyncProfile";
-            this.tbSyncProfile.Size = new System.Drawing.Size(217, 21);
-            this.tbSyncProfile.TabIndex = 1;
-            this.toolTip.SetToolTip(this.tbSyncProfile, "This is a profile name of your choice.\r\nIt must be unique in each computer\r\nand a" +
-                    "ccount you intend to sync with\r\nyour Google Mail account.");
-            this.tbSyncProfile.TextChanged += new System.EventHandler(this.tbSyncProfile_TextChanged);
-#endif     
-            // 
             // label5
             // 
             this.label5.AutoSize = true;
@@ -467,9 +444,9 @@
             // 
             // syncConsole
             // 
-            this.syncConsole.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                        | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.syncConsole.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.syncConsole.BackColor = System.Drawing.SystemColors.Info;
             this.syncConsole.Location = new System.Drawing.Point(6, 33);
             this.syncConsole.Multiline = true;
@@ -482,8 +459,8 @@
             // 
             // groupBox4
             // 
-            this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox4.Controls.Add(this.proxySettingsLinkLabel);
             this.groupBox4.Controls.Add(this.label2);
             this.groupBox4.Controls.Add(this.label3);
@@ -519,8 +496,8 @@
             this.resetMatchesLinkLabel.TabStop = true;
             this.resetMatchesLinkLabel.Text = "&Reset Matches";
             this.toolTip.SetToolTip(this.resetMatchesLinkLabel, "This unlinks Outlook contacts with their\r\ncorresponding Google contatcs. If you\r\n" +
-                    "accidentaly delete a contact and you\r\ndont want the deletion to be synchronised," +
-                    "\r\nclick  this link.");
+        "accidentaly delete a contact and you\r\ndont want the deletion to be synchronised," +
+        "\r\nclick  this link.");
             this.resetMatchesLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.resetMatchesLinkLabel_LinkClicked);
             // 
             // Donate
@@ -569,9 +546,9 @@
             // 
             // hideButton
             // 
-            this.hideButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                        | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.hideButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.hideButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.hideButton.Location = new System.Drawing.Point(107, 3);
             this.hideButton.Name = "hideButton";
@@ -583,9 +560,9 @@
             // 
             // MainPanel
             // 
-            this.MainPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                        | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.MainPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.MainPanel.Controls.Add(this.logGroupBox);
             this.MainPanel.Controls.Add(this.MainSplitter);
             this.MainPanel.Controls.Add(this.settingsGroupBox);
@@ -604,6 +581,8 @@
             // 
             // cmbFolders
             // 
+            this.cmbFolders.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbFolders.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbFolders.FormattingEnabled = true;
             this.cmbFolders.Location = new System.Drawing.Point(172, 450);
@@ -611,6 +590,7 @@
             this.cmbFolders.Size = new System.Drawing.Size(303, 21);
             this.cmbFolders.Sorted = true;
             this.cmbFolders.TabIndex = 6;
+            this.cmbFolders.SelectedIndexChanged += new System.EventHandler(this.cmbFolders_SelectedIndexChanged);
             // 
             // SettingsForm
             // 

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2012-02-16 08:24:47 UTC (rev 235)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2012-02-27 12:18:48 UTC (rev 236)
@@ -12,6 +12,7 @@
 using System.IO;
 using System.Runtime.Remoting;
 using System.Runtime.InteropServices;
+using System.Collections;
 
 namespace GoContactSyncMod
 {
@@ -25,8 +26,10 @@
 
         public const string AppRootKey = @"Software\Webgear\GOContactSync";
 
+        private ArrayList _OutlookFolders = new ArrayList();
         private ProxySettingsForm _proxy = new ProxySettingsForm();
 
+        private string _syncFolder = "";
         private string _syncProfile
         {
             get
@@ -58,6 +61,7 @@
 			PopulateSyncOptionBox();
 
 #if debug
+            fillSyncFolderItems();
             if (fillSyncProfileItems()) 
                 LoadSettings(cmbSyncProfile.Text);
             else 
@@ -113,7 +117,34 @@
 				syncOptionBox.Items.Add(str);
 			}
 		}
+        private void fillSyncFolderItems()
+        {
 #if debug
+            cmbFolders.Visible = true;
+            try
+            {
+                _OutlookFolders.Clear();
+                Microsoft.Office.Interop.Outlook.Folders folders = Syncronizer.OutlookNameSpace.Folders;
+                foreach (Microsoft.Office.Interop.Outlook.Folder folder in folders)
+                {
+                    _OutlookFolders.Add(new OutlookFolder(folder.Name, folder.EntryID));
+                }
+
+                this.cmbFolders.DataSource = _OutlookFolders;
+                this.cmbFolders.DisplayMember = "FolderName";
+                this.cmbFolders.ValueMember = "FolderID";
+
+            }
+            catch (Exception e)
+            {
+                Logger.Log("Error getting available Outlook folders: " + e.Message, EventType.Warning);
+            }
+#else
+                cmbFolders.Visible = false;
+#endif
+        }
+
+#if debug
         // Fill lists of sync profiles
         private bool fillSyncProfileItems()
         {
@@ -177,6 +208,8 @@
                 reportSyncResultCheckBox.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("ReportSyncResult"));
             if (regKeyAppRoot.GetValue("SyncDeletion") != null)
                 btSyncDelete.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("SyncDeletion"));
+            if (regKeyAppRoot.GetValue("SyncFolder") != null)
+                cmbFolders.SelectedValue = regKeyAppRoot.GetValue("SyncFolder") as string;
 
             _proxy.LoadSettings(_profile);
         }
@@ -193,6 +226,7 @@
                 _syncProfile = cmbSyncProfile.Text;
                 RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(AppRootKey + "\\" + _profile);
                 regKeyAppRoot.SetValue("SyncOption", (int)_syncOption);
+                regKeyAppRoot.SetValue("SyncFolder", cmbFolders.SelectedValue.ToString());
 
                 if (!string.IsNullOrEmpty(UserName.Text))
                 {
@@ -219,11 +253,12 @@
 			{
 				bool userNameIsValid = Regex.IsMatch(UserName.Text, @"^(?'id'[a-z0-9\'\%\._\+\-]+)@(?'domain'[a-z0-9\'\%\._\+\-]+)\.(?'ext'[a-z]{2,6})$", RegexOptions.IgnoreCase);
 				bool passwordIsValid = Password.Text.Length != 0;
-                bool syncProfileNameIsValid = (cmbSyncProfile.SelectedIndex > 0 && cmbSyncProfile.SelectedIndex < cmbSyncProfile.Items.Count);
+                bool syncProfileIsValid = (cmbSyncProfile.SelectedIndex > 0 && cmbSyncProfile.SelectedIndex < cmbSyncProfile.Items.Count);
+                bool syncFolderIsValid = (cmbFolders.SelectedIndex > 0 && cmbFolders.SelectedIndex < cmbFolders.Items.Count);
 
 				setBgColor(UserName, userNameIsValid);
 				setBgColor(Password, passwordIsValid);
-				return userNameIsValid && passwordIsValid && syncProfileNameIsValid;
+                return userNameIsValid && passwordIsValid && syncProfileIsValid && syncFolderIsValid;
 			}
 		}
 #else
@@ -358,6 +393,7 @@
                 //SetSyncConsoleText(Logger.GetText());
 #if debug
                 _sync.SyncProfile = _syncProfile;
+                _sync.SyncFolder  = _syncFolder;
 #else
                 _sync.SyncProfile = tbSyncProfile.Text;
 #endif
@@ -831,6 +867,7 @@
 				_sync.LoginToOutlook();
 #if debug
                 _sync.SyncProfile = _syncProfile;
+                _sync.SyncFolder = _syncFolder;
 #else
                 _sync.SyncProfile = tbSyncProfile.Text;
 #endif
@@ -887,23 +924,6 @@
             }
             else
             {
-#if debug
-            //ToDo: Implement folders to be used
-            cmbFolders.Visible = true;
-            try
-            {
-                this.cmbFolders.Items.Clear();
-                Microsoft.Office.Interop.Outlook.Folders folders = Syncronizer.OutlookNameSpace.Folders;
-                foreach (Microsoft.Office.Interop.Outlook.Folder folder in folders)
-                    this.cmbFolders.Items.Add(folder.Name);
-            }
-            catch (Exception e)
-            {
-                Logger.Log("Error getting available Outlook folders: " + e.Message, EventType.Warning);
-            }
-#else
-                cmbFolders.Visible = false;
-#endif
                 Show();
                 Activate();
                 WindowState = FormWindowState.Normal;
@@ -944,7 +964,8 @@
 			if (string.IsNullOrEmpty(UserName.Text) ||
 				string.IsNullOrEmpty(Password.Text) ||
 #if debug
-                string.IsNullOrEmpty(cmbSyncProfile.Text))
+                string.IsNullOrEmpty(cmbSyncProfile.Text) ||
+                string.IsNullOrEmpty(cmbFolders.Text) )
 #else
 				string.IsNullOrEmpty(tbSyncProfile.Text))
 #endif
@@ -1091,6 +1112,12 @@
             ValidateSyncButton();
 
         }
+
+        private void cmbFolders_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            _syncFolder = (sender as ComboBox).SelectedValue.ToString();
+        }
+
 #endif
 	}
 

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2012-02-16 08:24:47 UTC (rev 235)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2012-02-27 12:18:48 UTC (rev 236)
@@ -177,6 +177,13 @@
 			set { _syncProfile = value; }
 		}
 
+        private string _syncFolder = "";
+        public string SyncFolder
+        {
+            get { return _syncFolder; }
+            set { _syncFolder = value; }
+        }
+
 		//private ConflictResolution? _conflictResolution;
 		//public ConflictResolution? CResolution
 		//{
@@ -361,8 +368,9 @@
             _outlookNamespace.Logon(profileName, null, true, false);*/
 
             //Just try to access the outlookNamespace to check, if it is still accessible, throws COMException, if not reachable           
-           _outlookNamespace.GetDefaultFolder(Outlook.OlDefaultFolders.olFolderContacts);                                
 
+            _outlookNamespace.GetDefaultFolder(Outlook.OlDefaultFolders.olFolderContacts);
+
         }
 
 		public void LogoffOutlook()
@@ -412,6 +420,7 @@
         private Outlook.Items GetOutlookItems(Outlook.OlDefaultFolders outlookDefaultFolder)
         {
             Outlook.MAPIFolder mapiFolder = OutlookNameSpace.GetDefaultFolder(outlookDefaultFolder);
+
             try
             {
                 return mapiFolder.Items;

Modified: trunk/GoogleContactsSync/Utilities.cs
===================================================================
--- trunk/GoogleContactsSync/Utilities.cs	2012-02-16 08:24:47 UTC (rev 235)
+++ trunk/GoogleContactsSync/Utilities.cs	2012-02-27 12:18:48 UTC (rev 236)
@@ -344,4 +344,35 @@
         //    return true;
         //}
     }
+
+    public class OutlookFolder
+    {
+        private string _folderName;
+        private string _folderID;
+
+        public OutlookFolder(string folderName, string folderID)
+        {
+
+            this._folderName = folderName;
+            this._folderID   = folderID;
+        }
+
+        public string FolderName
+        {
+            get
+            {
+                return _folderName;
+            }
+        }
+
+        public string FolderID
+        {
+
+            get
+            {
+                return _folderID;
+            }
+        }
+
+    }
 }

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

Revision: 237
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=237&view=rev
Author:   v2l
Date:     2012-03-07 12:04:18 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
FIX: restore re-committed source

Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.Designer.cs
    trunk/GoogleContactsSync/SettingsForm.cs

Modified: trunk/GoogleContactsSync/SettingsForm.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.Designer.cs	2012-02-27 12:18:48 UTC (rev 236)
+++ trunk/GoogleContactsSync/SettingsForm.Designer.cs	2012-03-07 12:04:18 UTC (rev 237)
@@ -59,7 +59,11 @@
             this.btSyncNotes = new System.Windows.Forms.CheckBox();
             this.panel1 = new System.Windows.Forms.Panel();
             this.btSyncDelete = new System.Windows.Forms.CheckBox();
+#if debug
             this.cmbSyncProfile = new System.Windows.Forms.ComboBox();
+#else
+            this.tbSyncProfile = new System.Windows.Forms.TextBox();
+#endif
             this.label5 = new System.Windows.Forms.Label();
             this.lastSyncLabel = new System.Windows.Forms.Label();
             this.logGroupBox = new System.Windows.Forms.GroupBox();
@@ -337,7 +341,11 @@
             this.groupBox2.Controls.Add(this.btSyncNotes);
             this.groupBox2.Controls.Add(this.panel1);
             this.groupBox2.Controls.Add(this.btSyncDelete);
+#if debug
             this.groupBox2.Controls.Add(this.cmbSyncProfile);
+#else
+            this.groupBox2.Controls.Add(this.tbSyncProfile);
+#endif
             this.groupBox2.Controls.Add(this.label5);
             this.groupBox2.Controls.Add(this.syncOptionBox);
             this.groupBox2.Location = new System.Drawing.Point(6, 115);
@@ -399,6 +407,7 @@
         "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
         "ice versa.");
             this.btSyncDelete.UseVisualStyleBackColor = true;
+#if debug
             // 
             // cmbSyncProfile
             // 
@@ -411,7 +420,21 @@
             this.toolTip.SetToolTip(this.cmbSyncProfile, "This is a profile name of your choice.\r\nIt must be unique in each computer\r\nand a" +
         "ccount you intend to sync with\r\nyour Google Mail account.");
             this.cmbSyncProfile.SelectedIndexChanged += new System.EventHandler(this.cmbSyncProfile_SelectedIndexChanged);
+#else
             // 
+            // tbSyncProfile
+            // 
+            this.tbSyncProfile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.tbSyncProfile.Location = new System.Drawing.Point(100, 19);
+            this.tbSyncProfile.Name = "tbSyncProfile";
+            this.tbSyncProfile.Size = new System.Drawing.Size(217, 21);
+            this.tbSyncProfile.TabIndex = 1;
+            this.toolTip.SetToolTip(this.tbSyncProfile, "This is a profile name of your choice.\r\nIt must be unique in each computer\r\nand a" +
+                    "ccount you intend to sync with\r\nyour Google Mail account.");
+            this.tbSyncProfile.TextChanged += new System.EventHandler(this.tbSyncProfile_TextChanged);
+#endif
+            // 
             // label5
             // 
             this.label5.AutoSize = true;

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2012-02-27 12:18:48 UTC (rev 236)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2012-03-07 12:04:18 UTC (rev 237)
@@ -1113,12 +1113,13 @@
 
         }
 
+
+#endif
         private void cmbFolders_SelectedIndexChanged(object sender, EventArgs e)
         {
             _syncFolder = (sender as ComboBox).SelectedValue.ToString();
         }
 
-#endif
 	}
 
 

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

Revision: 238
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=238&view=rev
Author:   v2l
Date:     2012-03-11 12:29:11 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
IMPROVEMENT: made choose Outlook folder and save/restore value combobox (in debug mode)

Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.Designer.cs
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs
    trunk/GoogleContactsSync/Utilities.cs

Modified: trunk/GoogleContactsSync/SettingsForm.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.Designer.cs	2012-03-07 12:04:18 UTC (rev 237)
+++ trunk/GoogleContactsSync/SettingsForm.Designer.cs	2012-03-11 12:29:11 UTC (rev 238)
@@ -611,7 +611,7 @@
             this.cmbFolders.Location = new System.Drawing.Point(172, 450);
             this.cmbFolders.Name = "cmbFolders";
             this.cmbFolders.Size = new System.Drawing.Size(303, 21);
-            this.cmbFolders.Sorted = true;
+            this.cmbFolders.Sorted = false;
             this.cmbFolders.TabIndex = 6;
             this.cmbFolders.SelectedIndexChanged += new System.EventHandler(this.cmbFolders_SelectedIndexChanged);
             // 

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2012-03-07 12:04:18 UTC (rev 237)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2012-03-11 12:29:11 UTC (rev 238)
@@ -60,8 +60,8 @@
             NotesMatcher.NotificationReceived += new NotesMatcher.NotificationHandler(OnNotificationReceived);
 			PopulateSyncOptionBox();
 
+            fillSyncFolderItems();
 #if debug
-            fillSyncFolderItems();
             if (fillSyncProfileItems()) 
                 LoadSettings(cmbSyncProfile.Text);
             else 
@@ -123,17 +123,21 @@
             cmbFolders.Visible = true;
             try
             {
+                this.cmbFolders.BeginUpdate();
+                this.cmbFolders.Items.Clear();
                 _OutlookFolders.Clear();
+
                 Microsoft.Office.Interop.Outlook.Folders folders = Syncronizer.OutlookNameSpace.Folders;
                 foreach (Microsoft.Office.Interop.Outlook.Folder folder in folders)
                 {
                     _OutlookFolders.Add(new OutlookFolder(folder.Name, folder.EntryID));
                 }
+                _OutlookFolders.Sort();
 
                 this.cmbFolders.DataSource = _OutlookFolders;
                 this.cmbFolders.DisplayMember = "FolderName";
                 this.cmbFolders.ValueMember = "FolderID";
-
+                this.cmbFolders.EndUpdate();
             }
             catch (Exception e)
             {
@@ -227,7 +231,7 @@
                 RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(AppRootKey + "\\" + _profile);
                 regKeyAppRoot.SetValue("SyncOption", (int)_syncOption);
                 regKeyAppRoot.SetValue("SyncFolder", cmbFolders.SelectedValue.ToString());
-
+ 
                 if (!string.IsNullOrEmpty(UserName.Text))
                 {
                     regKeyAppRoot.SetValue("Username", UserName.Text);
@@ -1117,7 +1121,9 @@
 #endif
         private void cmbFolders_SelectedIndexChanged(object sender, EventArgs e)
         {
-            _syncFolder = (sender as ComboBox).SelectedValue.ToString();
+            if ((sender as ComboBox).SelectedIndex >= 0)
+                _syncFolder = (sender as ComboBox).SelectedValue.ToString();
+            ValidateSyncButton();
         }
 
 	}

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2012-03-07 12:04:18 UTC (rev 237)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2012-03-11 12:29:11 UTC (rev 238)
@@ -177,7 +177,7 @@
 			set { _syncProfile = value; }
 		}
 
-        private string _syncFolder = "";
+        private static string _syncFolder = "";
         public string SyncFolder
         {
             get { return _syncFolder; }
@@ -368,8 +368,18 @@
             _outlookNamespace.Logon(profileName, null, true, false);*/
 
             //Just try to access the outlookNamespace to check, if it is still accessible, throws COMException, if not reachable           
-
+#if debug
+            if (_syncFolder.Length == 0)
+            {
+               _outlookNamespace.GetDefaultFolder(Outlook.OlDefaultFolders.olFolderContacts);
+            }
+            else
+            {
+                _outlookNamespace.GetFolderFromID(_syncFolder);
+            }
+#else
             _outlookNamespace.GetDefaultFolder(Outlook.OlDefaultFolders.olFolderContacts);
+#endif
 
         }
 
@@ -419,11 +429,35 @@
 
         private Outlook.Items GetOutlookItems(Outlook.OlDefaultFolders outlookDefaultFolder)
         {
+#if debug
+            Outlook.MAPIFolder mapiFolder = null;
+            if (_syncFolder.Length == 0)
+            {
+                mapiFolder = OutlookNameSpace.GetDefaultFolder(outlookDefaultFolder);
+            }
+            else
+            {  
+                Outlook.MAPIFolder Folder = OutlookNameSpace.GetFolderFromID(_syncFolder);
+                if (Folder != null)
+                {
+                    for (int i = 1; i <= Folder.Folders.Count; i++)
+                    {
+                        Outlook.Folder subFolder = Folder.Folders[i] as Outlook.Folder;
+                        if ((Outlook.OlDefaultFolders.olFolderContacts == outlookDefaultFolder && Outlook.OlItemType.olContactItem == subFolder.DefaultItemType) ||
+                                 (Outlook.OlDefaultFolders.olFolderNotes == outlookDefaultFolder && Outlook.OlItemType.olNoteItem == subFolder.DefaultItemType) 
+                                )
+                        {
+                            mapiFolder = subFolder as Outlook.MAPIFolder;
+                        }
+                    }
+                }
+            }
+#else
             Outlook.MAPIFolder mapiFolder = OutlookNameSpace.GetDefaultFolder(outlookDefaultFolder);
-
+#endif
             try
             {
-                return mapiFolder.Items;
+                return ((null==mapiFolder)?null:mapiFolder.Items);
             }
             finally
             {

Modified: trunk/GoogleContactsSync/Utilities.cs
===================================================================
--- trunk/GoogleContactsSync/Utilities.cs	2012-03-07 12:04:18 UTC (rev 237)
+++ trunk/GoogleContactsSync/Utilities.cs	2012-03-11 12:29:11 UTC (rev 238)
@@ -345,7 +345,7 @@
         //}
     }
 
-    public class OutlookFolder
+    public class OutlookFolder : IComparable 
     {
         private string _folderName;
         private string _folderID;
@@ -374,5 +374,14 @@
             }
         }
 
+        public int CompareTo(object obj)
+        {
+            if (obj is OutlookFolder)
+            {
+                return this._folderName.CompareTo((obj as OutlookFolder)._folderName);
+            }
+            else
+                throw new ArgumentException("Object is not a OutlookFolder");
+        }
     }
 }

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

Revision: 239
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=239&view=rev
Author:   floriwan
Date:     2012-03-31 14:01:27 +0000 (Sat, 31 Mar 2012)
Log Message:
-----------
FIX: changed from OutlookFolder to OutlookMAPIFolder in the selectable ContactFolders and NoteFolders

Modified Paths:
--------------
    trunk/GoogleContactsSync/SettingsForm.Designer.cs
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs
    trunk/GoogleContactsSync/Utilities.cs

Modified: trunk/GoogleContactsSync/SettingsForm.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.Designer.cs	2012-03-11 12:29:11 UTC (rev 238)
+++ trunk/GoogleContactsSync/SettingsForm.Designer.cs	2012-03-31 14:01:27 UTC (rev 239)
@@ -59,11 +59,8 @@
             this.btSyncNotes = new System.Windows.Forms.CheckBox();
             this.panel1 = new System.Windows.Forms.Panel();
             this.btSyncDelete = new System.Windows.Forms.CheckBox();
-#if debug
             this.cmbSyncProfile = new System.Windows.Forms.ComboBox();
-#else
             this.tbSyncProfile = new System.Windows.Forms.TextBox();
-#endif
             this.label5 = new System.Windows.Forms.Label();
             this.lastSyncLabel = new System.Windows.Forms.Label();
             this.logGroupBox = new System.Windows.Forms.GroupBox();
@@ -78,7 +75,8 @@
             this.hideButton = new System.Windows.Forms.Button();
             this.MainPanel = new System.Windows.Forms.Panel();
             this.MainSplitter = new System.Windows.Forms.Splitter();
-            this.cmbFolders = new System.Windows.Forms.ComboBox();
+            this.contactFoldersComboBox = new System.Windows.Forms.ComboBox();
+            this.noteFoldersComboBox = new System.Windows.Forms.ComboBox();
             this.systemTrayMenu.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.autoSyncInterval)).BeginInit();
             this.groupBox1.SuspendLayout();
@@ -93,22 +91,22 @@
             // 
             // Password
             // 
-            this.Password.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.Password.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.Password.Location = new System.Drawing.Point(100, 44);
             this.Password.Name = "Password";
             this.Password.PasswordChar = '*';
-            this.Password.Size = new System.Drawing.Size(217, 21);
+            this.Password.Size = new System.Drawing.Size(299, 21);
             this.Password.TabIndex = 3;
             this.Password.TextChanged += new System.EventHandler(this.Password_TextChanged);
             // 
             // UserName
             // 
-            this.UserName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.UserName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.UserName.Location = new System.Drawing.Point(100, 18);
             this.UserName.Name = "UserName";
-            this.UserName.Size = new System.Drawing.Size(217, 21);
+            this.UserName.Size = new System.Drawing.Size(299, 21);
             this.UserName.TabIndex = 1;
             this.UserName.TextChanged += new System.EventHandler(this.UserName_TextChanged);
             // 
@@ -130,9 +128,9 @@
             // 
             // syncButton
             // 
-            this.syncButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.syncButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.syncButton.Location = new System.Drawing.Point(3, 3);
             this.syncButton.Name = "syncButton";
             this.syncButton.Size = new System.Drawing.Size(98, 25);
@@ -143,17 +141,17 @@
             // 
             // syncOptionBox
             // 
-            this.syncOptionBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.syncOptionBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.syncOptionBox.BackColor = System.Drawing.SystemColors.Control;
             this.syncOptionBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.syncOptionBox.CheckOnClick = true;
             this.syncOptionBox.FormattingEnabled = true;
             this.syncOptionBox.IntegralHeight = false;
-            this.syncOptionBox.Location = new System.Drawing.Point(7, 73);
+            this.syncOptionBox.Location = new System.Drawing.Point(7, 99);
             this.syncOptionBox.Name = "syncOptionBox";
-            this.syncOptionBox.Size = new System.Drawing.Size(311, 91);
+            this.syncOptionBox.Size = new System.Drawing.Size(393, 86);
             this.syncOptionBox.TabIndex = 4;
             this.toolTip.SetToolTip(this.syncOptionBox, resources.GetString("syncOptionBox.ToolTip"));
             this.syncOptionBox.SelectedIndexChanged += new System.EventHandler(this.syncOptionBox_SelectedIndexChanged);
@@ -255,7 +253,7 @@
             this.autoSyncCheckBox.AutoSize = true;
             this.autoSyncCheckBox.Location = new System.Drawing.Point(14, 42);
             this.autoSyncCheckBox.Name = "autoSyncCheckBox";
-            this.autoSyncCheckBox.Size = new System.Drawing.Size(75, 17);
+            this.autoSyncCheckBox.Size = new System.Drawing.Size(84, 17);
             this.autoSyncCheckBox.TabIndex = 1;
             this.autoSyncCheckBox.Text = "&Auto Sync";
             this.autoSyncCheckBox.UseVisualStyleBackColor = true;
@@ -281,8 +279,8 @@
             // 
             // groupBox1
             // 
-            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox1.Controls.Add(this.reportSyncResultCheckBox);
             this.groupBox1.Controls.Add(this.runAtStartupCheckBox);
             this.groupBox1.Controls.Add(this.nextSyncLabel);
@@ -290,9 +288,9 @@
             this.groupBox1.Controls.Add(this.label4);
             this.groupBox1.Controls.Add(this.autoSyncCheckBox);
             this.groupBox1.Controls.Add(this.label1);
-            this.groupBox1.Location = new System.Drawing.Point(6, 285);
+            this.groupBox1.Location = new System.Drawing.Point(6, 306);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(325, 138);
+            this.groupBox1.Size = new System.Drawing.Size(407, 138);
             this.groupBox1.TabIndex = 2;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "Automization";
@@ -302,7 +300,7 @@
             this.reportSyncResultCheckBox.AutoSize = true;
             this.reportSyncResultCheckBox.Location = new System.Drawing.Point(14, 65);
             this.reportSyncResultCheckBox.Name = "reportSyncResultCheckBox";
-            this.reportSyncResultCheckBox.Size = new System.Drawing.Size(190, 17);
+            this.reportSyncResultCheckBox.Size = new System.Drawing.Size(226, 17);
             this.reportSyncResultCheckBox.TabIndex = 6;
             this.reportSyncResultCheckBox.Text = "Re&port Sync Result in System Tray";
             this.reportSyncResultCheckBox.UseVisualStyleBackColor = true;
@@ -312,7 +310,7 @@
             this.runAtStartupCheckBox.AutoSize = true;
             this.runAtStartupCheckBox.Location = new System.Drawing.Point(14, 21);
             this.runAtStartupCheckBox.Name = "runAtStartupCheckBox";
-            this.runAtStartupCheckBox.Size = new System.Drawing.Size(134, 17);
+            this.runAtStartupCheckBox.Size = new System.Drawing.Size(160, 17);
             this.runAtStartupCheckBox.TabIndex = 0;
             this.runAtStartupCheckBox.Text = "&Run program at startup";
             this.runAtStartupCheckBox.UseVisualStyleBackColor = true;
@@ -334,23 +332,22 @@
             // 
             // groupBox2
             // 
-            this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox2.Controls.Add(this.btSyncContacts);
+            this.groupBox2.Controls.Add(this.noteFoldersComboBox);
             this.groupBox2.Controls.Add(this.btSyncNotes);
             this.groupBox2.Controls.Add(this.panel1);
             this.groupBox2.Controls.Add(this.btSyncDelete);
-#if debug
             this.groupBox2.Controls.Add(this.cmbSyncProfile);
-#else
+            this.groupBox2.Controls.Add(this.contactFoldersComboBox);
             this.groupBox2.Controls.Add(this.tbSyncProfile);
-#endif
             this.groupBox2.Controls.Add(this.label5);
             this.groupBox2.Controls.Add(this.syncOptionBox);
             this.groupBox2.Location = new System.Drawing.Point(6, 115);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(325, 170);
+            this.groupBox2.Size = new System.Drawing.Size(407, 191);
             this.groupBox2.TabIndex = 1;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "Sync Options";
@@ -362,12 +359,12 @@
             this.btSyncContacts.CheckState = System.Windows.Forms.CheckState.Checked;
             this.btSyncContacts.Location = new System.Drawing.Point(119, 46);
             this.btSyncContacts.Name = "btSyncContacts";
-            this.btSyncContacts.Size = new System.Drawing.Size(95, 17);
+            this.btSyncContacts.Size = new System.Drawing.Size(108, 17);
             this.btSyncContacts.TabIndex = 6;
             this.btSyncContacts.Text = "Sync &Contacts";
             this.toolTip.SetToolTip(this.btSyncContacts, "This specifies whether deletions are\r\nsynchronized. Enabling this option\r\nmeans i" +
-        "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
-        "ice versa.");
+                    "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
+                    "ice versa.");
             this.btSyncContacts.UseVisualStyleBackColor = true;
             this.btSyncContacts.CheckedChanged += new System.EventHandler(this.btSyncContacts_CheckedChanged);
             // 
@@ -376,23 +373,23 @@
             this.btSyncNotes.AutoSize = true;
             this.btSyncNotes.Location = new System.Drawing.Point(229, 46);
             this.btSyncNotes.Name = "btSyncNotes";
-            this.btSyncNotes.Size = new System.Drawing.Size(81, 17);
+            this.btSyncNotes.Size = new System.Drawing.Size(90, 17);
             this.btSyncNotes.TabIndex = 5;
             this.btSyncNotes.Text = "Sync &Notes";
             this.toolTip.SetToolTip(this.btSyncNotes, "This specifies whether deletions are\r\nsynchronized. Enabling this option\r\nmeans i" +
-        "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
-        "ice versa.");
+                    "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
+                    "ice versa.");
             this.btSyncNotes.UseVisualStyleBackColor = true;
             this.btSyncNotes.CheckedChanged += new System.EventHandler(this.btSyncNotes_CheckedChanged);
             // 
             // panel1
             // 
-            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel1.Location = new System.Drawing.Point(7, 67);
+            this.panel1.Location = new System.Drawing.Point(6, 92);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(308, 1);
+            this.panel1.Size = new System.Drawing.Size(390, 1);
             this.panel1.TabIndex = 3;
             // 
             // btSyncDelete
@@ -400,27 +397,27 @@
             this.btSyncDelete.AutoSize = true;
             this.btSyncDelete.Location = new System.Drawing.Point(8, 46);
             this.btSyncDelete.Name = "btSyncDelete";
-            this.btSyncDelete.Size = new System.Drawing.Size(92, 17);
+            this.btSyncDelete.Size = new System.Drawing.Size(105, 17);
             this.btSyncDelete.TabIndex = 2;
             this.btSyncDelete.Text = "Sync &Deletion";
             this.toolTip.SetToolTip(this.btSyncDelete, "This specifies whether deletions are\r\nsynchronized. Enabling this option\r\nmeans i" +
-        "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
-        "ice versa.");
+                    "f you delete a contact from\r\nGoogle, then it will be deleted from\r\nOutlook and v" +
+                    "ice versa.");
             this.btSyncDelete.UseVisualStyleBackColor = true;
-#if debug
             // 
             // cmbSyncProfile
             // 
+            this.cmbSyncProfile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbSyncProfile.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbSyncProfile.FormattingEnabled = true;
             this.cmbSyncProfile.Location = new System.Drawing.Point(100, 19);
             this.cmbSyncProfile.Name = "cmbSyncProfile";
-            this.cmbSyncProfile.Size = new System.Drawing.Size(215, 21);
+            this.cmbSyncProfile.Size = new System.Drawing.Size(299, 21);
             this.cmbSyncProfile.TabIndex = 1;
             this.toolTip.SetToolTip(this.cmbSyncProfile, "This is a profile name of your choice.\r\nIt must be unique in each computer\r\nand a" +
-        "ccount you intend to sync with\r\nyour Google Mail account.");
+                    "ccount you intend to sync with\r\nyour Google Mail account.");
             this.cmbSyncProfile.SelectedIndexChanged += new System.EventHandler(this.cmbSyncProfile_SelectedIndexChanged);
-#else
             // 
             // tbSyncProfile
             // 
@@ -428,12 +425,11 @@
                         | System.Windows.Forms.AnchorStyles.Right)));
             this.tbSyncProfile.Location = new System.Drawing.Point(100, 19);
             this.tbSyncProfile.Name = "tbSyncProfile";
-            this.tbSyncProfile.Size = new System.Drawing.Size(217, 21);
+            this.tbSyncProfile.Size = new System.Drawing.Size(299, 21);
             this.tbSyncProfile.TabIndex = 1;
             this.toolTip.SetToolTip(this.tbSyncProfile, "This is a profile name of your choice.\r\nIt must be unique in each computer\r\nand a" +
                     "ccount you intend to sync with\r\nyour Google Mail account.");
             this.tbSyncProfile.TextChanged += new System.EventHandler(this.tbSyncProfile_TextChanged);
-#endif
             // 
             // label5
             // 
@@ -458,32 +454,32 @@
             this.logGroupBox.Controls.Add(this.syncConsole);
             this.logGroupBox.Controls.Add(this.lastSyncLabel);
             this.logGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.logGroupBox.Location = new System.Drawing.Point(342, 0);
+            this.logGroupBox.Location = new System.Drawing.Point(424, 0);
             this.logGroupBox.Name = "logGroupBox";
-            this.logGroupBox.Size = new System.Drawing.Size(356, 429);
+            this.logGroupBox.Size = new System.Drawing.Size(375, 450);
             this.logGroupBox.TabIndex = 2;
             this.logGroupBox.TabStop = false;
             this.logGroupBox.Text = "Sync Details && Log";
             // 
             // syncConsole
             // 
-            this.syncConsole.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.syncConsole.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.syncConsole.BackColor = System.Drawing.SystemColors.Info;
             this.syncConsole.Location = new System.Drawing.Point(6, 33);
             this.syncConsole.Multiline = true;
             this.syncConsole.Name = "syncConsole";
             this.syncConsole.ReadOnly = true;
             this.syncConsole.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.syncConsole.Size = new System.Drawing.Size(344, 390);
+            this.syncConsole.Size = new System.Drawing.Size(363, 411);
             this.syncConsole.TabIndex = 1;
             this.toolTip.SetToolTip(this.syncConsole, "This window shows information\r\n from the last sync.");
             // 
             // groupBox4
             // 
-            this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox4.Controls.Add(this.proxySettingsLinkLabel);
             this.groupBox4.Controls.Add(this.label2);
             this.groupBox4.Controls.Add(this.label3);
@@ -491,7 +487,7 @@
             this.groupBox4.Controls.Add(this.Password);
             this.groupBox4.Location = new System.Drawing.Point(6, 20);
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(325, 92);
+            this.groupBox4.Size = new System.Drawing.Size(407, 92);
             this.groupBox4.TabIndex = 0;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "Google Account";
@@ -512,15 +508,15 @@
             // 
             this.resetMatchesLinkLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.resetMatchesLinkLabel.AutoSize = true;
-            this.resetMatchesLinkLabel.Location = new System.Drawing.Point(52, 447);
+            this.resetMatchesLinkLabel.Location = new System.Drawing.Point(52, 468);
             this.resetMatchesLinkLabel.Name = "resetMatchesLinkLabel";
             this.resetMatchesLinkLabel.Size = new System.Drawing.Size(89, 13);
             this.resetMatchesLinkLabel.TabIndex = 2;
             this.resetMatchesLinkLabel.TabStop = true;
             this.resetMatchesLinkLabel.Text = "&Reset Matches";
             this.toolTip.SetToolTip(this.resetMatchesLinkLabel, "This unlinks Outlook contacts with their\r\ncorresponding Google contatcs. If you\r\n" +
-        "accidentaly delete a contact and you\r\ndont want the deletion to be synchronised," +
-        "\r\nclick  this link.");
+                    "accidentaly delete a contact and you\r\ndont want the deletion to be synchronised," +
+                    "\r\nclick  this link.");
             this.resetMatchesLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.resetMatchesLinkLabel_LinkClicked);
             // 
             // Donate
@@ -528,7 +524,7 @@
             this.Donate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.Donate.BackColor = System.Drawing.Color.Transparent;
             this.Donate.Image = ((System.Drawing.Image)(resources.GetObject("Donate.Image")));
-            this.Donate.Location = new System.Drawing.Point(12, 447);
+            this.Donate.Location = new System.Drawing.Point(12, 468);
             this.Donate.Name = "Donate";
             this.Donate.Size = new System.Drawing.Size(34, 34);
             this.Donate.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@@ -547,7 +543,7 @@
             this.settingsGroupBox.Dock = System.Windows.Forms.DockStyle.Left;
             this.settingsGroupBox.Location = new System.Drawing.Point(0, 0);
             this.settingsGroupBox.Name = "settingsGroupBox";
-            this.settingsGroupBox.Size = new System.Drawing.Size(337, 429);
+            this.settingsGroupBox.Size = new System.Drawing.Size(419, 450);
             this.settingsGroupBox.TabIndex = 0;
             this.settingsGroupBox.TabStop = false;
             this.settingsGroupBox.Text = "Program Settings";
@@ -560,7 +556,7 @@
             this.actionsTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
             this.actionsTableLayout.Controls.Add(this.hideButton, 0, 0);
             this.actionsTableLayout.Controls.Add(this.syncButton, 0, 0);
-            this.actionsTableLayout.Location = new System.Drawing.Point(501, 447);
+            this.actionsTableLayout.Location = new System.Drawing.Point(602, 468);
             this.actionsTableLayout.Name = "actionsTableLayout";
             this.actionsTableLayout.RowCount = 1;
             this.actionsTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
@@ -569,9 +565,9 @@
             // 
             // hideButton
             // 
-            this.hideButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.hideButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.hideButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.hideButton.Location = new System.Drawing.Point(107, 3);
             this.hideButton.Name = "hideButton";
@@ -583,46 +579,54 @@
             // 
             // MainPanel
             // 
-            this.MainPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.MainPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
             this.MainPanel.Controls.Add(this.logGroupBox);
             this.MainPanel.Controls.Add(this.MainSplitter);
             this.MainPanel.Controls.Add(this.settingsGroupBox);
             this.MainPanel.Location = new System.Drawing.Point(12, 12);
             this.MainPanel.Name = "MainPanel";
-            this.MainPanel.Size = new System.Drawing.Size(698, 429);
+            this.MainPanel.Size = new System.Drawing.Size(799, 450);
             this.MainPanel.TabIndex = 0;
             // 
             // MainSplitter
             // 
-            this.MainSplitter.Location = new System.Drawing.Point(337, 0);
+            this.MainSplitter.Location = new System.Drawing.Point(419, 0);
             this.MainSplitter.Name = "MainSplitter";
-            this.MainSplitter.Size = new System.Drawing.Size(5, 429);
+            this.MainSplitter.Size = new System.Drawing.Size(5, 450);
             this.MainSplitter.TabIndex = 5;
             this.MainSplitter.TabStop = false;
             // 
-            // cmbFolders
+            // contactFoldersComboBox
             // 
-            this.cmbFolders.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.cmbFolders.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbFolders.FormattingEnabled = true;
-            this.cmbFolders.Location = new System.Drawing.Point(172, 450);
-            this.cmbFolders.Name = "cmbFolders";
-            this.cmbFolders.Size = new System.Drawing.Size(303, 21);
-            this.cmbFolders.Sorted = false;
-            this.cmbFolders.TabIndex = 6;
-            this.cmbFolders.SelectedIndexChanged += new System.EventHandler(this.cmbFolders_SelectedIndexChanged);
+            this.contactFoldersComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.contactFoldersComboBox.FormattingEnabled = true;
+            this.contactFoldersComboBox.Location = new System.Drawing.Point(6, 65);
+            this.contactFoldersComboBox.Name = "contactFoldersComboBox";
+            this.contactFoldersComboBox.Size = new System.Drawing.Size(206, 21);
+            this.contactFoldersComboBox.TabIndex = 6;
+            this.contactFoldersComboBox.SelectedIndexChanged += new System.EventHandler(this.contacFoldersComboBox_SelectedIndexChanged);
             // 
+            // noteFoldersComboBox
+            // 
+            this.noteFoldersComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.noteFoldersComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.noteFoldersComboBox.FormattingEnabled = true;
+            this.noteFoldersComboBox.Location = new System.Drawing.Point(218, 65);
+            this.noteFoldersComboBox.Name = "noteFoldersComboBox";
+            this.noteFoldersComboBox.Size = new System.Drawing.Size(181, 21);
+            this.noteFoldersComboBox.TabIndex = 7;
+            this.noteFoldersComboBox.SelectedIndexChanged += new System.EventHandler(this.noteFoldersComboBox_SelectedIndexChanged);
+            // 
             // SettingsForm
             // 
             this.AcceptButton = this.syncButton;
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.hideButton;
-            this.ClientSize = new System.Drawing.Size(722, 490);
-            this.Controls.Add(this.cmbFolders);
+            this.ClientSize = new System.Drawing.Size(823, 511);
             this.Controls.Add(this.Donate);
             this.Controls.Add(this.MainPanel);
             this.Controls.Add(this.resetMatchesLinkLabel);
@@ -706,12 +710,11 @@
         private System.Windows.Forms.CheckBox reportSyncResultCheckBox;
         private System.Windows.Forms.CheckBox btSyncNotes;
         private System.Windows.Forms.CheckBox btSyncContacts;
-        private System.Windows.Forms.ComboBox cmbFolders;
-#if debug
+        private System.Windows.Forms.ComboBox contactFoldersComboBox;
         private System.Windows.Forms.ComboBox cmbSyncProfile;
-#else
         private System.Windows.Forms.TextBox tbSyncProfile;
-#endif
+        private System.Windows.Forms.ComboBox noteFoldersComboBox;
+
     }
 }
 

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2012-03-11 12:29:11 UTC (rev 238)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2012-03-31 14:01:27 UTC (rev 239)
@@ -26,10 +26,10 @@
 
         public const string AppRootKey = @"Software\Webgear\GOContactSync";
 
-        private ArrayList _OutlookFolders = new ArrayList();
         private ProxySettingsForm _proxy = new ProxySettingsForm();
 
-        private string _syncFolder = "";
+        private string _syncContactsFolder = "";
+        private string _syncNotesFolder = "";
         private string _syncProfile
         {
             get
@@ -120,35 +120,86 @@
         private void fillSyncFolderItems()
         {
 #if debug
-            cmbFolders.Visible = true;
+            this.contactFoldersComboBox.Visible = true;
+            this.noteFoldersComboBox.Visible = true;
+            this.cmbSyncProfile.Visible = true;
+            ArrayList outlookContactFolders = new ArrayList();
+            ArrayList outlookNoteFolders = new ArrayList();
             try
             {
-                this.cmbFolders.BeginUpdate();
-                this.cmbFolders.Items.Clear();
-                _OutlookFolders.Clear();
+                this.contactFoldersComboBox.BeginUpdate();
+                this.contactFoldersComboBox.Items.Clear();
+                outlookContactFolders.Clear();
+                outlookNoteFolders.Clear();
 
                 Microsoft.Office.Interop.Outlook.Folders folders = Syncronizer.OutlookNameSpace.Folders;
                 foreach (Microsoft.Office.Interop.Outlook.Folder folder in folders)
                 {
-                    _OutlookFolders.Add(new OutlookFolder(folder.Name, folder.EntryID));
+                    foreach (Microsoft.Office.Interop.Outlook.MAPIFolder mapi in folder.Folders)
+                    {
+                        if (mapi.DefaultItemType == Microsoft.Office.Interop.Outlook.OlItemType.olContactItem)
+                        {
+                            bool isDefaultFolder = mapi.EntryID.Equals(Syncronizer.OutlookNameSpace.GetDefaultFolder(Microsoft.Office.Interop.Outlook.OlDefaultFolders.olFolderContacts).EntryID);
+                            outlookContactFolders.Add(new OutlookFolder(folder.Name + " - " + mapi.Name, mapi.EntryID, isDefaultFolder));
+                        }
+                        if (mapi.DefaultItemType == Microsoft.Office.Interop.Outlook.OlItemType.olNoteItem)
+                        {
+                            bool isDefaultFolder = mapi.EntryID.Equals(Syncronizer.OutlookNameSpace.GetDefaultFolder(Microsoft.Office.Interop.Outlook.OlDefaultFolders.olFolderNotes).EntryID);
+                            outlookNoteFolders.Add(new OutlookFolder(folder.Name + " - " + mapi.Name, mapi.EntryID, isDefaultFolder));
+                        }
+                    }
                 }
-                _OutlookFolders.Sort();
+                outlookContactFolders.Sort();
+                outlookNoteFolders.Sort();
 
-                this.cmbFolders.DataSource = _OutlookFolders;
-                this.cmbFolders.DisplayMember = "FolderName";
-                this.cmbFolders.ValueMember = "FolderID";
-                this.cmbFolders.EndUpdate();
+                this.contactFoldersComboBox.DataSource = outlookContactFolders;
+                this.contactFoldersComboBox.DisplayMember = "DisplayName";
+                this.contactFoldersComboBox.ValueMember = "FolderID";
+
+                this.noteFoldersComboBox.DataSource = outlookNoteFolders;
+                this.noteFoldersComboBox.DisplayMember = "DisplayName";
+                this.noteFoldersComboBox.ValueMember = "FolderID";
+
+                this.contactFoldersComboBox.EndUpdate();
+                this.noteFoldersComboBox.EndUpdate();
+
+                //Select Default Folder per Default
+                foreach (OutlookFolder folder in contactFoldersComboBox.Items)
+                    if (folder.IsDefaultFolder)
+                    {
+                        this.contactFoldersComboBox.SelectedItem = folder;
+                        break;
+                    }
+
+                //Select Default Folder per Default
+                foreach (OutlookFolder folder in noteFoldersComboBox.Items)
+                    if (folder.IsDefaultFolder)
+                    {
+                        this.noteFoldersComboBox.SelectedItem = folder;
+                        break;
+                    }
+
+
             }
             catch (Exception e)
             {
                 Logger.Log("Error getting available Outlook folders: " + e.Message, EventType.Warning);
             }
 #else
-                cmbFolders.Visible = false;
+                contactFoldersComboBox.Visible = false;
+                noteFoldersComboBox.Visible = false;
+                cmbSyncProfile.Visible = false;
 #endif
         }
 
-#if debug
+        private void ClearSettings()
+        {
+            SetSyncOption(0);
+            UserName.Text = Password.Text = "";
+            autoSyncCheckBox.Checked = runAtStartupCheckBox.Checked = reportSyncResultCheckBox.Checked = btSyncDelete.Checked = false;
+            autoSyncInterval.Value = 120;
+            _proxy.ClearSettings();
+        }
         // Fill lists of sync profiles
         private bool fillSyncProfileItems()
         {
@@ -176,16 +227,9 @@
 
             return vReturn;
         }
+#if debug
+                
 
-        private void ClearSettings()
-        {
-            SetSyncOption(0);
-            UserName.Text = Password.Text = "";
-            autoSyncCheckBox.Checked = runAtStartupCheckBox.Checked = reportSyncResultCheckBox.Checked = btSyncDelete.Checked = false;
-            autoSyncInterval.Value = 120;
-            _proxy.ClearSettings();
-        }
-
         private void LoadSettings(string _profile)
         {
             RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(AppRootKey  + (_profile != null ? ('\\' + _profile) : "")  );
@@ -212,9 +256,17 @@
                 reportSyncResultCheckBox.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("ReportSyncResult"));
             if (regKeyAppRoot.GetValue("SyncDeletion") != null)
                 btSyncDelete.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("SyncDeletion"));
-            if (regKeyAppRoot.GetValue("SyncFolder") != null)
-                cmbFolders.SelectedValue = regKeyAppRoot.GetValue("SyncFolder") as string;
+            if (regKeyAppRoot.GetValue("SyncNotes") != null)
+                btSyncNotes.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("SyncNotes"));
+            if (regKeyAppRoot.GetValue("SyncContacts") != null)
+                btSyncContacts.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("SyncContacts"));
+            if (regKeyAppRoot.GetValue("SyncContactsFolder") != null)
+                contactFoldersComboBox.SelectedValue = regKeyAppRoot.GetValue("SyncContactsFolder") as string;
+            if (regKeyAppRoot.GetValue("SyncNotesFolder") != null)
+                noteFoldersComboBox.SelectedValue = regKeyAppRoot.GetValue("SyncNotesFolder") as string;
 
+            autoSyncCheckBox_CheckedChanged(null, null);
+
             _proxy.LoadSettings(_profile);
         }
 
@@ -223,14 +275,13 @@
             SaveSettings(cmbSyncProfile.Text);
 		}
 
-        private void SaveSettings(string _profile)
+        private void SaveSettings(string profile)
         {
-            if (!string.IsNullOrEmpty(_profile))
+            if (!string.IsNullOrEmpty(profile))
             {
                 _syncProfile = cmbSyncProfile.Text;
-                RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(AppRootKey + "\\" + _profile);
+                RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(AppRootKey + "\\" + profile);
                 regKeyAppRoot.SetValue("SyncOption", (int)_syncOption);
-                regKeyAppRoot.SetValue("SyncFolder", cmbFolders.SelectedValue.ToString());
  
                 if (!string.IsNullOrEmpty(UserName.Text))
                 {
@@ -258,7 +309,7 @@
 				bool userNameIsValid = Regex.IsMatch(UserName.Text, @"^(?'id'[a-z0-9\'\%\._\+\-]+)@(?'domain'[a-z0-9\'\%\._\+\-]+)\.(?'ext'[a-z]{2,6})$", RegexOptions.IgnoreCase);
 				bool passwordIsValid = Password.Text.Length != 0;
                 bool syncProfileIsValid = (cmbSyncProfile.SelectedIndex > 0 && cmbSyncProfile.SelectedIndex < cmbSyncProfile.Items.Count);
-                bool syncFolderIsValid = (cmbFolders.SelectedIndex > 0 && cmbFolders.SelectedIndex < cmbFolders.Items.Count);
+                bool syncFolderIsValid = (contactFoldersComboBox.SelectedIndex > 0 && contactFoldersComboBox.SelectedIndex < contactFoldersComboBox.Items.Count);
 
 				setBgColor(UserName, userNameIsValid);
 				setBgColor(Password, passwordIsValid);
@@ -359,8 +410,6 @@
 				if (!ValidCredentials)
 					return;
 
-				//Sync_ThreadStarter();
-
 				ThreadStart starter = new ThreadStart(Sync_ThreadStarter);
 				Thread thread = new Thread(starter);
 				thread.Start();
@@ -380,6 +429,25 @@
             try
             {
                 TimerSwitch(false);
+
+#if debug
+                //if the contacts or notes folder has changed ==> Reset matches (to not delete contacts or notes on the one or other side)                
+                RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(AppRootKey + "\\" + _syncProfile);
+                string syncContactsFolder = regKeyAppRoot.GetValue("SyncContactsFolder") as string;
+                string syncNotesFolder = regKeyAppRoot.GetValue("SyncNotesFolder") as string;
+
+                if (!string.IsNullOrEmpty(syncContactsFolder) && !syncContactsFolder.Equals(_syncContactsFolder) ||
+                    !string.IsNullOrEmpty(syncNotesFolder) && !syncNotesFolder.Equals(_syncNotesFolder))
+                {
+                    //ToDo: Maybe later differentiate, only reset notes if NotesFolder changed and reset contacts if ContactsFolder changed
+                    ResetMatches();
+                }
+                regKeyAppRoot.SetValue("SyncContactsFolder", _syncContactsFolder);
+                regKeyAppRoot.SetValue("SyncNotesFolder", _syncNotesFolder);
+
+#endif
+
+
                 SetLastSyncText("Syncing...");
                 notifyIcon.Text = Application.ProductName + "\nSyncing...";
                 SetFormEnabled(false);
@@ -397,7 +465,8 @@
                 //SetSyncConsoleText(Logger.GetText());
 #if debug
                 _sync.SyncProfile = _syncProfile;
-                _sync.SyncFolder  = _syncFolder;
+                _sync.SyncContactsFolder  = _syncContactsFolder;
+                _sync.SyncNotesFolder = _syncNotesFolder;
 #else
                 _sync.SyncProfile = tbSyncProfile.Text;
 #endif
@@ -849,53 +918,7 @@
 			Application.DoEvents();
 			try
 			{
-                TimerSwitch(false);
-                SetLastSyncText("Resetting matches...");
-                notifyIcon.Text = Application.ProductName + "\nResetting matches...";
-                SetFormEnabled(false);
-                this.hideButton.Enabled = false;
-
-				if (_sync == null)
-				{
-					_sync = new Syncronizer();
-				}
-
-                Logger.ClearLog();
-                SetSyncConsoleText("");
-                Logger.Log("Reset Matches started.", EventType.Information);
-
-                _sync.SyncNotes = btSyncNotes.Checked;
-                _sync.SyncContacts = btSyncContacts.Checked;
-
-				_sync.LoginToGoogle(UserName.Text, Password.Text);
-				_sync.LoginToOutlook();
-#if debug
-                _sync.SyncProfile = _syncProfile;
-                _sync.SyncFolder = _syncFolder;
-#else
-                _sync.SyncProfile = tbSyncProfile.Text;
-#endif
-
-                //Load matches, but match them by properties, not sync id
-
-                if (_sync.SyncContacts)
-                {
-                    _sync.LoadContacts();
-                    _sync.ResetContactMatches();
-                }
-
-                //TODO: Syncing notes is not completely working yet. Until it is working, this feature will not be switched on for users
-                if (_sync.SyncNotes)
-                {
-                    _sync.LoadNotes();
-                    _sync.ResetNoteMatches();
-                }
-
-
-
-                lastSync = DateTime.Now;
-                SetLastSyncText("Matches reset at " + lastSync.ToString());
-                Logger.Log("Matches reset.", EventType.Information);                
+                ResetMatches();                
 			}
 			catch (Exception ex)
             {
@@ -918,6 +941,58 @@
 			}
 		}
 
+        private void ResetMatches()
+        {
+            TimerSwitch(false);
+            SetLastSyncText("Resetting matches...");
+            notifyIcon.Text = Application.ProductName + "\nResetting matches...";
+            SetFormEnabled(false);
+            this.hideButton.Enabled = false;
+
+            if (_sync == null)
+            {
+                _sync = new Syncronizer();
+            }
+
+            Logger.ClearLog();
+            SetSyncConsoleText("");
+            Logger.Log("Reset Matches started.", EventType.Information);
+
+            _sync.SyncNotes = btSyncNotes.Checked;
+            _sync.SyncContacts = btSyncContacts.Checked;
+
+            _sync.LoginToGoogle(UserName.Text, Password.Text);
+            _sync.LoginToOutlook();
+#if debug
+            _sync.SyncProfile = _syncProfile;
+            _sync.SyncContactsFolder = _syncContactsFolder;
+            _sync.SyncNotesFolder = _syncNotesFolder;
+#else
+                _sync.SyncProfile = tbSyncProfile.Text;
+#endif
+
+            //Load matches, but match them by properties, not sync id
+
+            if (_sync.SyncContacts)
+            {
+                _sync.LoadContacts();
+                _sync.ResetContactMatches();
+            }
+
+
+            if (_sync.SyncNotes)
+            {
+                _sync.LoadNotes();
+                _sync.ResetNoteMatches();
+            }
+
+
+
+            lastSync = DateTime.Now;
+            SetLastSyncText("Matches reset at " + lastSync.ToString());
+            Logger.Log("Matches reset.", EventType.Information);
+        }
+
         private delegate void InvokeCallback(); 
 
         private void ShowForm()
@@ -969,7 +1044,7 @@
 				string.IsNullOrEmpty(Password.Text) ||
 #if debug
                 string.IsNullOrEmpty(cmbSyncProfile.Text) ||
-                string.IsNullOrEmpty(cmbFolders.Text) )
+                string.IsNullOrEmpty(contactFoldersComboBox.Text) )
 #else
 				string.IsNullOrEmpty(tbSyncProfile.Text))
 #endif
@@ -1074,6 +1149,9 @@
                 MessageBox.Show("Neither notes nor contacts are switched on for syncing. Please choose at least one option (automatically switched on notes for syncing now).", "No sync switched on");
                 btSyncNotes.Checked = true;
             }
+#if debug
+            contactFoldersComboBox.Visible = btSyncContacts.Checked;
+#endif
         }
 
         private void btSyncNotes_CheckedChanged(object sender, EventArgs e)
@@ -1083,19 +1161,24 @@
                 MessageBox.Show("Neither notes nor contacts are switched on for syncing. Please choose at least one option (automatically switched on contacts for syncing now).", "No sync switched on");
                 btSyncContacts.Checked = true;
             }
+#if debug
+            noteFoldersComboBox.Visible = btSyncNotes.Checked;
+#endif
         }
-    
-#if debug	
+    	
         private void cmbSyncProfile_SelectedIndexChanged(object sender, EventArgs e)
         {
-            
+#if debug   
             ComboBox comboBox = (ComboBox)sender;
 
             if ((0 == comboBox.SelectedIndex) || (comboBox.SelectedIndex == (comboBox.Items.Count - 1))) {
                 ConfigurationManagerForm _configs = new ConfigurationManagerForm();
 
                 if (0 == comboBox.SelectedIndex && _configs != null)
+                {
                     _syncProfile = _configs.AddProfile();
+                    ClearSettings();
+                }
                 
                 if (comboBox.SelectedIndex == (comboBox.Items.Count - 1) && _configs != null)
                     _configs.ShowDialog();
@@ -1103,29 +1186,35 @@
                 fillSyncProfileItems();
 
                 comboBox.Text = _syncProfile;
+                SaveSettings();
             }
             if (comboBox.SelectedIndex < 0)
                 MessageBox.Show("Please select Sync Profile.", "No sync switched on");
             else
             {
-                ClearSettings();
+                //ClearSettings();
                 LoadSettings(comboBox.Text);
                 _syncProfile = comboBox.Text;
             }
 
             ValidateSyncButton();
-
+#endif
         }
 
-
-#endif
-        private void cmbFolders_SelectedIndexChanged(object sender, EventArgs e)
+        private void contacFoldersComboBox_SelectedIndexChanged(object sender, EventArgs e)
         {
             if ((sender as ComboBox).SelectedIndex >= 0)
-                _syncFolder = (sender as ComboBox).SelectedValue.ToString();
+                _syncContactsFolder = (sender as ComboBox).SelectedValue.ToString();
             ValidateSyncButton();
         }
 
+        private void noteFoldersComboBox_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if ((sender as ComboBox).SelectedIndex >= 0)
+                _syncNotesFolder = (sender as ComboBox).SelectedValue.ToString();
+            ValidateSyncButton();
+        }        
+
 	}
 
 

Modified: trunk/GoogleContactsSync/Syncronizer.cs
===================================================================
--- trunk/GoogleContactsSync/Syncronizer.cs	2012-03-11 12:29:11 UTC (rev 238)
+++ trunk/GoogleContactsSync/Syncronizer.cs	2012-03-31 14:01:27 UTC (rev 239)
@@ -177,12 +177,18 @@
 			set { _syncProfile = value; }
 		}
 
-        private static string _syncFolder = "";
-        public string SyncFolder
+        private static string _syncFolderContacts = "";
+        public string SyncContactsFolder
         {
-            get { return _syncFolder; }
-            set { _syncFolder = value; }
+            get { return _syncFolderContacts; }
+            set { _syncFolderContacts = value; }
         }
+        private static string _syncFolderNotes = "";
+        public string SyncNotesFolder
+        {
+            get { return _syncFolderNotes; }
+            set { _syncFolderNotes = value; }
+        }
 
 		//private ConflictResolution? _conflictResolution;
 		//public ConflictResolution? CResolution
@@ -369,13 +375,13 @@
 
             //Just try to access the outlookNamespace to check, if it is still accessible, throws COMException, if not reachable           
 #if debug
-            if (_syncFolder.Length == 0)
+            if (_syncFolderContacts.Length == 0)
             {
                _outlookNamespace.GetDefaultFolder(Outlook.OlDefaultFolders.olFolderContacts);
             }
             else
             {
-                _outlookNamespace.GetFolderFromID(_syncFolder);
+                _outlookNamespace.GetFolderFromID(_syncFolderContacts);
             }
 #else
             _outlookNamespace.GetDefaultFolder(Outlook.OlDefaultFolders.olFolderContacts);
@@ -418,46 +424,59 @@
 		private void LoadOutlookContacts()
 		{
 			Logger.Log("Loading Outlook contacts...", EventType.Information);
-            _outlookContacts = GetOutlookItems(Outlook.OlDefaultFolders.olFolderContacts);			
+            _outlookContacts = GetOutlookItems(Outlook.OlDefaultFolders.olFolderContacts, _syncFolderContacts);			
 		}
 
         private void LoadOutlookNotes()
         {
             Logger.Log("Loading Outlook Notes...", EventType.Information);
-            _outlookNotes = GetOutlookItems(Outlook.OlDefaultFolders.olFolderNotes);
+            _outlookNotes = GetOutlookItems(Outlook.OlDefaultFolders.olFolderNotes, _syncFolderNotes);
         }
 
-        private Outlook.Items GetOutlookItems(Outlook.OlDefaultFolders outlookDefaultFolder)
+        private Outlook.Items GetOutlookItems(Outlook.OlDefaultFolders outlookDefaultFolder, string syncFolder)
         {
 #if debug
             Outlook.MAPIFolder mapiFolder = null;
-            if (_syncFolder.Length == 0)
+            if (string.IsNullOrEmpty(syncFolder))
             {
                 mapiFolder = OutlookNameSpace.GetDefaultFolder(outlookDefaultFolder);
+                if (mapiFolder == null)
+                    throw new Exception("Error getting Default OutlookFolder: " + outlookDefaultFolder);
             }
             else
-            {  
-                Outlook.MAPIFolder Folder = OutlookNameSpace.GetFolderFromID(_syncFolder);
-                if (Folder != null)
-                {
-                    for (int i = 1; i <= Folder.Folders.Count; i++)
-                    {
-                        Outlook.Folder subFolder = Folder.Folders[i] as Outlook.Folder;
-                        if ((Outlook.OlDefaultFolders.olFolderContacts == outlookDefaultFolder && Outlook.OlItemType.olContactItem == subFolder.DefaultItemType) ||
-                                 (Outlook.OlDefaultFolders.olFolderNotes == outlookDefaultFolder && Outlook.OlItemType.olNoteItem == subFolder.DefaultItemType) 
-                                )
-                        {
-                            mapiFolder = subFolder as Outlook.MAPIFolder;
-                        }
-                    }
-                }
+            {
+                mapiFolder = OutlookNameSpace.GetFolderFromID(syncFolder);
+                if (mapiFolder == null)
+                    throw new Exception("Error getting OutlookFolder: " + syncFolder);
+                
+                //Outlook.MAPIFolder Folder = OutlookNameSpace.GetFolderFromID(_syncFolder);
+                //if (Folder != null)
+                //{
+                //    for (int i = 1; i <= Folder.Folders.Count; i++)
+                //    {
+                //        Outlook.Folder subFolder = Folder.Folders[i] as Outlook.Folder;
+                //        if ((Outlook.OlDefaultFolders.olFolderContacts == outlookDefaultFolder && Outlook.OlItemType.olContactItem == subFolder.DefaultItemType) ||
+                //                 (Outlook.OlDefaultFolders.olFolderNotes == outlookDefaultFolder && Outlook.OlItemType.olNoteItem == subFolder.DefaultItemType) 
+                //                )
+                //        {
+                //            mapiFolder = subFolder as Outlook.MAPIFolder;
+                //        }
+                //    }
+                //}
             }
 #else
             Outlook.MAPIFolder mapiFolder = OutlookNameSpace.GetDefaultFolder(outlookDefaultFolder);
+            if (mapiFolder == null)
+                throw new Exception("Error getting Default OutlookFolder: " + outlookDefaultFolder);
 #endif
+
             try
             {
-                return ((null==mapiFolder)?null:mapiFolder.Items);
+                Outlook.Items items = mapiFolder.Items;
+                if (items == null)
+                    throw new Exception("Error getting Outlook items from OutlookFolder: " + mapiFolder.Name);
+                else
+                    return items;
             }
             finally
             {

Modified: trunk/GoogleContactsSync/Utilities.cs
===================================================================
--- trunk/GoogleContactsSync/Utilities.cs	2012-03-11 12:29:11 UTC (rev 238)
+++ trunk/GoogleContactsSync/Utilities.cs	2012-03-31 14:01:27 UTC (rev 239)
@@ -349,12 +349,15 @@
     {
         private string _folderName;
         private string _folderID;
+        private bool _isDefaultFolder;
 
-        public OutlookFolder(string folderName, string folderID)
+
+        public OutlookFolder(string folderName, string folderID, bool isDefaultFolder)
         {
 
             this._folderName = folderName;
             this._folderID   = folderID;
+            this._isDefaultFolder = isDefaultFolder;
         }
 
         public string FolderName
@@ -374,6 +377,23 @@
             }
         }
 
+        public bool IsDefaultFolder
+        {
+
+            get
+            {
+                return _isDefaultFolder;
+            }
+        }
+
+        public string DisplayName
+        {
+            get
+            {
+                return _folderName + (_isDefaultFolder?" (Default)":String.Empty);
+            }
+        }
+
         public int CompareTo(object obj)
         {
             if (obj is OutlookFolder)

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

Revision: 240
          http://googlesyncmod.svn.sourceforge.net/googlesyncmod/?rev=240&view=rev
Author:   floriwan
Date:     2012-03-31 20:51:51 +0000 (Sat, 31 Mar 2012)
Log Message:
-----------
Improvement: Added ConflictResolutions to perform selected actions for all following itmes
FIX: Moved the debug parts for OutlookFolder Selection and Profile Selection to release part

Modified Paths:
--------------
    trunk/GoogleContactsSync/ConflictResolver.cs
    trunk/GoogleContactsSync/ConflictResolverForm.Designer.cs
    trunk/GoogleContactsSync/ConflictResolverForm.cs
    trunk/GoogleContactsSync/ContactsMatcher.cs
    trunk/GoogleContactsSync/IConflictResolver.cs
    trunk/GoogleContactsSync/NotesMatcher.cs
    trunk/GoogleContactsSync/SettingsForm.cs
    trunk/GoogleContactsSync/Syncronizer.cs

Modified: trunk/GoogleContactsSync/ConflictResolver.cs
===================================================================
--- trunk/GoogleContactsSync/ConflictResolver.cs	2012-03-31 14:01:27 UTC (rev 239)
+++ trunk/GoogleContactsSync/ConflictResolver.cs	2012-03-31 20:51:51 UTC (rev 240)
@@ -3,6 +3,8 @@
 using System.Text;
 using Google.Contacts;
 using Google.Documents;
+using System.Reflection;
+using Google.GData.Extensions;
 
 namespace GoContactSyncMod
 {
@@ -36,7 +38,77 @@
             _form.messageLabel.Text =
                 "Both the outlook contact and the google contact \"" + name +
                 "\" have been changed. Choose which you would like to keep.";
+            
+            _form.OutlookItemTextBox.Text = "Name: " + outlookContact.FileAs + "\r\n";
+            if (!string.IsNullOrEmpty(outlookContact.Email1Address))
+                _form.OutlookItemTextBox.Text += "Email1: " + outlookContact.Email1Address + "\r\n";
+            if (!string.IsNullOrEmpty(outlookContact.Email2Address))
+                _form.OutlookItemTextBox.Text += "Email2: " + outlookContact.Email2Address + "\r\n";
+            if (!string.IsNullOrEmpty(outlookContact.Email3Address))
+                _form.OutlookItemTextBox.Text += "Email3: " + outlookContact.Email3Address + "\r\n";
+            if (!string.IsNullOrEmpty(outlookContact.MobileTelephoneNumber))
+                _form.OutlookItemTextBox.Text += "MobilePhone: " + outlookContact.MobileTelephoneNumber + "\r\n";
+            if (!string.IsNullOrEmpty(outlookContact.HomeTelephoneNumber))
+                _form.OutlookItemTextBox.Text += "HomePhone: " + outlookContact.HomeTelephoneNumber + "\r\n";
+            if (!string.IsNullOrEmpty(outlookContact.Home2TelephoneNumber))
+                _form.OutlookItemTextBox.Text += "HomePhone2: " + outlookContact.HomeTelephoneNumber + "\r\n";
+            if (!string.IsNullOrEmpty(outlookContact.BusinessTelephoneNumber))
+               _form.OutlookItemTextBox.Text += "BusinessPhone: " + outlookContact.BusinessTelephoneNumber + "\r\n";
+            if (!string.IsNullOrEmpty(outlookContact.Business2TelephoneNumber))
+               _form.OutlookItemTextBox.Text += "BusinessPhone2: " + outlookContact.BusinessTelephoneNumber + "\r\n";
+            if (!string.IsNullOrEmpty(outlookContact.OtherTelephoneNumber))                
+                _form.OutlookItemTextBox.Text += "OtherPhone: " + outlookContact.OtherTelephoneNumber + "\r\n";
+            if (!string.IsNullOrEmpty(outlookContact.HomeAddress))
+                _form.OutlookItemTextBox.Text += "HomeAddress: " + outlookContact.HomeAddress + "\r\n";
+            if (!string.IsNullOrEmpty(outlookContact.BusinessAddress))
+                _form.OutlookItemTextBox.Text += "BusinessAddress: " + outlookContact.BusinessAddress + "\r\n";
+            if (!string.IsNullOrEmpty(outlookContact.OtherAddress))
+                _form.OutlookItemTextBox.Text += "OtherAddress: " + outlookContact.OtherAddress + "\r\n";
 
+            _form.GoogleItemTextBox.Text = "Name: " + googleContact.Name.FullName + "\r\n";
+            for (int i = 0; i < googleContact.Emails.Count; i++)
+            {
+                string email = googleContact.Emails[i].Address;
+                if (!string.IsNullOrEmpty(email))
+                {
+                    _form.GoogleItemTextBox.Text += "Email" + (i+1) + ": " + email + "\r\n";
+                }
+            }
+            foreach (PhoneNumber phone in googleContact.Phonenumbers)
+            {
+                if (!string.IsNullOrEmpty(phone.Value))
+                {
+                    if (phone.Rel == ContactsRelationships.IsMobile)
+                        _form.GoogleItemTextBox.Text += "MobilePhone: ";
+                    if (phone.Rel == ContactsRelationships.IsHome)
+                        _form.GoogleItemTextBox.Text += "HomePhone: ";
+                    if (phone.Rel == ContactsRelationships.IsWork)
+                        _form.GoogleItemTextBox.Text += "BusinessPhone: ";
+                    if (phone.Rel == ContactsRelationships.IsOther)
+                        _form.GoogleItemTextBox.Text += "OtherPhone: ";
+
+                    _form.GoogleItemTextBox.Text += phone.Value + "\r\n";
+                }
+
+                
+            }
+
+            foreach (StructuredPostalAddress address in googleContact.PostalAddresses)
+            {
+                if (!string.IsNullOrEmpty(address.FormattedAddress))
+                {
+                    if (address.Rel == ContactsRelationships.IsHome)
+                        _form.GoogleItemTextBox.Text += "HomeAddress: ";
+                    if (address.Rel == ContactsRelationships.IsWork)
+                        _form.GoogleItemTextBox.Text += "BusinessAddress: ";
+                    if (address.Rel == ContactsRelationships.IsOther)
+                        _form.GoogleItemTextBox.Text += "OtherAddress: ";   
+
+                     _form.GoogleItemTextBox.Text += address.FormattedAddress + "\r\n";
+                }
+            }
+                      
+
             switch (_form.ShowDialog())
             {
                 case System.Windows.Forms.DialogResult.Ignore:
@@ -47,15 +119,38 @@
                     return ConflictResolution.Cancel;
                 case System.Windows.Forms.DialogResult.No:
                     // google wins
-                    return ConflictResolution.GoogleWins;
+                    return _form.AllCheckBox.Checked?ConflictResolution.GoogleWinsAlways:ConflictResolution.GoogleWins;
                 case System.Windows.Forms.DialogResult.Yes:
                     // outlook wins
-                    return ConflictResolution.OutlookWins;
+                    return _form.AllCheckBox.Checked?ConflictResolution.OutlookWinsAlways:ConflictResolution.OutlookWins;
                 default:
                     throw new Exception();
             }
         }
 
+        //private string GetPropertyInfos(object myObject)
+        //{
+        //    // get all public static properties of OutlookItem
+        //    PropertyInfo[] propertyInfos;
+        //    propertyInfos = myObject.GetType().GetProperties();
+        //    // sort properties by name
+        //    Array.Sort(propertyInfos,
+        //            delegate(PropertyInfo propertyInfo1, PropertyInfo propertyInfo2)
+        //            { return propertyInfo1.Name.CompareTo(propertyInfo2.Name); });
+
+        //    string ret = String.Empty;
+        //    // write property names
+        //    foreach (PropertyInfo propertyInfo in propertyInfos)
+        //    {
+        //        object value = propertyInfo.GetValue(myObject, null);
+
+        //        if (value != null && !(value is string))
+        //            ret += propertyInfo.Name + ": " + value + "\r\n";
+        //    }
+
+        //    return ret;
+        //}
+
         public ConflictResolution Resolve(Microsoft.Office.Interop.Outlook.NoteItem outlookNote, Document googleNote)
         {
             string name = googleNote.Title;

Modified: trunk/GoogleContactsSync/ConflictResolverForm.Designer.cs
===================================================================
--- trunk/GoogleContactsSync/ConflictResolverForm.Designer.cs	2012-03-31 14:01:27 UTC (rev 239)
+++ trunk/GoogleContactsSync/ConflictResolverForm.Designer.cs	2012-03-31 20:51:51 UTC (rev 240)
@@ -33,6 +33,15 @@
             this.keepGoogle = new System.Windows.Forms.Button();
             this.cancel = new System.Windows.Forms.Button();
             this.button1 = new System.Windows.Forms.Button();
+            this.OutlookItemTextBox = new System.Windows.Forms.TextBox();
+            this.SplitContainer = new System.Windows.Forms.SplitContainer();
+            this.OutlookItemLabel = new System.Windows.Forms.Label();
+            this.GoogleItemTextBox = new System.Windows.Forms.TextBox();
+            this.GoogleItemLabel = new System.Windows.Forms.Label();
+            this.AllCheckBox = new System.Windows.Forms.CheckBox();
+            this.SplitContainer.Panel1.SuspendLayout();
+            this.SplitContainer.Panel2.SuspendLayout();
+            this.SplitContainer.SuspendLayout();
             this.SuspendLayout();
             // 
             // messageLabel
@@ -45,8 +54,9 @@
             // 
             // keepOutlook
             // 
+            this.keepOutlook.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.keepOutlook.DialogResult = System.Windows.Forms.DialogResult.Yes;
-            this.keepOutlook.Location = new System.Drawing.Point(12, 74);
+            this.keepOutlook.Location = new System.Drawing.Point(12, 320);
             this.keepOutlook.Name = "keepOutlook";
             this.keepOutlook.Size = new System.Drawing.Size(120, 23);
             this.keepOutlook.TabIndex = 1;
@@ -55,8 +65,9 @@
             // 
             // keepGoogle
             // 
+            this.keepGoogle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.keepGoogle.DialogResult = System.Windows.Forms.DialogResult.No;
-            this.keepGoogle.Location = new System.Drawing.Point(138, 74);
+            this.keepGoogle.Location = new System.Drawing.Point(138, 320);
             this.keepGoogle.Name = "keepGoogle";
             this.keepGoogle.Size = new System.Drawing.Size(125, 23);
             this.keepGoogle.TabIndex = 2;
@@ -65,8 +76,9 @@
             // 
             // cancel
             // 
+            this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancel.Location = new System.Drawing.Point(354, 74);
+            this.cancel.Location = new System.Drawing.Point(350, 320);
             this.cancel.Name = "cancel";
             this.cancel.Size = new System.Drawing.Size(75, 23);
             this.cancel.TabIndex = 3;
@@ -75,34 +87,115 @@
             // 
             // button1
             // 
+            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.button1.DialogResult = System.Windows.Forms.DialogResult.Ignore;
-            this.button1.Location = new System.Drawing.Point(273, 74);
+            this.button1.Location = new System.Drawing.Point(269, 320);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(75, 23);
             this.button1.TabIndex = 3;
             this.button1.Text = "&Skip";
             this.button1.UseVisualStyleBackColor = true;
             // 
+            // OutlookItemTextBox
+            // 
+            this.OutlookItemTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.OutlookItemTextBox.Location = new System.Drawing.Point(0, 13);
+            this.OutlookItemTextBox.Multiline = true;
+            this.OutlookItemTextBox.Name = "OutlookItemTextBox";
+            this.OutlookItemTextBox.ReadOnly = true;
+            this.OutlookItemTextBox.Size = new System.Drawing.Size(206, 204);
+            this.OutlookItemTextBox.TabIndex = 4;
+            // 
+            // SplitContainer
+            // 
+            this.SplitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.SplitContainer.Location = new System.Drawing.Point(15, 74);
+            this.SplitContainer.Name = "SplitContainer";
+            // 
+            // SplitContainer.Panel1
+            // 
+            this.SplitContainer.Panel1.Controls.Add(this.OutlookItemTextBox);
+            this.SplitContainer.Panel1.Controls.Add(this.OutlookItemLabel);
+            // 
+            // SplitContainer.Panel2
+            // 
+            this.SplitContainer.Panel2.Controls.Add(this.GoogleItemTextBox);
+            this.SplitContainer.Panel2.Controls.Add(this.GoogleItemLabel);
+            this.SplitContainer.Size = new System.Drawing.Size(410, 217);
+            this.SplitContainer.SplitterDistance = 206;
+            this.SplitContainer.TabIndex = 5;
+            // 
+            // OutlookItemLabel
+            // 
+            this.OutlookItemLabel.AutoSize = true;
+            this.OutlookItemLabel.Dock = System.Windows.Forms.DockStyle.Top;
+            this.OutlookItemLabel.Location = new System.Drawing.Point(0, 0);
+            this.OutlookItemLabel.Name = "OutlookItemLabel";
+            this.OutlookItemLabel.Size = new System.Drawing.Size(51, 13);
+            this.OutlookItemLabel.TabIndex = 6;
+            this.OutlookItemLabel.Text = "Outlook";
+            // 
+            // GoogleItemTextBox
+            // 
+            this.GoogleItemTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.GoogleItemTextBox.Location = new System.Drawing.Point(0, 13);
+            this.GoogleItemTextBox.Multiline = true;
+            this.GoogleItemTextBox.Name = "GoogleItemTextBox";
+            this.GoogleItemTextBox.ReadOnly = true;
+            this.GoogleItemTextBox.Size = new System.Drawing.Size(200, 204);
+            this.GoogleItemTextBox.TabIndex = 5;
+            // 
+            // GoogleItemLabel
+            // 
+            this.GoogleItemLabel.AutoSize = true;
+            this.GoogleItemLabel.Dock = System.Windows.Forms.DockStyle.Top;
+            this.GoogleItemLabel.Location = new System.Drawing.Point(0, 0);
+            this.GoogleItemLabel.Name = "GoogleItemLabel";
+            this.GoogleItemLabel.Size = new System.Drawing.Size(47, 13);
+            this.GoogleItemLabel.TabIndex = 7;
+            this.GoogleItemLabel.Text = "Google";
+            // 
+            // AllCheckBox
+            // 
+            this.AllCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.AllCheckBox.AutoSize = true;
+            this.AllCheckBox.Location = new System.Drawing.Point(15, 297);
+            this.AllCheckBox.Name = "AllCheckBox";
+            this.AllCheckBox.Size = new System.Drawing.Size(150, 17);
+            this.AllCheckBox.TabIndex = 6;
+            this.AllCheckBox.Text = "For all following items";
+            this.AllCheckBox.UseVisualStyleBackColor = true;
+            // 
             // ConflictResolverForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.cancel;
-            this.ClientSize = new System.Drawing.Size(434, 109);
+            this.ClientSize = new System.Drawing.Size(434, 355);
+            this.Controls.Add(this.AllCheckBox);
+            this.Controls.Add(this.SplitContainer);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.cancel);
             this.Controls.Add(this.keepGoogle);
             this.Controls.Add(this.keepOutlook);
             this.Controls.Add(this.messageLabel);
             this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "ConflictResolverForm";
             this.ShowIcon = false;
             this.ShowInTaskbar = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "Confict detected!";
+            this.SplitContainer.Panel1.ResumeLayout(false);
+            this.SplitContainer.Panel1.PerformLayout();
+            this.SplitContainer.Panel2.ResumeLayout(false);
+            this.SplitContainer.Panel2.PerformLayout();
+            this.SplitContainer.ResumeLayout(false);
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
@@ -113,5 +206,11 @@
         private System.Windows.Forms.Button cancel;
         public System.Windows.Forms.Label messageLabel;
         private System.Windows.Forms.Button button1;
+        public System.Windows.Forms.TextBox OutlookItemTextBox;
+        private System.Windows.Forms.SplitContainer SplitContainer;
+        private System.Windows.Forms.Label OutlookItemLabel;
+        public System.Windows.Forms.TextBox GoogleItemTextBox;
+        private System.Windows.Forms.Label GoogleItemLabel;
+        public System.Windows.Forms.CheckBox AllCheckBox;
     }
 }
\ No newline at end of file

Modified: trunk/GoogleContactsSync/ConflictResolverForm.cs
===================================================================
--- trunk/GoogleContactsSync/ConflictResolverForm.cs	2012-03-31 14:01:27 UTC (rev 239)
+++ trunk/GoogleContactsSync/ConflictResolverForm.cs	2012-03-31 20:51:51 UTC (rev 240)
@@ -14,6 +14,6 @@
         public ConflictResolverForm()
         {
             InitializeComponent();
-        }
+        }       
     }
 }
\ No newline at end of file

Modified: trunk/GoogleContactsSync/ContactsMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/ContactsMatcher.cs	2012-03-31 14:01:27 UTC (rev 239)
+++ trunk/GoogleContactsSync/ContactsMatcher.cs	2012-03-31 20:51:51 UTC (rev 240)
@@ -658,18 +658,24 @@
                                     break;
                                 case SyncOption.MergePrompt:
                                     //promp for sync option
-                                    ConflictResolver r = new ConflictResolver();
-                                    ConflictResolution res = r.Resolve(outlookContactItem, match.GoogleContact);
-                                    switch (res)
+                                    if (sync.ConflictResolution != ConflictResolution.GoogleWinsAlways &&
+                                        sync.ConflictResolution != ConflictResolution.OutlookWinsAlways)
                                     {
+                                        ConflictResolver r = new ConflictResolver();
+                                        sync.ConflictResolution = r.Resolve(outlookContactItem, match.GoogleContact);
+                                    }
+                                    switch (sync.ConflictResolution)
+                                    {
                                         case ConflictResolution.Skip:
                                             break;
                                         case ConflictResolution.Cancel:
-                                            throw new ApplicationException("Canceled");
+                                            throw new ApplicationException("Cancelled");
                                         case ConflictResolution.OutlookWins:
+                                        case ConflictResolution.OutlookWinsAlways:
                                             sync.UpdateContact(outlookContactItem, match.GoogleContact);
                                             break;
                                         case ConflictResolution.GoogleWins:
+                                        case ConflictResolution.GoogleWinsAlways:
                                             sync.UpdateContact(match.GoogleContact, outlookContactItem);
                                             break;
                                         default:
@@ -737,18 +743,24 @@
                                 break;
                             case SyncOption.MergePrompt:
                                 //promp for sync option
-                                ConflictResolver r = new ConflictResolver();
-                                ConflictResolution res = r.Resolve(outlookContactItem, match.GoogleContact);
-                                switch (res)
+                                if (sync.ConflictResolution != ConflictResolution.GoogleWinsAlways &&
+                                    sync.ConflictResolution != ConflictResolution.OutlookWinsAlways)
                                 {
+                                    ConflictResolver r = new ConflictResolver();
+                                    sync.ConflictResolution = r.Resolve(outlookContactItem, match.GoogleContact);
+                                }
+                                switch (sync.ConflictResolution)
+                                {
                                     case ConflictResolution.Skip:
                                         break;
                                     case ConflictResolution.Cancel:
-                                        throw new ApplicationException("Canceled");
+                                        throw new ApplicationException("Cancelled");
                                     case ConflictResolution.OutlookWins:
+                                    case ConflictResolution.OutlookWinsAlways:
                                         sync.UpdateContact(outlookContactItem, match.GoogleContact);
                                         break;
                                     case ConflictResolution.GoogleWins:
+                                    case ConflictResolution.GoogleWinsAlways:
                                         sync.UpdateContact(match.GoogleContact, outlookContactItem);
                                         break;
                                     default:

Modified: trunk/GoogleContactsSync/IConflictResolver.cs
===================================================================
--- trunk/GoogleContactsSync/IConflictResolver.cs	2012-03-31 14:01:27 UTC (rev 239)
+++ trunk/GoogleContactsSync/IConflictResolver.cs	2012-03-31 20:51:51 UTC (rev 240)
@@ -26,5 +26,7 @@
         Cancel,
         OutlookWins,
         GoogleWins,
+        OutlookWinsAlways,
+        GoogleWinsAlways
     }
 }

Modified: trunk/GoogleContactsSync/NotesMatcher.cs
===================================================================
--- trunk/GoogleContactsSync/NotesMatcher.cs	2012-03-31 14:01:27 UTC (rev 239)
+++ trunk/GoogleContactsSync/NotesMatcher.cs	2012-03-31 20:51:51 UTC (rev 240)
@@ -537,18 +537,24 @@
                                     break;
                                 case SyncOption.MergePrompt:
                                     //promp for sync option
-                                    ConflictResolver r = new ConflictResolver();
-                                    ConflictResolution res = r.Resolve(outlookNoteItem, match.GoogleNote);
-                                    switch (res)
+                                    if (sync.ConflictResolution != ConflictResolution.GoogleWinsAlways &&
+                                        sync.ConflictResolution != ConflictResolution.OutlookWinsAlways)
                                     {
+                                        ConflictResolver r = new ConflictResolver();
+                                        sync.ConflictResolution = r.Resolve(outlookNoteItem, match.GoogleNote);
+                                    }
+                                    switch (sync.ConflictResolution)
+                                    {
                                         case ConflictResolution.Skip:
                                             break;
                                         case ConflictResolution.Cancel:
                                             throw new ApplicationException("Canceled");
                                         case ConflictResolution.OutlookWins:
+                                        case ConflictResolution.OutlookWinsAlways:
                                             sync.UpdateNote(outlookNoteItem, match.GoogleNote);
                                             break;
                                         case ConflictResolution.GoogleWins:
+                                        case ConflictResolution.GoogleWinsAlways:
                                             sync.UpdateNote(match.GoogleNote, outlookNoteItem);
                                             break;
                                         default:
@@ -616,18 +622,24 @@
                                 break;
                             case SyncOption.MergePrompt:
                                 //promp for sync option
-                                ConflictResolver r = new ConflictResolver();
-                                ConflictResolution res = r.Resolve(outlookNoteItem, match.GoogleNote);
-                                switch (res)
+                                if (sync.ConflictResolution != ConflictResolution.GoogleWinsAlways &&
+                                    sync.ConflictResolution != ConflictResolution.OutlookWinsAlways)
                                 {
+                                    ConflictResolver r = new ConflictResolver();
+                                    sync.ConflictResolution = r.Resolve(outlookNoteItem, match.GoogleNote);
+                                }
+                                switch (sync.ConflictResolution)
+                                {
                                     case ConflictResolution.Skip:
                                         break;
                                     case ConflictResolution.Cancel:
                                         throw new ApplicationException("Canceled");
                                     case ConflictResolution.OutlookWins:
+                                    case ConflictResolution.OutlookWinsAlways:
                                         sync.UpdateNote(outlookNoteItem, match.GoogleNote);
                                         break;
                                     case ConflictResolution.GoogleWins:
+                                    case ConflictResolution.GoogleWinsAlways:
                                         sync.UpdateNote(match.GoogleNote, outlookNoteItem);
                                         break;
                                     default:

Modified: trunk/GoogleContactsSync/SettingsForm.cs
===================================================================
--- trunk/GoogleContactsSync/SettingsForm.cs	2012-03-31 14:01:27 UTC (rev 239)
+++ trunk/GoogleContactsSync/SettingsForm.cs	2012-03-31 20:51:51 UTC (rev 240)
@@ -61,14 +61,12 @@
 			PopulateSyncOptionBox();
 
             fillSyncFolderItems();
-#if debug
+
             if (fillSyncProfileItems()) 
                 LoadSettings(cmbSyncProfile.Text);
             else 
                 LoadSettings(null);
-#else
-            LoadSettings();
-#endif
+
             TimerSwitch(true);
 			lastSyncLabel.Text = "Not synced";
 
@@ -119,7 +117,6 @@
 		}
         private void fillSyncFolderItems()
         {
-#if debug
             this.contactFoldersComboBox.Visible = true;
             this.noteFoldersComboBox.Visible = true;
             this.cmbSyncProfile.Visible = true;
@@ -185,11 +182,6 @@
             {
                 Logger.Log("Error getting available Outlook folders: " + e.Message, EventType.Warning);
             }
-#else
-                contactFoldersComboBox.Visible = false;
-                noteFoldersComboBox.Visible = false;
-                cmbSyncProfile.Visible = false;
-#endif
         }
 
         private void ClearSettings()
@@ -227,7 +219,6 @@
 
             return vReturn;
         }
-#if debug
                 
 
         private void LoadSettings(string _profile)
@@ -266,6 +257,8 @@
                 noteFoldersComboBox.SelectedValue = regKeyAppRoot.GetValue("SyncNotesFolder") as string;
 
             autoSyncCheckBox_CheckedChanged(null, null);
+            btSyncContacts_CheckedChanged(null, null);
+            btSyncNotes_CheckedChanged(null, null);
 
             _proxy.LoadSettings(_profile);
         }
@@ -316,81 +309,7 @@
                 return userNameIsValid && passwordIsValid && syncProfileIsValid && syncFolderIsValid;
 			}
 		}
-#else
-        private void LoadSettings()
-		{
-			// default
-			SetSyncOption(0);
 
-			// load
-			RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(@"Software\Webgear\GOContactSync");
-			if (regKeyAppRoot.GetValue("SyncOption") != null)
-			{
-				_syncOption = (SyncOption)regKeyAppRoot.GetValue("SyncOption");
-				SetSyncOption((int)_syncOption);
-			}
-			if (regKeyAppRoot.GetValue("SyncProfile") != null)
-				tbSyncProfile.Text = (string)regKeyAppRoot.GetValue("SyncProfile");
-			if (regKeyAppRoot.GetValue("Username") != null)
-			{
-				UserName.Text = regKeyAppRoot.GetValue("Username") as string;
-				if (regKeyAppRoot.GetValue("Password") != null)
-					Password.Text = Encryption.DecryptPassword(UserName.Text, regKeyAppRoot.GetValue("Password") as string);
-			}
-			if (regKeyAppRoot.GetValue("AutoSync") != null)
-				autoSyncCheckBox.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("AutoSync"));
-			if (regKeyAppRoot.GetValue("AutoSyncInterval") != null)
-				autoSyncInterval.Value = Convert.ToDecimal(regKeyAppRoot.GetValue("AutoSyncInterval"));
-			if (regKeyAppRoot.GetValue("AutoStart") != null)
-				runAtStartupCheckBox.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("AutoStart"));
-			if (regKeyAppRoot.GetValue("ReportSyncResult") != null)
-				reportSyncResultCheckBox.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("ReportSyncResult"));
-			if (regKeyAppRoot.GetValue("SyncDeletion") != null)
-				btSyncDelete.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("SyncDeletion"));
-            if (regKeyAppRoot.GetValue("SyncNotes") != null)
-                btSyncNotes.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("SyncNotes"));
-            if (regKeyAppRoot.GetValue("SyncContacts") != null)
-                btSyncContacts.Checked = Convert.ToBoolean(regKeyAppRoot.GetValue("SyncContacts"));
-
-			autoSyncCheckBox_CheckedChanged(null, null);
-		}
-		private void SaveSettings()
-		{
-			RegistryKey regKeyAppRoot = Registry.CurrentUser.CreateSubKey(@"Software\Webgear\GOContactSync");
-			regKeyAppRoot.SetValue("SyncOption", (int)_syncOption);
-			if (!string.IsNullOrEmpty(tbSyncProfile.Text))
-				regKeyAppRoot.SetValue("SyncProfile", tbSyncProfile.Text);
-			if (!string.IsNullOrEmpty(UserName.Text))
-			{
-				regKeyAppRoot.SetValue("Username", UserName.Text);
-				if (!string.IsNullOrEmpty(Password.Text))
-					regKeyAppRoot.SetValue("Password", Encryption.EncryptPassword(UserName.Text, Password.Text));
-			}
-			regKeyAppRoot.SetValue("