allow user to change key password

the key password

.gitattributes

@@ -1,4 +0,0 @@
-.tag                    export-subst
-.gitignore              export-ignore
-.gitattributes          export-ignore
-.commit-template        export-ignore

.gitignore

@@ -1,7 +1,4 @@
-*build*/
+build
 *flymake*
-CMakeLists.txt.user*
-*.patch
-*~
-*.autosave
-doc/_build/*
+CMakeLists.txt.user
+qtcreator-build/*

.tag

@@ -1 +0,0 @@
-$Format:%H$

CMakeLists.txt

@@ -4,35 +4,13 @@ project(mirall)
 set(PACKAGE "mirall")
 set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 
-if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
-     include ( ${OEM_THEME_DIR}/OEM.cmake )
-else ()
-     include ( ${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake )
-endif()
-
 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
 configure_file( ${CMAKE_SOURCE_DIR}/src/mirall/version.h.in "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/version.h" )
 include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")
 
 include(GNUInstallDirs)
-
-include(GetGitRevisionDescription)
-get_git_head_revision(GIT_REFSPEC GIT_SHA1)
-
-# if we cannot get it from git, directly try .tag (packages)
-# this will work if the tar balls have been properly created
-# via git-archive.
-if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
-    file(READ ${CMAKE_SOURCE_DIR}/.tag sha1_candidate)
-    string(REPLACE "\n" "" sha1_candidate ${sha1_candidate})
-    if (NOT ${sha1_candidate} STREQUAL "$Format:%H$")
-        message("${sha1_candidate}")
-        set (GIT_SHA1 "${sha1_candidate}")
-    endif()
-endif()
-
 ## stupid, we should upstream this
-if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" AND NOT CMAKE_INSTALL_SYSCONFDIR)
+if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
     set(CMAKE_INSTALL_SYSCONFDIR "/etc")
 endif()
 
@@ -41,7 +19,7 @@ endif()
 # BUILD_OWNCLOUD_OSX_BUNDLE was not initialized OR set to true on OSX
 if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE))
     set(BUILD_OWNCLOUD_OSX_BUNDLE ON)
-    set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app")
+    set(OWNCLOUD_OSX_BUNDLE "owncloud.app")
 
 # BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX
 elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)
@@ -53,24 +31,25 @@ else()
 endif()
 #####
 
-#### find libs
 find_package(Qt4 4.6.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest REQUIRED )
 find_package(Csync)
-if(UNIX)
-find_package(INotify REQUIRED)
-else()
 find_package(INotify)
-endif()
-find_package(Sphinx)
-find_package(PdfLatex)
-find_package(QtKeychain)
 
 set(WITH_CSYNC CSYNC_FOUND)
-set(WITH_QTKEYCHAIN ${QTKEYCHAIN_FOUND})
 set(USE_INOTIFY ${INOTIFY_FOUND})
 
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
+
+macro(add_tests)
+foreach( loop_var ${ARGV} )
+  qt4_automoc(test${loop_var}.cpp)
+  add_executable(test${loop_var} test${loop_var}.cpp)
+  target_link_libraries(test${loop_var} ${QT_LIBRARIES} mirall_static)
+  add_test(test${loop_var} ${CMAKE_CURRENT_BINARY_DIR}/test${loop_var} --catch_system_errors=no)
+endforeach( loop_var )
+endmacro(add_tests)
+
 set(CPACK_SOURCE_IGNORE_FILES
   # hidden files
   "/\\\\..+$"
@@ -92,6 +71,9 @@ set(CPACK_SOURCE_IGNORE_FILES
 
 include(OwnCloudCPack.cmake)
 
+include(CTest)
+enable_testing()
+
 #
 # This cmake builds two targets (aka apps), mirall and owncloud. For the owncloud
 # target, OWNCLOUD_CLIENT needs to be a compile flag. It is set in src/CMakeLists.txt
@@ -106,16 +88,13 @@ file( GLOB TRANS_FILES ${CMAKE_SOURCE_DIR}/translations/mirall_*.ts)
 set(TRANSLATIONS ${TRANS_FILES})
 
 add_subdirectory(src)
-add_subdirectory(doc)
-
 if(UNIT_TESTING)
-    include(CTest)
-    enable_testing()
     add_subdirectory(test)
 endif(UNIT_TESTING)
 
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
-    configure_file(sync-exclude.lst ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
+    install( FILES exclude.lst DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources )
 else()
-    install( FILES sync-exclude.lst DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} )
+    install( FILES exclude.lst DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} )
 endif()
+

CONTRIBUTING.md

@@ -1,48 +0,0 @@
-## Submitting Desktop Client issues
-
-If you have questions about how to use the ownCloud Desktop Client, please
-direct these to the [mailing list][mailinglist] or our [forum][forum].
-We are also available on [IRC][irc].
-
-### Guidelines
-* Report the issue using our [template][template], it includes all the
-  informations we need to track down the issue.  
-* This repository is *only* for issues within the ownCloud desktop client. 
-  Issues in other compontents should be reported in their own repositores: 
-  - [ownCloud server](https://github.com/owncloud/core/issues)
-  - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar,
-    Contacts...)
-  - [Android client](https://github.com/owncloud/android/issues)
-  - [iOS client](https://github.com/owncloud/ios-issues/issues)
-* Search the existing issues first, it's likely that your issue was already
-  reported.
-
-If your issue appears to be a bug, and hasn't been reported, open a new issue.
-
-Help us to maximize the effort we can spend fixing issues and adding new
-features, by not reporting duplicate issues.
-
-[template]: https://raw.github.com/owncloud/mirall/master/issue_template.md
-[mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud
-[forum]: http://forum.owncloud.org/
-[irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4
-
-## Contributing to Source Code
-
-Thanks for wanting to contribute source code to ownCloud. That's great!
-
-Before we're able to merge your code to mirall, you need to sign
-our [Contributor Agreement][agreement].
-
-Please read the [Desktop Client Manual][mirallman] and the [Developer
-Manuals][devmanual] to get useful infos like how to create your first
-application or how to test the ownCloud code with phpunit.
-
-[agreement]: http://owncloud.org/about/contributor-agreement/
-[devmanual]: http://owncloud.org/dev/
-[mirallman]: http://doc.owncloud.org/desktop/1.1/
-
-## Translations
-Please submit translations via [Transifex][transifex].
-
-[transifex]: https://www.transifex.com/projects/p/owncloud/

COPYING.documentation

@@ -1,319 +0,0 @@
-Creative Commons Legal Code
-
-Attribution 3.0 Unported
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
-    DAMAGES RESULTING FROM ITS USE.
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
-TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
-BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
-CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
-CONDITIONS.
-
-1. Definitions
-
- a. "Adaptation" means a work based upon the Work, or upon the Work and
-    other pre-existing works, such as a translation, adaptation,
-    derivative work, arrangement of music or other alterations of a
-    literary or artistic work, or phonogram or performance and includes
-    cinematographic adaptations or any other form in which the Work may be
-    recast, transformed, or adapted including in any form recognizably
-    derived from the original, except that a work that constitutes a
-    Collection will not be considered an Adaptation for the purpose of
-    this License. For the avoidance of doubt, where the Work is a musical
-    work, performance or phonogram, the synchronization of the Work in
-    timed-relation with a moving image ("synching") will be considered an
-    Adaptation for the purpose of this License.
- b. "Collection" means a collection of literary or artistic works, such as
-    encyclopedias and anthologies, or performances, phonograms or
-    broadcasts, or other works or subject matter other than works listed
-    in Section 1(f) below, which, by reason of the selection and
-    arrangement of their contents, constitute intellectual creations, in
-    which the Work is included in its entirety in unmodified form along
-    with one or more other contributions, each constituting separate and
-    independent works in themselves, which together are assembled into a
-    collective whole. A work that constitutes a Collection will not be
-    considered an Adaptation (as defined above) for the purposes of this
-    License.
- c. "Distribute" means to make available to the public the original and
-    copies of the Work or Adaptation, as appropriate, through sale or
-    other transfer of ownership.
- d. "Licensor" means the individual, individuals, entity or entities that
-    offer(s) the Work under the terms of this License.
- e. "Original Author" means, in the case of a literary or artistic work,
-    the individual, individuals, entity or entities who created the Work
-    or if no individual or entity can be identified, the publisher; and in
-    addition (i) in the case of a performance the actors, singers,
-    musicians, dancers, and other persons who act, sing, deliver, declaim,
-    play in, interpret or otherwise perform literary or artistic works or
-    expressions of folklore; (ii) in the case of a phonogram the producer
-    being the person or legal entity who first fixes the sounds of a
-    performance or other sounds; and, (iii) in the case of broadcasts, the
-    organization that transmits the broadcast.
- f. "Work" means the literary and/or artistic work offered under the terms
-    of this License including without limitation any production in the
-    literary, scientific and artistic domain, whatever may be the mode or
-    form of its expression including digital form, such as a book,
-    pamphlet and other writing; a lecture, address, sermon or other work
-    of the same nature; a dramatic or dramatico-musical work; a
-    choreographic work or entertainment in dumb show; a musical
-    composition with or without words; a cinematographic work to which are
-    assimilated works expressed by a process analogous to cinematography;
-    a work of drawing, painting, architecture, sculpture, engraving or
-    lithography; a photographic work to which are assimilated works
-    expressed by a process analogous to photography; a work of applied
-    art; an illustration, map, plan, sketch or three-dimensional work
-    relative to geography, topography, architecture or science; a
-    performance; a broadcast; a phonogram; a compilation of data to the
-    extent it is protected as a copyrightable work; or a work performed by
-    a variety or circus performer to the extent it is not otherwise
-    considered a literary or artistic work.
- g. "You" means an individual or entity exercising rights under this
-    License who has not previously violated the terms of this License with
-    respect to the Work, or who has received express permission from the
-    Licensor to exercise rights under this License despite a previous
-    violation.
- h. "Publicly Perform" means to perform public recitations of the Work and
-    to communicate to the public those public recitations, by any means or
-    process, including by wire or wireless means or public digital
-    performances; to make available to the public Works in such a way that
-    members of the public may access these Works from a place and at a
-    place individually chosen by them; to perform the Work to the public
-    by any means or process and the communication to the public of the
-    performances of the Work, including by public digital performance; to
-    broadcast and rebroadcast the Work by any means including signs,
-    sounds or images.
- i. "Reproduce" means to make copies of the Work by any means including
-    without limitation by sound or visual recordings and the right of
-    fixation and reproducing fixations of the Work, including storage of a
-    protected performance or phonogram in digital form or other electronic
-    medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce,
-limit, or restrict any uses free from copyright or rights arising from
-limitations or exceptions that are provided for in connection with the
-copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License,
-Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-perpetual (for the duration of the applicable copyright) license to
-exercise the rights in the Work as stated below:
-
- a. to Reproduce the Work, to incorporate the Work into one or more
-    Collections, and to Reproduce the Work as incorporated in the
-    Collections;
- b. to create and Reproduce Adaptations provided that any such Adaptation,
-    including any translation in any medium, takes reasonable steps to
-    clearly label, demarcate or otherwise identify that changes were made
-    to the original Work. For example, a translation could be marked "The
-    original work was translated from English to Spanish," or a
-    modification could indicate "The original work has been modified.";
- c. to Distribute and Publicly Perform the Work including as incorporated
-    in Collections; and,
- d. to Distribute and Publicly Perform Adaptations.
- e. For the avoidance of doubt:
-
-     i. Non-waivable Compulsory License Schemes. In those jurisdictions in
-        which the right to collect royalties through any statutory or
-        compulsory licensing scheme cannot be waived, the Licensor
-        reserves the exclusive right to collect such royalties for any
-        exercise by You of the rights granted under this License;
-    ii. Waivable Compulsory License Schemes. In those jurisdictions in
-        which the right to collect royalties through any statutory or
-        compulsory licensing scheme can be waived, the Licensor waives the
-        exclusive right to collect such royalties for any exercise by You
-        of the rights granted under this License; and,
-   iii. Voluntary License Schemes. The Licensor waives the right to
-        collect royalties, whether individually or, in the event that the
-        Licensor is a member of a collecting society that administers
-        voluntary licensing schemes, via that society, from any exercise
-        by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now
-known or hereafter devised. The above rights include the right to make
-such modifications as are technically necessary to exercise the rights in
-other media and formats. Subject to Section 8(f), all rights not expressly
-granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made
-subject to and limited by the following restrictions:
-
- a. You may Distribute or Publicly Perform the Work only under the terms
-    of this License. You must include a copy of, or the Uniform Resource
-    Identifier (URI) for, this License with every copy of the Work You
-    Distribute or Publicly Perform. You may not offer or impose any terms
-    on the Work that restrict the terms of this License or the ability of
-    the recipient of the Work to exercise the rights granted to that
-    recipient under the terms of the License. You may not sublicense the
-    Work. You must keep intact all notices that refer to this License and
-    to the disclaimer of warranties with every copy of the Work You
-    Distribute or Publicly Perform. When You Distribute or Publicly
-    Perform the Work, You may not impose any effective technological
-    measures on the Work that restrict the ability of a recipient of the
-    Work from You to exercise the rights granted to that recipient under
-    the terms of the License. This Section 4(a) applies to the Work as
-    incorporated in a Collection, but this does not require the Collection
-    apart from the Work itself to be made subject to the terms of this
-    License. If You create a Collection, upon notice from any Licensor You
-    must, to the extent practicable, remove from the Collection any credit
-    as required by Section 4(b), as requested. If You create an
-    Adaptation, upon notice from any Licensor You must, to the extent
-    practicable, remove from the Adaptation any credit as required by
-    Section 4(b), as requested.
- b. If You Distribute, or Publicly Perform the Work or any Adaptations or
-    Collections, You must, unless a request has been made pursuant to
-    Section 4(a), keep intact all copyright notices for the Work and
-    provide, reasonable to the medium or means You are utilizing: (i) the
-    name of the Original Author (or pseudonym, if applicable) if supplied,
-    and/or if the Original Author and/or Licensor designate another party
-    or parties (e.g., a sponsor institute, publishing entity, journal) for
-    attribution ("Attribution Parties") in Licensor's copyright notice,
-    terms of service or by other reasonable means, the name of such party
-    or parties; (ii) the title of the Work if supplied; (iii) to the
-    extent reasonably practicable, the URI, if any, that Licensor
-    specifies to be associated with the Work, unless such URI does not
-    refer to the copyright notice or licensing information for the Work;
-    and (iv) , consistent with Section 3(b), in the case of an Adaptation,
-    a credit identifying the use of the Work in the Adaptation (e.g.,
-    "French translation of the Work by Original Author," or "Screenplay
-    based on original Work by Original Author"). The credit required by
-    this Section 4 (b) may be implemented in any reasonable manner;
-    provided, however, that in the case of a Adaptation or Collection, at
-    a minimum such credit will appear, if a credit for all contributing
-    authors of the Adaptation or Collection appears, then as part of these
-    credits and in a manner at least as prominent as the credits for the
-    other contributing authors. For the avoidance of doubt, You may only
-    use the credit required by this Section for the purpose of attribution
-    in the manner set out above and, by exercising Your rights under this
-    License, You may not implicitly or explicitly assert or imply any
-    connection with, sponsorship or endorsement by the Original Author,
-    Licensor and/or Attribution Parties, as appropriate, of You or Your
-    use of the Work, without the separate, express prior written
-    permission of the Original Author, Licensor and/or Attribution
-    Parties.
- c. Except as otherwise agreed in writing by the Licensor or as may be
-    otherwise permitted by applicable law, if You Reproduce, Distribute or
-    Publicly Perform the Work either by itself or as part of any
-    Adaptations or Collections, You must not distort, mutilate, modify or
-    take other derogatory action in relation to the Work which would be
-    prejudicial to the Original Author's honor or reputation. Licensor
-    agrees that in those jurisdictions (e.g. Japan), in which any exercise
-    of the right granted in Section 3(b) of this License (the right to
-    make Adaptations) would be deemed to be a distortion, mutilation,
-    modification or other derogatory action prejudicial to the Original
-    Author's honor and reputation, the Licensor will waive or not assert,
-    as appropriate, this Section, to the fullest extent permitted by the
-    applicable national law, to enable You to reasonably exercise Your
-    right under Section 3(b) of this License (right to make Adaptations)
-    but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
-OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
-KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
-INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
-FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
-LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
-WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
-OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
-LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
-ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
-ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
-BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
- a. This License and the rights granted hereunder will terminate
-    automatically upon any breach by You of the terms of this License.
-    Individuals or entities who have received Adaptations or Collections
-    from You under this License, however, will not have their licenses
-    terminated provided such individuals or entities remain in full
-    compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
-    survive any termination of this License.
- b. Subject to the above terms and conditions, the license granted here is
-    perpetual (for the duration of the applicable copyright in the Work).
-    Notwithstanding the above, Licensor reserves the right to release the
-    Work under different license terms or to stop distributing the Work at
-    any time; provided, however that any such election will not serve to
-    withdraw this License (or any other license that has been, or is
-    required to be, granted under the terms of this License), and this
-    License will continue in full force and effect unless terminated as
-    stated above.
-
-8. Miscellaneous
-
- a. Each time You Distribute or Publicly Perform the Work or a Collection,
-    the Licensor offers to the recipient a license to the Work on the same
-    terms and conditions as the license granted to You under this License.
- b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
-    offers to the recipient a license to the original Work on the same
-    terms and conditions as the license granted to You under this License.
- c. If any provision of this License is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this License, and without further action
-    by the parties to this agreement, such provision shall be reformed to
-    the minimum extent necessary to make such provision valid and
-    enforceable.
- d. No term or provision of this License shall be deemed waived and no
-    breach consented to unless such waiver or consent shall be in writing
-    and signed by the party to be charged with such waiver or consent.
- e. This License constitutes the entire agreement between the parties with
-    respect to the Work licensed here. There are no understandings,
-    agreements or representations with respect to the Work not specified
-    here. Licensor shall not be bound by any additional provisions that
-    may appear in any communication from You. This License may not be
-    modified without the mutual written agreement of the Licensor and You.
- f. The rights granted under, and the subject matter referenced, in this
-    License were drafted utilizing the terminology of the Berne Convention
-    for the Protection of Literary and Artistic Works (as amended on
-    September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
-    Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
-    and the Universal Copyright Convention (as revised on July 24, 1971).
-    These rights and subject matter take effect in the relevant
-    jurisdiction in which the License terms are sought to be enforced
-    according to the corresponding provisions of the implementation of
-    those treaty provisions in the applicable national law. If the
-    standard suite of rights granted under applicable copyright law
-    includes additional rights not granted under this License, such
-    additional rights are deemed to be included in the License; this
-    License is not intended to restrict the license of any rights under
-    applicable law.
-
-
-Creative Commons Notice
-
-    Creative Commons is not a party to this License, and makes no warranty
-    whatsoever in connection with the Work. Creative Commons will not be
-    liable to You or any party on any legal theory for any damages
-    whatsoever, including without limitation any general, special,
-    incidental or consequential damages arising in connection to this
-    license. Notwithstanding the foregoing two (2) sentences, if Creative
-    Commons has expressly identified itself as the Licensor hereunder, it
-    shall have all rights and obligations of Licensor.
-
-    Except for the limited purpose of indicating to the public that the
-    Work is licensed under the CCPL, Creative Commons does not authorize
-    the use by either party of the trademark "Creative Commons" or any
-    related trademark or logo of Creative Commons without the prior
-    written consent of Creative Commons. Any permitted use will be in
-    compliance with Creative Commons' then-current trademark usage
-    guidelines, as may be published on its website or otherwise made
-    available upon request from time to time. For the avoidance of doubt,
-    this trademark restriction does not form part of this License.
-
-    Creative Commons may be contacted at http://creativecommons.org/.

CPackOptions.cmake.in

@@ -9,13 +9,7 @@ endif(CPACK_GENERATOR MATCHES "NSIS")
 
 set( CMAKE_SOURCE_DIR  @CMAKE_SOURCE_DIR@ )
 set( CMAKE_BINARY_DIR  @CMAKE_BINARY_DIR@ )
-set( OEM_THEME_DIR     @OEM_THEME_DIR@ )
 
-if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
-     include ( ${OEM_THEME_DIR}/OEM.cmake )
-else ()
-     include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
-endif()
 
 set( CSYNC_BINARY_DIR  @CSYNC_BINARY_DIR@ )
 set( MINGW_ROOT @CMAKE_FIND_ROOT_PATH@ )
@@ -25,8 +19,8 @@ if(CSYNC_BINARY_DIR)
     set( CSYNC_CONFIG_DIR  "${CSYNC_BINARY_DIR}/config" )
 else()
     set( CSYNC_LIBRARY_DIR "${MINGW_ROOT}/bin" )
-    set( CSYNC_PLUGIN_DIR  "${MINGW_ROOT}/plugins-0" ) #FIXME: whatever it is
-    set( CSYNC_CONFIG_DIR  "${MINGW_ROOT}/etc/ocsync" )
+    set( CSYNC_PLUGIN_DIR  "${MINGW_ROOT}/bin/csync-0" ) #FIXME: whatever it is
+    set( CSYNC_CONFIG_DIR  "${MINGW_ROOT}/etc/csync" )
 endif()
 set( BUILD_OWNCLOUD_OSX_BUNDLE @BUILD_OWNCLOUD_OSX_BUNDLE@)
 if(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)

ChangeLog

@@ -1,115 +1,11 @@
 ChangeLog
 =========
-version 1.2.2 (release 2013-04-02 ), csync 0.70.5 required
-
-  * [Fixes] Do not crash when local file tree contains symlinks
-  * [Fixes] Correctly handle locked files on Windows
-  * [Fixes] Display errors in all members of the SSL chain
-  * [Fixes] Enable Accessibility features on Windows
-  * [Fixes] Make setupFavLink work properly on Mac OS
-  * [Fixes] Ignore temporary files created by MS Office
-  * [Gui] Support Nautilus in setupFavLink
-
-version 1.2.1 (release 2013-02-26 ), csync 0.70.4 required
-  * [Fixes] Leave configured folders on configuration changes.
-  * [Fixes] Do not allow to finish the setup dialog if connection can't be established.
-  * [Fixes] Better handling of credentials in setup dialog.
-  * [Fixes] Do not leak fd's to /dev/null when using gnutls
-  * [Fixes] Stop sync scheduling when configuration wizard starts.
-  * [Fixes] Clear pending network requests when stepping back in config wizard.
-  * [Fixes] User password dialog asynchronous issues.
-  * [Fixes] Make folderman starting and stoping the scheduling.
-  * [Fixes] Various minor fixes and cleanups.
-  * [Fixes] Crash on pausing sync
-  * [Fixes] Stale lock file after pausing sync
-  * [App] Load translations from app dir or bundle as well.
-  * [Platform] Build fixes and simplifications, ie. build only one lib.
-  * [Platform] Added some getter/setters for configuration values.
-  * [Platform] Added man pages.
-  * [Platform] Simplified/fixed credential store usage and custom configs.
-  * [Platform] Added soname version to libowncloudsync.
-  * [Platform] Pull in Qt translations
-  * [Gui]  Make sync result popups less annoyingq
-  * [Gui] Fix for result popup
-
-version 1.2.0 (release 2013-01-24 ), csync 0.70.2 required
-  * [GUI] New status dialog to show a detailed list of synced files.
-  * [GUI] New tray notifications about synced files.
-  * [GUI] New platform specific icon set.
-  * [App] Using cross platform QtKeychain library to store credentials crypted.
-  * [App] Use cross platform notification for changes in the local file system rather than regular poll.
-  * [Fixes] Improved SSL Certificate handling and SSL fixes troughout syncing.
-  * [Fixes] Fixed proxy authentication.
-  * [Fixes] Allow brackets in folder name alias.
-  * [Fixes] Lots of other minor fixes.
-  * [Platform] cmake fixes.
-  * [Platform] Improved, more detailed error reporting.
-
-version 1.1.4 (release 2012-12-19 ), csync 0.60.4 required
-  * No changes to mirall, only csync fixes.
-
-version 1.1.3 (release 2012-11-30 ), csync 0.60.3 required
-  * No changes to mirall, only csync fixes.
-
-version 1.1.2 (release 2012-11-26 ), csync 0.60.2 required
-  * [Fixes] Allow to properly cancel the password dialog.
-  * [Fixes] Share folder name correctly percent encoded with old Qt
-            4.6 builds ie. Debian.
-  * [Fixes] If local sync dir is not existing, create it.
-  * [Fixes] lots of other minor fixes.
-  * [GUI] Display error messages in status dialog.
-  * [GUI] GUI fixes for the connection wizard.
-  * [GUI] Show username for connection in statusdialog.
-  * [GUI] Show intro wizard on new connection setup.
-  * [APP] Use CredentialStore to better support various credential
-          backends.
-  * [APP] Handle missing local folder more robust: Create it if
-          missing instead of ignoring.
-  * [APP] Simplify treewalk code.
-  * [Platform] Fix Mac building
-
-version 1.1.1 (release 2012-10-18), csync 0.60.1 required
-  * [GUI]   Allow changing folder name in single folder mode
-  * [GUI]   Windows: Add license to installer
-  * [GUI]   owncloud --logwindow will bring up the log window
-            in an already running instance
-  * [Fixes] Make sure SSL errors are always handled
-  * [Fixes] Allow special characters in folder alias
-  * [Fixes] Proper workaround for Menu bug in Ubuntu
-  * [Fixes] csync: Fix improper memory cleanup which could
-            cause memory leaks and crashes
-  * [Fixes] csync: Fix memory leak
-  * [Fixes] csync: Allow single quote (') in file names
-  * [Fixes] csync: Remove stray temporary files
-
-  * [GUI]   Reworked tray context menu.
-  * [GUI]   Users can now sync the server root folder.
-  * [Fixes] Proxy support: now supports Proxy Auto-Configuration (PAC)
-            on Windows, reliability fixes across all OSes.
-  * [Fixes] Url entry field in setup assistant handles http/https correctly.
-  * [Fixes] Button enable state in status dialog.
-  * [Fixes] Crash fixed on ending the client, tray icon related.
-  * [Fixes] Crash through wrong delete operator.
-  * [MacOS] behave correctly on retina displays.
-  * [MacOS] fix focus policy.
-  * [MacOS] Packaging improvements.
-  * [MacOS] Packaging improvements.
-  * [Platform] Windows: Setup closes client prior to uninstall.
-  * [Platform] Windows: ownCloud gets added to autorun by default.
-  * [Platform] insert correct version info from cmake.
-  * [Platform] csync conf file and database were moved to the users app data
-               directory, away from the .csync dir.
-  *         Renamed exclude.lst to sync-exclude.lst and moved it to
-            /etc/appName()/ for more clean packaging. From the user path,
-	    still exclude.lst is read if sync-exclude.lst is not existing.
-  *         Placed custom.ini with customization options to /etc/appName()
-
 version 1.0.5 (release 2012-08-14), csync 0.50.8 required
   * [Fixes] Fixed setup dialog: Really use https if checkbox is activated.
 
 version 1.0.4 (release 2012-08-10), csync 0.50.8 required
   * [APP] ownCloud is now a single instance app, can not start twice any more.
-  * [APP] Proxy support
+  * [APP] Proxy support 
   * [APP] Handle HTTP redirection correctly, note new url.
   * [APP] More relaxed handling of read only directories in the sync paths.
   * [APP] Started to split off a library with sync functionality, eg for KDE
@@ -120,13 +16,13 @@ version 1.0.4 (release 2012-08-10), csync 0.50.8 required
   * [GUI] Removed Log Window Button, log available through command line.
   * [GUI] Proxy configuration dialog added.
   * [GUI] Added Translations to languages Slovenian, Polish, Catalan,
-          Portuguese (Brazil), German, Greek, Spanish, Czech, Italian, Slovak,
-	  French, Russian, Japanese, Swedish, Portuguese (Portugal)
+          Portuguese (Brazil), German, Greek, Spanish, Czech, Italian, Slovak, 
+	  French, Russian, Japanese, Swedish, Portuguese (Portugal) 
 	  all with translation rate >90%.
   * [Fixes] Loading of self signed certs into Networkmanager (#oc-843)
   * [Fixes] Win32: Handle SSL dll loading correctly.
   * [Fixes] Many other small fixes and improvements.
-
+  
 version 1.0.3 (release 2012-06-19), csync 0.50.7 required
   * [GUI] Added a log window which catches the logging if required and
           allows to save for information.
@@ -135,7 +31,7 @@ version 1.0.3 (release 2012-06-19), csync 0.50.7 required
   * [Fixes] Do not use csync database files from a sync before.
   * [Fixes] In Connection wizard, write the final config onyl if
             the user really accepted. Also remove the former database.
-  * [Fixes] More user expected behaviour deletion of sync folder local
+  * [Fixes] More user expected behaviour deletion of sync folder local 
             and remote.
   * [Fixes] Allow special characters in the sync directory names
   * [Fixes] Win32: Fixed directory removal with special character dirs.
@@ -177,7 +73,3 @@ version 1.0.1 (release 2012-04-18), csync 0.50.5 required
   * [Platform] Enabled ranslations on Windows.
 
 
-ChangeLog
-=========
-
-version 1.2.1 (release 2013-02-26 ), csync 0.70.4 required

OWNCLOUD.cmake

@@ -1,10 +0,0 @@
-set( APPLICATION_SHORTNAME  "owncloud" )
-set( APPLICATION_NAME       "ownCloud" )
-set( APPLICATION_EXECUTABLE "owncloud"        )
-set( APPLICATION_DOMAIN     "owncloud.com"    )
-set( APPLICATION_VENDOR     "ownCloud, Inc"   )
-set( THEME_CLASS            "ownCloudTheme"   )
-set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" )
-set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
-# set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
-# set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )

OwnCloudCPack.cmake

@@ -2,11 +2,7 @@ include( InstallRequiredSystemLibraries )
 
 set( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )
 
-if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
-     include ( "${OEM_THEME_DIR}/OEM.cmake" )
-else ()
-     include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
-endif()
+set( APPLICATION_NAME "ownCloud Client")
 
 include( VERSION.cmake )
 set( CPACK_PACKAGE_VERSION_MAJOR  ${VERSION_MAJOR} )
@@ -17,11 +13,11 @@ set( CPACK_PACKAGE_VERSION  ${VERSION} )
 if(APPLE)
     set( CPACK_GENERATOR "DragNDrop" )
     set( CPACK_SOURCE_GENERATOR "")
-    set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_NAME}-${CPACK_PACKAGE_VERSION} )
+    set( CPACK_PACKAGE_FILE_NAME ownCloudClientSetup-${CPACK_PACKAGE_VERSION} )
     set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/ownCloud.icns)
 
     set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in")
-#    set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )
+    set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )
 
     set( CPACK_DMG_FORMAT "UDBZ" )
     set( CPACK_DMG_VOLUME_NAME "${APPLICATION_NAME}")
@@ -39,18 +35,18 @@ endif()
 
 
 if(WIN32)
-    set( CPACK_PACKAGE_FILE_NAME  ${APPLICATION_SHORTNAME}-${CPACK_PACKAGE_VERSION}-setup )
+    set( CPACK_PACKAGE_FILE_NAME  owncloud-client-${CPACK_PACKAGE_VERSION}-setup )
     # Package file name without extension. Also a directory of installer  cmake-2.5.0-Linux-i686
     # CPACK_GENERATOR   CPack generator to be used  STGZ;TGZ;TZ
     # CPACK_INCLUDE_TOPLEVEL_DIRECTORY    Controls whether CPack adds a top-level directory, usually of the form ProjectName-Version-OS, to the top of package tree.  0 to disable, 1 to enable
     # CPACK_INSTALL_CMAKE_PROJECTS    List of four values: Build directory, Project Name, Project Component, Directory in the package     /home/andy/vtk/CMake-bin;CMake;ALL;/
     set( CPACK_PACKAGE_DESCRIPTION_FILE  "${CMAKE_SOURCE_DIR}/README.md" ) # File used as a description of a project     /path/to/project/ReadMe.txt
-    set( CPACK_PACKAGE_DESCRIPTION_SUMMARY  "${APPLICATION_NAME} Syncing Client" ) #  Description summary of a project
+    set( CPACK_PACKAGE_DESCRIPTION_SUMMARY  "ownCloud Syncing Client" ) #  Description summary of a project
     # CPACK_PACKAGE_EXECUTABLES   List of pairs of executables and labels. Used by the NSIS generator to create Start Menu shortcuts.     ccmake;CMake
     set( CPACK_PACKAGE_INSTALL_DIRECTORY  ${APPLICATION_NAME} )     # Installation directory on the target system -> C:\Program Files\fellody
     set( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APPLICATION_NAME} )  # Registry key used when installing this project  CMake 2.5.0
     set( CPACK_PACKAGE_NAME  ${APPLICATION_NAME} ) # Package name, defaults to the project name
-    set( CPACK_PACKAGE_VENDOR  "http://${APPLICATION_DOMAIN}" )   # Package vendor name
+    set( CPACK_PACKAGE_VENDOR  "http://owncloud.com" )   # Package vendor name
 endif()
 
 # set( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt" ) # License file for the project, used by the STGZ, NSIS, and PackageMaker generators.  /home/andy/vtk/CMake/Copyright.txt

README.md

@@ -1,3 +1,4 @@
+
 # Mirall
 
 ## Introduction
@@ -47,11 +48,13 @@ files or hang your computer.
 
 ### openSUSE
 
-* Refer to the download page http://owncloud.org/sync-clients/
+* 1-click install available in software.opensuse.org
+
+http://software.opensuse.org/search?q=mirall&baseproject=ALL&lang=en&include_home=true&exclude_debug=true
 
 ### Source code
 
-* https://github.com/owncloud/mirall
+* http://github.com/dmacvicar/mirall
 
 ## Building the source code
 
@@ -72,8 +75,6 @@ To generate a tarball:
 ## Authors
 
 * Duncan Mac-Vicar P. <duncan@kde.org>
-* Klaas Freitag <freitag@owncloud.com>
-* Daniel Molkentin <danimo@owncloud.com>
 
 ## License
 

VERSION.cmake

@@ -1,6 +1,5 @@
 set( VERSION_MAJOR 1 )
-set( VERSION_MINOR 2 )
-set( VERSION_PATCH 2 )
-set( VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
-set( SOVERSION 0 )
+set( VERSION_MINOR 0 )
+set( VERSION_PATCH 5 )
+set( VERSION  ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} )
 

admin/osx/sign_dmg.sh

@@ -1,20 +0,0 @@
-#!/bin/sh -x
-
-[ "$#" -lt 2 ] && echo "Usage: sign_dmg.sh <dmg> <identity>" && exit
-
-src_dmg=$1
-tmp_dmg=writable_$1
-signed_dmg=signed_$1
-identity=$2
-mount="/Volumes/$(basename $src_dmg|cut -d"-" -f1)"
-
-test -e $tmp_dmg && rm -rf $tmp_dmg
-hdiutil convert $src_dmg -format UDRW -o $tmp_dmg
-open $tmp_dmg
-sleep 12s
-pushd $mount
-codesign -s "$identity" $mount/*.app
-popd
-diskutil eject $mount
-test -e $signed_dmg && rm -rf $signed_dmg
-hdiutil convert $tmp_dmg -format UDBZ -o $signed_dmg

admin/win/Toolchain-mingw32-openSUSE.cmake

@@ -32,7 +32,3 @@ SET(QT_MOC_EXECUTABLE       ${MINGW_PREFIX}-moc)
 SET(QT_RCC_EXECUTABLE       ${MINGW_PREFIX}-rcc)
 SET(QT_UIC_EXECUTABLE       ${MINGW_PREFIX}-uic)
 SET(QT_LRELEASE_EXECUTABLE  ${MINGW_PREFIX}-lrelease)
-
-# neon config
-SET(NEON_CONFIG_EXECUTABLE  ${CMAKE_FIND_ROOT_PATH}/bin/neon-config)
-# /usr/i686-w64-mingw32/sys-root/mingw/bin/neon-config

admin/win/nsi/tomahawk.ini

@@ -0,0 +1,21 @@
+[Settings]
+NumFields=3
+[Field 1]
+Type=Label
+Left=0
+Right=-1
+Top=0
+Bottom=24
+[Field 2]
+Type=RadioButton
+Left=30
+Right=-1
+Top=50
+Bottom=58
+State=1
+[Field 3]
+Type=RadioButton
+Left=30
+Right=-1
+Top=70
+Bottom=78

cmake/modules/FindCsync.cmake

@@ -1,21 +1,17 @@
-
-IF( DEFINED CSYNC_BUILD_PATH )
-  SET(CSYNC_LIBRARY_PATH ${CSYNC_BUILD_PATH})
-  SET(CSYNC_BINARY_DIR ${CSYNC_BUILD_PATH})
-
-  IF(WIN32)
-    SET(CSYNC_LIBRARY ${CSYNC_BUILD_PATH}/src/libocsync.dll)
-  ELSEIF( APPLE )
-    SET(CSYNC_LIBRARY ${CSYNC_BUILD_PATH}/src/libocsync.dylib)
-  ELSE()
-    SET(CSYNC_LIBRARY ${CSYNC_BUILD_PATH}/src/libocsync.so)
-  ENDIF()
+IF(EXISTS "${CMAKE_SOURCE_DIR}/../csync/src/csync.h")
+  SET(CSYNC_INCLUDE_PATH ${CMAKE_SOURCE_DIR}/../csync/src/)
 ELSE()
-  FIND_LIBRARY(CSYNC_LIBRARY NAMES ocsync HINTS $ENV{CSYNC_DIR})
+  FIND_PATH(CSYNC_INCLUDE_PATH NAMES csync/csync.h csync.h HINTS $ENV{CSYNC_DIR} )
 ENDIF()
 
-IF(NOT DEFINED CSYNC_INCLUDE_PATH)
-  FIND_PATH(CSYNC_INCLUDE_PATH NAMES csync.h HINTS $ENV{CSYNC_DIR} )
+IF(EXISTS "${CMAKE_SOURCE_DIR}/../buildcsync/src/")
+  IF( WIN32 )
+     SET(CSYNC_LIBRARY ${CMAKE_SOURCE_DIR}/../win/buildcsync/src/libcsync.dll)
+  ELSE( WIN32 )
+     SET(CSYNC_LIBRARY ${CMAKE_SOURCE_DIR}/../buildcsync/src/libcsync.so)
+  ENDIF( WIN32 )
+ELSE()
+  FIND_LIBRARY(CSYNC_LIBRARY NAMES csync HINTS $ENV{CSYNC_DIR})
 ENDIF()
 
 SET(CSYNC_INCLUDE_DIR ${CSYNC_INCLUDE_PATH})
@@ -23,6 +19,7 @@ SET(CSYNC_INCLUDE_DIR ${CSYNC_INCLUDE_PATH})
 # handle the QUIETLY and REQUIRED arguments and set CSYNC_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Csync DEFAULT_MSG CSYNC_LIBRARY CSYNC_INCLUDE_PATH)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Csync DEFAULT_MSG
+  CSYNC_LIBRARY CSYNC_INCLUDE_PATH)
 
 MARK_AS_ADVANCED( CSYNC_INCLUDE_PATH CSYNC_LIBRARY )

cmake/modules/FindINotify.cmake

@@ -4,12 +4,12 @@
 # also defined, but not for general use are
 #  INOTIFY_LIBRARY, where to find the inotify library.
 
-find_path(INOTIFY_INCLUDE_DIR sys/inotify.h 
-          HINTS /usr/include/${CMAKE_LIBRARY_ARCHITECTURE})
+find_path(INOTIFY_INCLUDE_DIR sys/inotify.h)
 mark_as_advanced(INOTIFY_INCLUDE_DIR)
 
-# all listed variables are TRUE
+
 # handle the QUIETLY and REQUIRED arguments and set INOTIFY_FOUND to TRUE if
+# all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(INOTIFY DEFAULT_MSG INOTIFY_INCLUDE_DIR)
 

cmake/modules/FindPdfLatex.cmake

@@ -1,16 +0,0 @@
-find_program(PDFLATEX_EXECUTABLE NAMES pdflatex
-  HINTS
-  $ENV{PDFLATEX_DIR}
-  PATH_SUFFIXES bin
-  DOC "PDF LaTeX"
-)
-
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(PdfLatex DEFAULT_MSG
-  PDFLATEX_EXECUTABLE
-)
-
-mark_as_advanced(
-  PDFLATEX_EXECUTABLE
-)

cmake/modules/FindQtKeychain.cmake

@@ -1,18 +0,0 @@
-# - Try to find QtKeyChain
-# Once done this will define
-#  QTKEYCHAIN_FOUND - System has QtKeyChain
-#  QTKEYCHAIN_INCLUDE_DIRS - The QtKeyChain include directories
-#  QTKEYCHAIN_LIBRARIES - The libraries needed to use QtKeyChain
-#  QTKEYCHAIN_DEFINITIONS - Compiler switches required for using LibXml2
-
-find_path(QTKEYCHAIN_INCLUDE_DIR qtkeychain/keychain.h)
-
-find_library(QTKEYCHAIN_LIBRARY NAMES libqtkeychain qtkeychain)
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set QTKEYCHAIN_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(QtKeyChain  DEFAULT_MSG
-	QTKEYCHAIN_LIBRARY QTKEYCHAIN_INCLUDE_DIR)
-
-mark_as_advanced(QTKEYCHAIN_INCLUDE_DIR QTKEYCHAIN_LIBRARY )

cmake/modules/FindSphinx.cmake

@@ -1,16 +0,0 @@
-find_program(SPHINX_EXECUTABLE NAMES sphinx-build
-  HINTS
-  $ENV{SPHINX_DIR}
-  PATH_SUFFIXES bin
-  DOC "Sphinx documentation generator"
-)
-
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(Sphinx DEFAULT_MSG
-  SPHINX_EXECUTABLE
-)
-
-mark_as_advanced(
-  SPHINX_EXECUTABLE
-)

cmake/modules/GetGitRevisionDescription.cmake

@@ -1,123 +0,0 @@
-# - Returns a version string from Git
-#
-# These functions force a re-configure on each git commit so that you can
-# trust the values of the variables in your build system.
-#
-#  get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
-#
-# Returns the refspec and sha hash of the current head revision
-#
-#  git_describe(<var> [<additional arguments to git describe> ...])
-#
-# Returns the results of git describe on the source tree, and adjusting
-# the output so that it tests false if an error occurs.
-#
-#  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
-#
-# Returns the results of git describe --exact-match on the source tree,
-# and adjusting the output so that it tests false if there was no exact
-# matching tag.
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-if(__get_git_revision_description)
-	return()
-endif()
-set(__get_git_revision_description YES)
-
-# We must run the following at "include" time, not at function call time,
-# to find the path to this module rather than the path to a calling list file
-get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
-
-function(get_git_head_revision _refspecvar _hashvar)
-	set(GIT_PARENT_DIR "${CMAKE_SOURCE_DIR}")
-	set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories
-		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
-		get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
-		if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
-			# We have reached the root directory, we are not in git
-			set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-			set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-			return()
-		endif()
-		set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-	endwhile()
-	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
-	if(NOT EXISTS "${GIT_DATA}")
-		file(MAKE_DIRECTORY "${GIT_DATA}")
-	endif()
-
-	if(NOT EXISTS "${GIT_DIR}/HEAD")
-		return()
-	endif()
-	set(HEAD_FILE "${GIT_DATA}/HEAD")
-	configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
-
-	configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
-		"${GIT_DATA}/grabRef.cmake"
-		@ONLY)
-	include("${GIT_DATA}/grabRef.cmake")
-
-	set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
-	set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
-endfunction()
-
-function(git_describe _var)
-	if(NOT GIT_FOUND)
-		find_package(Git QUIET)
-	endif()
-	get_git_head_revision(refspec hash)
-	if(NOT GIT_FOUND)
-		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-	if(NOT hash)
-		set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-
-	# TODO sanitize
-	#if((${ARGN}" MATCHES "&&") OR
-	#	(ARGN MATCHES "||") OR
-	#	(ARGN MATCHES "\\;"))
-	#	message("Please report the following error to the project!")
-	#	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
-	#endif()
-
-	#message(STATUS "Arguments to execute_process: ${ARGN}")
-
-	execute_process(COMMAND
-		"${GIT_EXECUTABLE}"
-		describe
-		${hash}
-		${ARGN}
-		WORKING_DIRECTORY
-		"${CMAKE_SOURCE_DIR}"
-		RESULT_VARIABLE
-		res
-		OUTPUT_VARIABLE
-		out
-		ERROR_QUIET
-		OUTPUT_STRIP_TRAILING_WHITESPACE)
-	if(NOT res EQUAL 0)
-		set(out "${out}-${res}-NOTFOUND")
-	endif()
-
-	set(${_var} "${out}" PARENT_SCOPE)
-endfunction()
-
-function(git_get_exact_tag _var)
-	git_describe(out --exact-match ${ARGN})
-	set(${_var} "${out}" PARENT_SCOPE)
-endfunction()

cmake/modules/GetGitRevisionDescription.cmake.in

@@ -1,38 +0,0 @@
-# 
-# Internal file for GetGitRevisionDescription.cmake
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-set(HEAD_HASH)
-
-file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
-
-string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
-if(HEAD_CONTENTS MATCHES "ref")
-	# named branch
-	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
-	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
-		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
-	elseif(EXISTS "@GIT_DIR@/logs/${HEAD_REF}")
-		configure_file("@GIT_DIR@/logs/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
-		set(HEAD_HASH "${HEAD_REF}")
-	endif()
-else()
-	# detached HEAD
-	configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
-endif()
-
-if(NOT HEAD_HASH)
-	file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
-	string(STRIP "${HEAD_HASH}" HEAD_HASH)
-endif()

cmake/modules/MacOSXBundleInfo.plist.in

@@ -2,31 +2,35 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-        <key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>LSUIElement</key>
-	<true/>
-	<key>CFBundleDevelopmentRegion</key>
+        <key>CFBundleDevelopmentRegion</key>
         <string>English</string>
         <key>CFBundleExecutable</key>
-        <string>@APPLICATION_EXECUTABLE@</string>
+        <string>owncloud</string>
+        <key>CFBundleGetInfoString</key>
+        <string></string>
         <key>CFBundleIconFile</key>
         <string>ownCloud.icns</string>
         <key>CFBundleIdentifier</key>
-        <string>@APPLICATION_REV_DOMAIN@</string>
+        <string>org.owncloud</string>
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>
         <key>CFBundleLongVersionString</key>
-        <string>@APPLICATION_NAME@ @VERSION@</string>
+        <string>owncloud FIXME</string>
+        <key>CFBundleName</key>
+        <string>owncloudBundleName</string>
         <key>CFBundlePackageType</key>
         <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>0.1.0 FIXME</string>
         <key>CFBundleSignature</key>
         <string>????</string>
         <key>CFBundleVersion</key>
-        <string>@VERSION@</string>
-        <key>CFBundleShortVersionString</key>
-        <string>@VERSION@</string>
+        <string>owncloud FIXME 0.1.0</string>
+        <key>CSResourcesFileMapped</key>
+        <true/>
+        <key>LSUIElement</key>
+        <true/>
         <key>NSHumanReadableCopyright</key>
-        <string>(C) 2012 @APPLICATION_VENDOR@</string>
+        <string>2012 owncloud.org</string>
 </dict>
 </plist>

cmake/modules/NSIS.template.in

@@ -1,24 +1,20 @@
 ;ownCloud installer script.
 
-!define APPLICATION_SHORTNAME "@APPLICATION_SHORTNAME@"
-!define APPLICATION_NAME "@APPLICATION_NAME@"
-!define APPLICATION_VENDOR "@APPLICATION_VENDOR@"
-!define APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@.exe"
-!define APPLICATION_DOMAIN "@APPLICATION_DOMAIN@"
-!define APPLICATION_LICENSE "@APPLICATION_LICENSE@"
-!define WIN_SETUP_BITMAP_PATH "@WIN_SETUP_BITMAP_PATH@"
+!define APPLICATION_NAME ownCloud
+!define APPLICATION_EXECUTABLE owncloud.exe
+!define APPLICATION_DOMAIN owncloud.com
+
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.${APPLICATION_DOMAIN}"
+
 
 ;-----------------------------------------------------------------------------
 ; Some installer script options (comment-out options not required)
 ;-----------------------------------------------------------------------------
-!if "@APPLICATION_LICENSE@" != ""
-  !define OPTION_LICENSE_AGREEMENT
-!endif
+;!define OPTION_LICENSE_AGREEMENT
 !define OPTION_UAC_PLUGIN_ENHANCED
 !define OPTION_SECTION_SC_START_MENU
 !define OPTION_SECTION_SC_DESKTOP
 !define OPTION_SECTION_SC_QUICK_LAUNCH
-!define OPTION_SECTION_SC_AUTOSTART
 !define OPTION_FINISHPAGE
 !define OPTION_FINISHPAGE_LAUNCHER
 ; !define OPTION_FINISHPAGE_RELEASE_NOTES
@@ -31,11 +27,9 @@
 !endif
 !define MING_BIN "${MING_PATH}/bin"
 !define MING_LIB "${MING_PATH}/lib"
-!define MING_SHARE "${MING_PATH}/share"
 !define BUILD_PATH "@CMAKE_BINARY_DIR@"
 !define SOURCE_PATH "@CMAKE_SOURCE_DIR@"
 !define QT_DLL_PATH "${MING_BIN}"
-!define ACCESSIBLE_DLL_PATH "${MING_LIB}/qt4/plugins/accessible"
 !define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
 !define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
 
@@ -43,7 +37,7 @@
 !define CSYNC_PLUGIN_DIR "@CSYNC_PLUGIN_DIR@"
 !define CSYNC_CONFIG_DIR "@CSYNC_CONFIG_DIR@"
 
-!define NSI_PATH "${source_path}/admin/win/nsi"
+!define NSI_PATH "${SOURCE_PATH}/admin/win/nsi"
 
 ;-----------------------------------------------------------------------------
 ; Installer version
@@ -63,6 +57,7 @@
 ; Initial installer setup and definitions.
 ;-----------------------------------------------------------------------------
 Name "@CPACK_NSIS_PACKAGE_NAME@"
+Caption "${APPLICATION_NAME} Installer"
 BrandingText "${APPLICATION_NAME} ${VERSION}  -- ${BUILD_TIME}"
 OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
 InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
@@ -94,7 +89,7 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 ; Memento selections stored in registry.
 ;-----------------------------------------------------------------------------
 !define MEMENTO_REGISTRY_ROOT HKLM
-!define MEMENTO_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}"
+!define MEMENTO_REGISTRY_KEY Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}
 
 ;-----------------------------------------------------------------------------
 ; Modern User Interface (MUI) defintions and setup.
@@ -102,12 +97,14 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !define MUI_ABORTWARNING
 !define MUI_ICON ${NSI_PATH}\installer.ico
 !define MUI_UNICON ${NSI_PATH}\installer.ico
-!define MUI_WELCOMEFINISHPAGE_BITMAP ${WIN_SETUP_BITMAP_PATH}/welcome.bmp
+!define MUI_WELCOMEFINISHPAGE_BITMAP ${NSI_PATH}\welcome_oc.bmp
+!define MUI_WELCOMEPAGE_TITLE "@CPACK_PACKAGE_NAME@ ${VERSION} Setup$\r$\nInstaller"
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation.$\r$\n$\r$\n$_CLICK"
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP  ${WIN_SETUP_BITMAP_PATH}/page_header.bmp
+!define MUI_HEADERIMAGE_BITMAP ${NSI_PATH}\page_header_oc.bmp
 !define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_FINISHPAGE_LINK "www.${APPLICATION_DOMAIN}"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.${APPLICATION_DOMAIN}"
+!define MUI_FINISHPAGE_TITLE "@CPACK_PACKAGE_NAME@ Install Completed"
+!define MUI_FINISHPAGE_LINK "Click here to visit the @CPACK_PACKAGE_NAME@ website."
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !ifdef OPTION_FINISHPAGE_RELEASE_NOTES
    !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
@@ -125,7 +122,7 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 ;-----------------------------------------------------------------------------
 !insertmacro MUI_PAGE_WELCOME
 !ifdef OPTION_LICENSE_AGREEMENT
-   !insertmacro MUI_PAGE_LICENSE "${APPLICATION_LICENSE}"
+   !insertmacro MUI_PAGE_LICENSE "LICENSE.txt"
 !endif
 Page custom PageReinstall PageLeaveReinstall
 !insertmacro MUI_PAGE_COMPONENTS
@@ -267,7 +264,7 @@ FunctionEnd
 #   INSTALLER SECTIONS                                                       #
 #                                                                            #
 ##############################################################################
-Section "${APPLICATION_NAME}" SEC_OWNCLOUD
+Section "${APPLICATION_NAME}" SEC_OWNCLOUD_PLAYER
    SectionIn 1 2 3 RO
    SetDetailsPrint listonly
 
@@ -284,89 +281,28 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD
         ;Main executable.
         File "${BUILD_PATH}\bin\${APPLICATION_EXECUTABLE}"
         File "${BUILD_PATH}\src\libowncloudsync.dll"
-
         File "${BUILD_PATH}\src\mirall_ca.qm"
         File "${BUILD_PATH}\src\mirall_cs_CZ.qm"
-        File "${BUILD_PATH}\src\mirall_da.qm"
         File "${BUILD_PATH}\src\mirall_de.qm"
         File "${BUILD_PATH}\src\mirall_el.qm"
         File "${BUILD_PATH}\src\mirall_en.qm"
-        File "${BUILD_PATH}\src\mirall_eo.qm"
         File "${BUILD_PATH}\src\mirall_es.qm"
-        File "${BUILD_PATH}\src\mirall_es_AR.qm"
-        File "${BUILD_PATH}\src\mirall_et_EE.qm"
-        File "${BUILD_PATH}\src\mirall_eu.qm"
-        File "${BUILD_PATH}\src\mirall_fa.qm"
-        File "${BUILD_PATH}\src\mirall_fi_FI.qm"
         File "${BUILD_PATH}\src\mirall_fr.qm"
-        File "${BUILD_PATH}\src\mirall_gl.qm"
-        File "${BUILD_PATH}\src\mirall_he.qm"
-        File "${BUILD_PATH}\src\mirall_hr.qm"
-        File "${BUILD_PATH}\src\mirall_hu_HU.qm"
         File "${BUILD_PATH}\src\mirall_it.qm"
         File "${BUILD_PATH}\src\mirall_ja_JP.qm"
-        File "${BUILD_PATH}\src\mirall_ko.qm"
-        File "${BUILD_PATH}\src\mirall_lb.qm"
-        File "${BUILD_PATH}\src\mirall_lt_LT.qm"
-        File "${BUILD_PATH}\src\mirall_lv.qm"
-        File "${BUILD_PATH}\src\mirall_mk.qm"
-        File "${BUILD_PATH}\src\mirall_ms_MY.qm"
-        File "${BUILD_PATH}\src\mirall_nb_NO.qm"
-        File "${BUILD_PATH}\src\mirall_nl.qm"
-        File "${BUILD_PATH}\src\mirall_oc.qm"
         File "${BUILD_PATH}\src\mirall_pl.qm"
         File "${BUILD_PATH}\src\mirall_pt_BR.qm"
         File "${BUILD_PATH}\src\mirall_pt_PT.qm"
-        File "${BUILD_PATH}\src\mirall_ro.qm"
         File "${BUILD_PATH}\src\mirall_ru.qm"
-        File "${BUILD_PATH}\src\mirall_ru_RU.qm"
-        File "${BUILD_PATH}\src\mirall_si_LK.qm"
         File "${BUILD_PATH}\src\mirall_sk_SK.qm"
         File "${BUILD_PATH}\src\mirall_sl.qm"
-        File "${BUILD_PATH}\src\mirall_sr@latin.qm"
         File "${BUILD_PATH}\src\mirall_sv.qm"
-        File "${BUILD_PATH}\src\mirall_ta_LK.qm"
-        File "${BUILD_PATH}\src\mirall_th_TH.qm"
-        File "${BUILD_PATH}\src\mirall_tr.qm"
-        File "${BUILD_PATH}\src\mirall_uk.qm"
-        File "${BUILD_PATH}\src\mirall_vi.qm"
-        File "${BUILD_PATH}\src\mirall_zh_CN.qm"
-        File "${BUILD_PATH}\src\mirall_zh_TW.qm"
-
-        #File "${MING_SHARE}\qt4\translations\qt_ar.qm"
-        File "${MING_SHARE}\qt4\translations\qt_cs.qm"
-        File "${MING_SHARE}\qt4\translations\qt_da.qm"
-        File "${MING_SHARE}\qt4\translations\qt_de.qm"
-        File "${MING_SHARE}\qt4\translations\qt_es.qm"
-        File "${MING_SHARE}\qt4\translations\qt_fa.qm"
-        File "${MING_SHARE}\qt4\translations\qt_fr.qm"
-        File "${MING_SHARE}\qt4\translations\qt_gl.qm"
-        File "${MING_SHARE}\qt4\translations\qt_he.qm"
-        File "${MING_SHARE}\qt4\translations\qt_hu.qm"
-        File "${MING_SHARE}\qt4\translations\qt_ja.qm"
-        File "${MING_SHARE}\qt4\translations\qt_ko.qm"
-        File "${MING_SHARE}\qt4\translations\qt_lt.qm"
-        File "${MING_SHARE}\qt4\translations\qt_pl.qm"
-        File "${MING_SHARE}\qt4\translations\qt_pt.qm"
-        File "${MING_SHARE}\qt4\translations\qt_ru.qm"
-        File "${MING_SHARE}\qt4\translations\qt_sk.qm"
-        File "${MING_SHARE}\qt4\translations\qt_sl.qm"
-        File "${MING_SHARE}\qt4\translations\qt_sv.qm"
-        File "${MING_SHARE}\qt4\translations\qt_uk.qm"
-        File "${MING_SHARE}\qt4\translations\qt_zh_CN.qm"
-        File "${MING_SHARE}\qt4\translations\qt_zh_TW.qm"
-        File "${MING_SHARE}\qt4\translations\qt_zh_TW.qm"
-
-        File "${MING_SHARE}\qt4\translations\qtkeychain_de.qm"
-
-        SetOutPath "$INSTDIR\accessible"
-        File "${ACCESSIBLE_DLL_PATH}\qtaccessiblewidgets4.dll"
 
         SetOutPath "$INSTDIR\modules"
         ; FIXME: fix installation dir of module, currently needs manual copying to
         ; /usr/i686-w64-mingw32/sys-root/mingw/bin/csync_modules/
 
-        File "${CSYNC_PLUGIN_DIR}/ocsync_owncloud.dll"
+        File "${CSYNC_PLUGIN_DIR}/csync_owncloud.dll"
         SetOutPath "$INSTDIR"
    !endif
 
@@ -382,20 +318,21 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD
    File "${QT_DLL_PATH}\QtNetwork4.dll"
    File "${QT_DLL_PATH}\QtXml4.dll"
 
-   ;QtKeyChain stuff
-   File "${MING_BIN}\libqtkeychain.dll"
-
-   File "${CSYNC_LIBRARY_DIR}/libocsync.dll"
+   File "${CSYNC_LIBRARY_DIR}/libcsync.dll"
    File "${MING_BIN}\libsqlite3-0.dll"
    File "${MING_BIN}\libiniparser.dll"
    File "${MING_BIN}\libdl.dll"
    File "${MING_BIN}\libpng15-15.dll"
 
    ; ownCloud plugin
+   File "${MING_BIN}\libgcrypt-11.dll"
+   File "${MING_BIN}\libgnutls-26.dll"
+   File "${MING_BIN}\libgpg-error-0.dll"
    File "${MING_BIN}\libintl-8.dll"
    File "${MING_BIN}\libneon-27.dll"
    File "${MING_BIN}\libproxy.dll"
    File "${MING_BIN}\libmodman.dll"
+   File "${MING_BIN}\libtasn1-3.dll"
    File "${MING_BIN}\libxml2-2.dll"
 
    ;MinGW stuff
@@ -406,11 +343,12 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD
    ;File "${MING_BIN}\libpng15-15.dll"
    ;File "${MING_BIN}\libjpeg-8.dll"
    File "${MING_BIN}\zlib1.dll"
-   File "${MING_BIN}\libcrypto-10.dll"
-   File "${MING_BIN}\libssl-10.dll"
+   File "${MING_BIN}\libcrypto-8.dll"
+   File "${MING_BIN}\libssl-8.dll"
 
    ; CSync configs
-   File "${SOURCE_PATH}/sync-exclude.lst"
+   File "${CSYNC_CONFIG_DIR}/csync.conf"
+   File "${SOURCE_PATH}/exclude.lst"
 
 SectionEnd
 
@@ -418,7 +356,7 @@ SectionGroup "Shortcuts"
 
 !ifdef OPTION_SECTION_SC_START_MENU
    ${MementoSection} "Start Menu Program Group" SEC_START_MENU
-      SectionIn 1 2 3
+      SectionIn 1 2
       SetDetailsPrint textonly
       DetailPrint "Adding shortcuts for the ${APPLICATION_NAME} program group to the Start Menu."
       SetDetailsPrint listonly
@@ -455,27 +393,15 @@ SectionGroup "Shortcuts"
 
 SectionGroupEnd
 
-!ifdef OPTION_SECTION_SC_AUTOSTART
-   ${MementoSection} "Autostart" SEC_AUTOSTART
-      SectionIn 1 2
-      SetDetailsPrint textonly
-      DetailPrint "Creating Windows Start Entry"
-      SetDetailsPrint listonly
-      WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Run" \
-               "${APPLICATION_NAME}" "$INSTDIR\${APPLICATION_EXECUTABLE}" 
-  ${MementoSectionEnd}
-!endif
-
 ${MementoSectionDone}
 
 ; Installer section descriptions
 ;--------------------------------
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APPLICATION} "${APPLICATION_NAME} essentials."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "${APPLICATION_NAME} program group."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for ${APPLICATION_NAME}."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for ${APPLICATION_NAME}."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_AUTOSTART} "Register ${APPLICATION_NAME} to run on Windows startup."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "{APPLICATION_NAME} program group."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for {APPLICATION_NAME}."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for {APPLICATION_NAME}."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 Section -post
@@ -502,7 +428,7 @@ Section -post
    WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
    WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "InstallLocation" "$INSTDIR"
    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayName" "${APPLICATION_NAME}"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "Publisher" "${APPLICATION_VENDOR}"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "Publisher" "${APPLICATION_DOMAIN}"
    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayIcon" "$INSTDIR\Uninstall.exe,0"
    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayVersion" "${VERSION}"
    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "VersionMajor" "${VER_MAJOR}"
@@ -514,7 +440,7 @@ Section -post
 
 
    SetDetailsPrint textonly
-   DetailPrint "Finished."
+   DetailPrint "Finsihed."
 SectionEnd
 
 ##############################################################################
@@ -529,7 +455,7 @@ Var UnPageUserAppDataCheckbox_State
 Var UnPageUserAppDataEditBox
 
 Function un.UnPageUserAppData
-   !insertmacro MUI_HEADER_TEXT "Uninstall ${APPLICATION_NAME}" "Remove ${APPLICATION_NAME}'s data folder from your computer."
+   !insertmacro MUI_HEADER_TEXT "Uninstall ${APPLICATION_DOMAIN}" "Remove ${APPLICATION_DOMAIN}'s data folder from your computer."
    nsDialogs::Create /NOUNLOAD 1018
    Pop $UnPageUserAppDataDialog
 
@@ -537,10 +463,10 @@ Function un.UnPageUserAppData
       Abort
    ${EndIf}
 
-   ${NSD_CreateLabel} 0 0 100% 12u "Do you want to delete ${APPLICATION_NAME}'s data folder?"
+   ${NSD_CreateLabel} 0 0 100% 12u "Do you want to delete ${APPLICATION_DOMAIN}'s data folder?"
    Pop $0
 
-   ${NSD_CreateText} 0 13u 100% 12u "$LOCALAPPDATA\${APPLICATION_NAME}"
+   ${NSD_CreateText} 0 13u 100% 12u "$LOCALAPPDATA\${APPLICATION_DOMAIN}"
    Pop $UnPageUserAppDataEditBox
    SendMessage $UnPageUserAppDataEditBox ${EM_SETREADONLY} 1 0
 
@@ -557,10 +483,6 @@ Function un.UnPageUserAppDataLeave
    ${NSD_GetState} $UnPageUserAppDataCheckbox $UnPageUserAppDataCheckbox_State
 FunctionEnd
 
-Function un.EnsureOwncloudShutdown
-   !insertmacro CheckAndConfirmEndProcess "${APPLICATION_EXECUTABLE}"
-FunctionEnd
-
 Section Uninstall
    IfFileExists "$INSTDIR\${APPLICATION_EXECUTABLE}" owncloud_installed
       MessageBox MB_YESNO "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" IDYES owncloud_installed
@@ -578,11 +500,6 @@ Section Uninstall
 
    DeleteRegKey HKCR "${APPLICATION_NAME}"
 
-   ;Windows Start entry
-   !ifdef OPTION_SECTION_SC_AUTOSTART
-      DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "${APPLICATION_NAME}"
-   !endif
-
    ;Start menu shortcuts.
    !ifdef OPTION_SECTION_SC_START_MENU
       SetShellVarContext all
@@ -611,7 +528,7 @@ Section Uninstall
    ${EndIf}
 
    SetDetailsPrint textonly
-   DetailPrint "Finshed."
+   DetailPrint "Finsihed."
 SectionEnd
 
 ##############################################################################
@@ -712,9 +629,6 @@ Function un.onInit
    StrCmp $R0 0 +3
       MessageBox MB_OK|MB_ICONEXCLAMATION "This uninstaller is already running."
       Abort
-
-   ;Shutdown ${APPLICATION_NAME} in order to remove locked files.
-   Call un.EnsureOwncloudShutdown
 FunctionEnd
 
 Function un.onUnInstSuccess

config.h.in

@@ -1,12 +1,4 @@
-#ifndef CONFIG_H
-#define CONFIG_H
 
 #cmakedefine USE_INOTIFY 1
 #cmakedefine WITH_CSYNC 1
-#cmakedefine WITH_QTKEYCHAIN 1
 
-#cmakedefine GIT_SHA1 "@GIT_SHA1@"
-#cmakedefine APPLICATION_DOMAIN @APPLICATION_DOMAIN@
-#cmakedefine THEME_CLASS @THEME_CLASS@
-#cmakedefine THEME_INCLUDE @THEME_INCLUDE@
-#endif

doc/CMakeLists.txt

@@ -1,79 +0,0 @@
-if(SPHINX_FOUND)
-
-    # Sphinx cache with pickled ReST documents
-    set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
-    # HTML output directory
-    set(SPHINX_HTML_DIR     "${CMAKE_CURRENT_BINARY_DIR}/html")
-    set(SPHINX_MAN_DIR      "${CMAKE_CURRENT_BINARY_DIR}/man")
-    set(SPHINX_PDF_DIR      "${CMAKE_CURRENT_BINARY_DIR}/latex")
-    set(SPHINX_QCH_DIR      "${CMAKE_CURRENT_BINARY_DIR}/qthelp")
-    set(SPHINX_HTMLHELP_DIR "${CMAKE_CURRENT_BINARY_DIR}/htmlhelp")
-    set(MSHTML_COMPILER     wine 'C:\\Program Files\\HTML Help Workshop\\hhc.exe')
-    # assets
-    set(LATEX_LOGO          "${CMAKE_CURRENT_SOURCE_DIR}/logo-blue.pdf")
-
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY)
-
-    if(WITH_DOC)
-       add_custom_target(doc ALL DEPENDS doc-html doc-man COMMENT "Building documentation...")
-       install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
-       install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR})
-    else(WITH_DOC)
-       add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
-    endif(WITH_DOC)
-
-    if(PDFLATEX_FOUND)
-        # if this still fails on Debian/Ubuntu, run
-        # apt-get install texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
-        add_custom_target(doc-latex  ${SPHINX_EXECUTABLE}
-		                     -q -c . -b latex
-				     -d ${SPHINX_CACHE_DIR}
-				     -D latex_logo=${LATEX_LOGO}
-				     ${CMAKE_CURRENT_SOURCE_DIR}
-				     ${SPHINX_PDF_DIR} )
-        add_custom_target(doc-pdf make -C ${SPHINX_PDF_DIR} all-pdf
-		                  DEPENDS doc-latex )
-        add_dependencies(doc doc-pdf)
-        if (WITH_DOC)
-           install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
-        endif (WITH_DOC)
-    endif(PDFLATEX_FOUND)
-    if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE})
-        add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE}
-		                          -q -c . -b qthelp
-				          -d ${SPHINX_CACHE_DIR}
-					  ${CMAKE_CURRENT_SOURCE_DIR}
-					  ${SPHINX_QCH_DIR} )
-        add_custom_target( doc-qch ${QT_QCOLLECTIONGENERATOR_EXECUTABLE}
-		                   ${SPHINX_QCH_DIR}/*.qhcp
-				   DEPENDS doc-qch-sphinx )
-        add_dependencies(doc doc-qch)
-        if (WITH_DOC)
-            install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
-        endif (WITH_DOC)
-    endif()
-    add_custom_target( doc-html ${SPHINX_EXECUTABLE}
-	                        -q -c . -b html
-				-d ${SPHINX_CACHE_DIR}
-				${CMAKE_CURRENT_SOURCE_DIR}
-				${SPHINX_HTML_DIR} )
-    add_custom_target( doc-man  ${SPHINX_EXECUTABLE}
-	                        -q -c . -b man
-				-d ${SPHINX_CACHE_DIR}
-				${CMAKE_CURRENT_SOURCE_DIR}
-				${SPHINX_MAN_DIR} )
-
-    ## Building CHM files requires HTML Help Workshop. Since it requires wine
-    ## with special dependencies, it's impossible to write a cmake check for it.
-    ## This is why doc-chm is not a dependency for doc. Instead, run
-    ## doc/scripts/htmlhelp.exe to install them and run this target
-    ## explicitly.
-    add_custom_target( doc-chm-sphinx  ${SPHINX_EXECUTABLE}
-	                               -q -c . -b htmlhelp
-	                               -D html_theme=basic
-                                       -d ${SPHINX_CACHE_DIR}
-                                       ${CMAKE_CURRENT_SOURCE_DIR}
-                                       ${SPHINX_HTMLHELP_DIR} )
-    add_custom_target( doc-chm pushd ${SPHINX_HTMLHELP_DIR}; ${MSHTML_COMPILER} *.hhp; popd
-				   DEPENDS doc-chm-sphinx )
-endif(SPHINX_FOUND)

doc/Makefile

@@ -1,153 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = _build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/OwncloudDocumentation.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/OwncloudDocumentation.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/OwncloudDocumentation"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/OwncloudDocumentation"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."

doc/architecture.rst

@@ -1,108 +0,0 @@
-Architecture
-============
-.. index:: architecture 
-
-The ownCloud project provides desktop sync clients to synchronize the
-contents of local directories on the desktop machines to the ownCloud.
-
-The syncing is done with csync_, a bidirectional file synchronizing tool which
-provides both a command line client as well as a library. A special module for
-csync was written to synchronize with ownCloud’s built-in WebDAV server.
-
-The ownCloud sync client is based on a tool called mirall initially written by
-Duncan Mac Vicar. Later Klaas Freitag joined the project and enhanced it to work
-with ownCloud server. Both mirall and ownCloud Client (oCC) build from the same
-source, currently hosted in the ownCloud source repo on gitorious.
-
-oCC is written in C++ using the `Qt Framework`_. As a result oCC runs on the
-three important platforms Linux, Windows and MacOS.
-
-.. _csync: http://www.csync.org
-.. _`Qt Framework`: http://www.qt-project.org
-
-The Sync Process
-----------------
-
-First it is important to recall what syncing is. Syncing tries to keep the files
-on both repositories the same. That means if a file is added to one repository
-it is going to be copied to the other repository. If a file is changed on one
-repository, the change is propagated to the other repository. Also, if a file
-is deleted on one side, it is deleted on the other. As a matter of fact, in
-ownCloud syncing we do not have a typical client/server system where the
-server is always master.
-
-This is the major difference to other systems like a file backup where just
-changes and new files are propagated but files never get deleted.
-
-Sync Direction and Strategies
------------------------------
-.. index:: time stamps, file times, etag, unique id 
-
-Until the release of ownCloud 4.5 and ownCloud Client 1.1, ownCloud employed
-a single file property to decide which file is newer and hence needs to be
-synced to the other repository: the files modification time.
-
-The *modification timestamp* is part of the files metadata. It is available on
-every relevant filesystem and is the natural indicator for a file change.
-modification timestamps do not require special action to create and have
-a general meaning. One design goal of csync is to not require a special server
-component, that’s why it was chosen as the backend component.
-
-To compare the modification times of two files from different systems,
-it is needed to operate on the same base. Before version 1.1.0,
-csync requires both sides running on the exact same time, which can
-be achieved through enterprise standard `NTP time synchronisation`_ on all
-machines.
-
-Since this strategy is rather fragile without NTP, ownCloud 4.5 introduced a
-unique number, which changes whenever the file changes. Although it is a unique
-value, it is not a hash of the file, but a randomly chosen number, which it will
-transmit in the Etag_ field. The client will store this number in a
-per-directory database, located in the application directory (version 1.1) or
-as a hidden file right in the directory to be synced (later versions).
-Since the file number is guaranteed to change if the file changes, it can now be
-used to determine if one of the files has changed.
-
-.. todo:: describe what happens if both sides change
-
-If the per-directory database gets removed, oCC's CSync backend will fall back
-to a time-stamp based sync process to rebuild the database. Thus it should be
-made sure that both server and client synchronized to NTP time before
-restarting the client after a database removal. If time deviates, the sync
-process might create faux conflict files, which only differ in their time.
-Those need to be cleaned up manually later on and will not be synced back
-to the server. However, no files will get deleted in this process.
-  
-Just like files, directories also hold a unique id, which changes whenever
-one of the contained files or directories gets modified. Since this is a
-recursive process, it significantly reduces the effort required for a sync
-cycle, because the client will only walk directories with a modified unique id.
-
-.. note:: oCC 1.1 and newer require file ID capabilities on the ownCloud server,
-  hence using them with a server earlier than 4.5.0 is not supported.
-
-This table outlines the different sync methods attempted depending
-on server/client combination:
-
-.. index:: compatiblity table
-
-+--------------------+-------------------+----------------------------+
-| Server Version     | Client Version    | Sync Methods               |
-+====================+===================+============================+
-| 4.0.x or earlier   | 1.0.5 or earlier  | Time Stamp                 |
-+--------------------+-------------------+----------------------------+
-| 4.0.x or earlier   | 1.1 or later      | n/a (incompatible)         |
-+--------------------+-------------------+----------------------------+
-| 4.5 or later       | 1.0.5 or earlier  | Time Stamp                 |
-+--------------------+-------------------+----------------------------+
-| 4.5 or later       | 1.1 or later      | File ID, Time Stamp        |
-+--------------------+-------------------+----------------------------+
-
-It is highly recommended to upgrade to ownCloud 4.5 or later with ownCloud
-Client 1.1 or later, since the time stamp-based sync mechanism can
-lead to data loss in certain edge-cases, especially when multiple clients
-are involved and one of them is not in sync with NTP time.
-
-.. _`NTP time synchronisation`: http://en.wikipedia.org/wiki/Network_Time_Protocol
-.. _Etag: http://en.wikipedia.org/wiki/HTTP_ETag
-

doc/building.rst

@@ -1,164 +0,0 @@
-Building the Client
-===================
-
-This section explains how to build the ownCloud Client from source
-for all major platforms. You should read this section if you want
-to development on the desktop client.
-
-Linux
------
-
-1. Add the `ownCloud repository from OBS`_.
-2. Install the dependencies (as root, or via sudo):
-
-  * Debian/Ubuntu: ``apt-get update; apt-get build-dep owncloud-client``
-  * openSUSE: ``zypper ref; zypper si -d owncloud-client``
-  * Fedora/CentOS: ``yum install yum-utils; yum-builddep owncloud-client``
-
-3. Follow the `generic build instructions`_.
-
-Mac OS X
---------
-
-Follow the `generic build instructions`_.
-
-You can install the missing dependencies via MacPorts_ or Homebrew_.
-This is only needed on the build machine, since non-standard libs
-will be deployed in the app bundle.
-
-The only exception to this rule is libiniparser_, which lacks a decent
-build system. If you are using Homebrew_, you can just add it::
-
-  brew tap dschmidt/owncloud
-  brew install iniparser
-
-Otherwise, you need to copy the header and lib files to
-``/usr/local/include`` and ``/usr/local/lib`` respectively.
-
-.. note::
-  You should not call ``make install`` at any time, since the product of the
-  mirall build is an app bundle. Call ``make package`` instead to create an
-  install-ready disk image.
-
-Windows (cross-compile)
------------------------
-
-Due to the amount of dependencies that csync entails, building the client
-for Windows is **currently only supported on openSUSE**, by using the MinGW
-cross compiler. You can set up openSUSE 12.1 or 12.2 in a virtual machine
-if you do not have it installed already.
-
-In order to cross-compile, the following repositories need to be added
-via YaST or ``zypper ar`` (adjust when using openSUSE 12.2)::
-
-  http://download.opensuse.org/repositories/isv:/ownCloud:/devel:/mingw:/win32/openSUSE_12.1/
-  http://download.opensuse.org/repositories/windows:/mingw/openSUSE_12.1/
-  http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_12.1/
-
-Next, install the cross-compiler packages and the cross-compiled dependencies::
-
-  zypper si -d mingw32-csync
-  zypper install kdewin-png2ico mingw32-libqt4 mingw32-libqt4-devel \
-                 mingw32-libgcrypt mingw32-libgnutls mingw32-libneon \
-                 mingw32-libbeecrypt mingw32-libopenssl mingw32-openssl \
-                 mingw32-libpng-devel mingw32-libsqlite mingw32-qtkeychain \
-                 mingw32-qtkeychain-devel mingw32-iniparser mingw32-dlfcn
-
-For the installer, the NSIS installer package is also required::
-
-  zypper install mingw32-cross-nsis
-
-..  Usually, the following would be needed as well, but due to a bug in mingw, they
-    will currently not build properly from source.
-
-    mingw32-cross-nsis-plugin-processes mingw32-cross-nsis-plugin-uac
-
-You will also need to manually download and install the following files with
-``rpm -ivh <package>`` (They will also work with OpenSUSE 12.2)::
-
-http://pmbs.links2linux.org/download/mingw:/32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-processes-0-1.1.x86_64.rpm
-http://pmbs.links2linux.org/download/mingw:/32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-uac-0-3.1.x86_64.rpm
-
-Now, follow the `generic build instructions`_, but pay attention to
-the following differences:
-
-1. For building ``libocsync``, you need to use ``mingw32-cmake`` instead
-   of cmake.
-2. Also, you need to specify *absolute pathes* for ``CSYNC_LIBRARY_PATH``
-   and ``CSYNC_LIBRARY_PATH`` when running ``cmake`` on mirall.
-3. for building ``mirall``, you need to use ``cmake`` again, but make sure
-   to append the following parameter::
-
-  ``-DCMAKE_TOOLCHAIN_FILE=../mirall/admin/win/Toolchain-mingw32-openSUSE.cmake``
-
-Finally, just build by running ``make``. ``make package`` will produce
-an NSIS-based installer, provided the NSIS mingw32 packages are installed.
-
-Generic Build Instructions
---------------------------
-.. _`generic build instructions`
-
-The ownCloud Client requires Mirall and CSync_. Mirall is the GUI frontend,
-while CSync is responsible for handling the actual synchronization process.
-
-At the moment, ownCloud Client requires a forked version of CSync. Both
-CMake and Mirall can be downloaded at ownCloud's `Client Download Page`_.
-
-If you want to build the leading edge version of the client, you should
-use the latest versions of Mirall and CSync via Git_, like so::
-
-  git clone git://git.csync.org/users/freitag/csync.git ocsync
-  git clone git://github.com/owncloud/mirall.git
-
-Next, create build directories::
-
-  mkdir ocsync-build
-  mkdir mirall-build
-
-This guide assumes that all directories are residing next to each other.
-Next, make sure to check out the 'dav' branch in the newly checked out
-`ocsync` directory::
-
-  cd ocsync
-  git checkout dav
-
-The first package to build is CSync::
-
-  cd ocsync-build
-  cmake -DCMAKE_BUILD_TYPE="Debug" ../ocsync
-  make
-
-You probably have to satisfy some dependencies. Make sure to install all the
-needed development packages. You will need ``iniparser``, ``sqlite3`` as well as
-``neon`` for the ownCloud module. Take special care about ``neon``. If that is
-missing, the cmake run will succeed but silently not build the ownCloud module.
-``libssh`` and ``libsmbclient`` are optional and not required for the client
-to work. If you want to install the client, run ``make install`` as a final step.
-
-Next, we build mirall::
-
-  cd ../mirall-build
-  cmake -DCMAKE_BUILD_TYPE="Debug" ../mirall \
-        -DCSYNC_BUILD_PATH=/path/to/ocsync-build \
-        -DCSYNC_INCLUDE_PATH=/path/to/ocsync/src
-
-Note that it is important to use absolute pathes for the include- and library
-directories. If this succeeds, call ``make``. The owncloud binary should appear
-in the ``bin`` directory. You can also run ``make install`` to install the client to
-``/usr/local/bin``.
-
-To build in installer (requires the mingw32-cross-nsis packages)::
-
-  make package
-
-Known cmake parameters:
-
-* WITH_DOC=TRUE: create doc and manpages via running ``make``; also adds install statements to be able to install it via ``make install``.
-
-.. _`ownCloud repository from OBS`: http://software.opensuse.org/download/package?project=isv:ownCloud:devel&package=owncloud-client
-.. _CSync: http://www.csync.org
-.. _`Client Download Page`: http://owncloud.org/sync-clients/
-.. _Git: http://git-scm.com
-.. _MacPorts: http://www.macports.org
-.. _Homebrew: http://mxcl.github.com/homebrew/
-.. _libiniparser: http://ndevilla.free.fr/iniparser/

doc/conf.py.in

@@ -1,290 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# ownCloud Documentation documentation build configuration file, created by
-# sphinx-quickstart on Mon Oct 22 23:16:40 2012.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.todo']
-
-# Add any paths that contain templates here, relative to this directory.
-#templates_path = ['templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'ownCloud Client Manual'
-copyright = u'2012, The ownCloud developers'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '@VERSION_MAJOR@.@VERSION_MINOR@'
-# The full version, including alpha/beta/rc tags.
-release = '@VERSION@'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-2
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = ['themes']
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#html_theme = 'bootstrap'
-html_theme = 'default'
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-html_short_title = "Client Manual"
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-html_show_sphinx = False
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'ownCloudClientManual'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'ownCloudClientManual.tex', u'ownCloud Client Manual',
-   u'The ownCloud developers', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('owncloud.1', 'owncloud', u'File synchronisation desktop utility.',
-     [u'The ownCloud developers'], 1),
-    ('mirall.1', 'mirall', u'File synchronisation desktop utility.',
-     [u'The ownCloud developers'], 1)
-]
-
-# If true, show URL addresses after external links.
-man_show_urls = True
-
-
-# -- Options for Texinfo output ------------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'ownCloudClientManual', u'ownCloud Client Manual',
-   u'The ownCloud developers', 'ownCloud', 'The ownCloud Client Manual.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
-
-
-# -- Options for Epub output ---------------------------------------------------
-
-# Bibliographic Dublin Core info.
-epub_title = u'ownCloud Client Manual'
-epub_author = u'The ownCloud developers'
-epub_publisher = u'The ownCloud developers'
-epub_copyright = u'2012, The ownCloud developers'
-
-# The language of the text. It defaults to the language option
-# or en if the language is not set.
-#epub_language = ''
-
-# The scheme of the identifier. Typical schemes are ISBN or URL.
-#epub_scheme = ''
-
-# The unique identifier of the text. This can be a ISBN number
-# or the project homepage.
-#epub_identifier = ''
-
-# A unique identification for the text.
-#epub_uid = ''
-
-# A tuple containing the cover image and cover page html template filenames.
-#epub_cover = ()
-
-# HTML files that should be inserted before the pages created by sphinx.
-# The format is a list of tuples containing the path and title.
-#epub_pre_files = []
-
-# HTML files shat should be inserted after the pages created by sphinx.
-# The format is a list of tuples containing the path and title.
-#epub_post_files = []
-
-# A list of files that should not be packed into the epub file.
-#epub_exclude_files = []
-
-# The depth of the table of contents in toc.ncx.
-#epub_tocdepth = 3
-
-# Allow duplicate toc entries.
-#epub_tocdup = True
-
-# Include todos?
-todo_include_todos = True

doc/conffile.rst

@@ -1,31 +0,0 @@
-ownCloud Client reads a configuration file.
-
-On Linux it can be found in:
-        ``$HOME/.local/share/data/ownCloud/owncloud.cfg``
-
-On Windows it can be found in:
-        ``%LOCALAPPDATA%\ownCloud\owncloud.cfg``
-
-On Mac it can be found in:
-        ``$HOME/Library/Application Support/ownCloud``
-
-
-It contains settings in the ini file format known from Windows. 
-
-.. note:: Changes here should be done carefully as wrong settings can cause disfunctionality.
-
-.. note:: Changes may be overwritten by using ownCloud's configuration dialog.
-
-.. note:: The new version is less precise in this regard.
-
-These are config settings that may be changed:
-
-``remotePollinterval`` (default: ``30000``)
-        Poll time for the remote repository in milliseconds
-
-``maxLogLines`` (default:  ``20000``)
-        Maximum count of log lines shown in the log window
-
-``remotePollinterval``
-        The frequency used for polling for remote changes on the ownCloud Server.
-

doc/glossary.rst

@@ -1,28 +0,0 @@
-Glossary
-========
-
-.. glossary::
-   :sorted:
-
-   ownCloud Client
-   oCC
-     Name of the official ownCloud syncing client for desktop, which runs on
-     Windows, Mac OS X and Linux. It is based Mirall, and uses the CSync
-     sync engine for synchronization with the ownCloud server.
-
-   ownCloud Server
-     The server counter part of ownCloud Client as provided by the ownCloud
-     community.
-
-   mtime
-   modification time
-   file modification time
-     File property used to determine whether the servers' or the clients' file
-     is more recent. Standard procedure in oCC 1.0.5 and earlier, used by
-     oCC 1.1 and later only when no sync database exists and files already
-     exist in the client directory.
-
-   unique id
-     ID assigned to every file starting with ownCloud server 4.5 and submitted
-     via the HTTP ``Etag``. Used to check if files on client and server have
-     changed.

doc/index.rst

@@ -1,15 +0,0 @@
-.. _contents:
-
-Contents
-========
-
-.. toctree::
-   :maxdepth: 2
-
-   install
-   usage 
-   building 
-   architecture
-   troubleshooting
-   glossary 
-

doc/install.rst

@@ -1,36 +0,0 @@
-Installation
-============
-
-General
--------
-
-The latest version of ownCloud client can be obtained at
-http://owncloud.org/sync-clients/.
-
-Windows
--------
-
-ownCloud client for Windows is provided as a NSIS-based setup file for
-machine-wide install.
-
-Mac OS X
---------
-
-Installing the ownCloud client on your Mac follows the normal app installation
-pattern: 
-
-1. Download the installation file Click ownCloud-1.1.1.dmg, a window with the
-2. ownCloud icon opens In that window, drag the ownCloud application into the
-3. ‘Applications’ folder on the right hand side From ‘Applications’, choose
-   ownCloud
-
-Linux
-------
-
-The ownCloud client is provided as in a convenient repository for a wide range
-of popular Linux distributions. If you want to build the sources instead.
-
-Supported distributions are CentOS/RHEL, Fedora, SLES, openSUSE, Ubuntu and
-Debian.
-
-To support other distributions, a source build is required.

doc/make.bat

@@ -1,190 +0,0 @@
-@ECHO OFF
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-set I18NSPHINXOPTS=%SPHINXOPTS% .
-if NOT "%PAPER%" == "" (
-	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
-	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
-)
-
-if "%1" == "" goto help
-
-if "%1" == "help" (
-	:help
-	echo.Please use `make ^<target^>` where ^<target^> is one of
-	echo.  html       to make standalone HTML files
-	echo.  dirhtml    to make HTML files named index.html in directories
-	echo.  singlehtml to make a single large HTML file
-	echo.  pickle     to make pickle files
-	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and a HTML help project
-	echo.  qthelp     to make HTML files and a qthelp project
-	echo.  devhelp    to make HTML files and a Devhelp project
-	echo.  epub       to make an epub
-	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	echo.  text       to make text files
-	echo.  man        to make manual pages
-	echo.  texinfo    to make Texinfo files
-	echo.  gettext    to make PO message catalogs
-	echo.  changes    to make an overview over all changed/added/deprecated items
-	echo.  linkcheck  to check all external links for integrity
-	echo.  doctest    to run all doctests embedded in the documentation if enabled
-	goto end
-)
-
-if "%1" == "clean" (
-	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
-	del /q /s %BUILDDIR%\*
-	goto end
-)
-
-if "%1" == "html" (
-	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
-	goto end
-)
-
-if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
-	goto end
-)
-
-if "%1" == "singlehtml" (
-	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
-	goto end
-)
-
-if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the pickle files.
-	goto end
-)
-
-if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the JSON files.
-	goto end
-)
-
-if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run HTML Help Workshop with the ^
-.hhp project file in %BUILDDIR%/htmlhelp.
-	goto end
-)
-
-if "%1" == "qthelp" (
-	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run "qcollectiongenerator" with the ^
-.qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\OwncloudDocumentation.qhcp
-	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\OwncloudDocumentation.ghc
-	goto end
-)
-
-if "%1" == "devhelp" (
-	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished.
-	goto end
-)
-
-if "%1" == "epub" (
-	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The epub file is in %BUILDDIR%/epub.
-	goto end
-)
-
-if "%1" == "latex" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "text" (
-	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The text files are in %BUILDDIR%/text.
-	goto end
-)
-
-if "%1" == "man" (
-	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The manual pages are in %BUILDDIR%/man.
-	goto end
-)
-
-if "%1" == "texinfo" (
-	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
-	goto end
-)
-
-if "%1" == "gettext" (
-	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
-	goto end
-)
-
-if "%1" == "changes" (
-	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.The overview file is in %BUILDDIR%/changes.
-	goto end
-)
-
-if "%1" == "linkcheck" (
-	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Link check complete; look for any errors in the above output ^
-or in %BUILDDIR%/linkcheck/output.txt.
-	goto end
-)
-
-if "%1" == "doctest" (
-	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of doctests in the sources finished, look at the ^
-results in %BUILDDIR%/doctest/output.txt.
-	goto end
-)
-
-:end

doc/mirall.1.rst

@@ -1,38 +0,0 @@
-mirall(1)
----------
-
-SYNOPSIS
-========
-
-*mirall* [`OPTIONS`...]
-
-
-DESCRIPTION
-===========
-
-mirall is a file synchronisation desktop utility.
-It synchronizes files on your local machine with an ownCloud Server. If you
-make a change to the files on one computer, it will flow across the others
-using this desktop sync clients.
-
-Normally you start the client by click on the desktop icon or start from the
-application menu. After starting an ownCloud icon appears in the system tray.
-
-Options
-=======
-.. include:: options.rst
-
-Config File
-===========
-.. include:: conffile.rst
-
-BUGS
-====
-
-Please report bugs at https://github.com/owncloud/core/issues.
-
-
-SEE ALSO
-========
-`csync(1)`, `mirall(1)`
-

doc/options.rst

@@ -1,15 +0,0 @@
-ownCloud Client supports the following command line switches:
-
-``--logwindow``
-        open a window to show log output at startup.
-
-``--logfile`` `<filename>`
-        write log output to file.
-
-``--flushlog``
-        flush the log file after every write.
-
-``--monoicons``
-        Use black/white pictograms for systray.
-
-

doc/owncloud.1.rst

@@ -1,37 +0,0 @@
-owncloud(1)
------------
-
-
-SYNOPSIS
-========
-*owncloud* [`OPTIONS`...]
-
-
-DESCRIPTION
-===========
-owncloud is a file synchronisation desktop utility it is based on mirall.
-It synchronizes files on your local machine with an ownCloud Server. If you
-make a change to the files on one computer, it will flow across the others
-using this desktop sync clients.
-
-Normally you start the client by click on the desktop icon or start from the
-application menu. After starting an ownCloud icon appears in the system tray.
-
-Options
-=======
-.. include:: options.rst
-
-Config File
-===========
-.. include:: conffile.rst
-
-BUGS
-====
-
-Please report bugs at https://github.com/owncloud/core/issues.
-
-
-SEE ALSO
-========
- `csync(1)`, `mirall(1)`
-

doc/scripts/README.rst

@@ -1,12 +0,0 @@
-Doc Build Convenience Scripts
-=============================
-
-* ``htmlhelp.sh``: A script to install Microsoft HTML Workshop on Linux or Mac OS using Wine, along with some dependencies.
-* ``htmlhelp.reg``: Registry file to override some DLLs with their native version and set the right Windows version.
-
-Those files have been taken from the HTML Help Project (http://code.google.com/p/htmlhelp/wiki/HHW4Wine).
-
-License
--------
-
-The HTML Help Project has licensed its software under LGPLv3 terms.

doc/scripts/htmlhelp.reg

@@ -1,12 +0,0 @@
-REGEDIT4
-
-[HKEY_CURRENT_USER\Software\Wine]
-"Version"="win2k"
-
-[HKEY_CURRENT_USER\Software\Wine\AppDefaults\hhc.exe\DllOverrides]
-"itircl"="native"
-"itss"="native"
-
-[HKEY_CURRENT_USER\Software\Wine\AppDefaults\hhw.exe\DllOverrides]
-"itircl"="native"
-"itss"="native"

doc/scripts/htmlhelp.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-WINEPREFIX=${WINEPREFIX:=$HOME/.wine}
-
-test -d "$WINEPREFIX" || wineprefixcreate
-
-# Setup the registry
-wine regedit htmlhelp.reg
-
-# Install HTML Help Workshop
-wget 'http://go.microsoft.com/fwlink/?LinkId=14188' -O htmlhelp.exe
-wine htmlhelp.exe
-
-# Install ITSS.DLL
-cabextract -F hhupd.exe htmlhelp.exe
-cabextract -F itircl.dll hhupd.exe
-cabextract -F itss.dll hhupd.exe
-cp -a itircl.dll "$WINEPREFIX/drive_c/windows/system32/"
-cp -a itss.dll "$WINEPREFIX/drive_c/windows/system32/"
-wine regsvr32 /s 'C:\WINDOWS\SYSTEM32\itircl.dll'
-wine regsvr32 /s 'C:\WINDOWS\SYSTEM32\itss.dll'
-
-# Install MFC40.DLL
-wget -N http://activex.microsoft.com/controls/vc/mfc40.cab
-cabextract -F mfc40.exe mfc40.cab
-cabextract -F mfc40.dll mfc40.exe
-cp -a mfc40.dll "$WINEPREFIX/drive_c/windows/system32/"

doc/troubleshooting.rst

@@ -1,42 +0,0 @@
-Troubleshooting
-===============
-
-:All of my desktop clients fail to connect to ownCloud:
-  Verify that you can log on to ownClouds WebDAV server. Assuming your ownCloud
-  instance is installed at ``http://yourserver.com/owncloud``, type
-  ``http://yourserver.com/owncloud/remote.php/webdav`` into your browsers
-  address bar.
-
-  If you are not prompted to enter your user name and password, please verify
-  that your server installation is working correctly.
-
-  If you are prompted, but the authentication fails even though the credentials
-  your provided are correct, please ensure that your authentication backend
-  is configured properly.
-
-  A more sophisticated test is to use a WebDAV command line client and log
-  into the ownCloud WebDAV server, such as a little app called cadaver, available
-  on Linux. I can be used to further verify that the WebDAV server is running
-  properly, for example by performing PROPFIND calls:
-
-  ``propget .`` called within cadaver will return some properties of the current
-  directory and thus be a successful WebDAV connect.
-
-:The desktop client fails for an unknown reason:
-  Start the client with ``--logwindow``. You can also open a log window for an
-  already running session, by simply starting the client again with this
-  parameter. Syntax:
-
-  * Windows: ``C:\Program Files (x86)\ownCloud\owncloud.exe --logwindow``
-  * Mac OS X: ``/Applications/owncloud.app/Contents/MacOS/owncloud --logwindow``
-  * Linux: ``owncloud --logwindow``
-
-  The log output can help you with tracking down problem, and if you report
-  a bug, it's useful to include the output.
-
-  Also, please take a look at your webservers error log file to check if there
-  are problems. For apache on linux, the error logs usually can be found at
-  ``/var/log/apache2``. A file called ``error_log`` shows errors like PHP code
-  problems. A file called ``access_log`` usually records all requests handled
-  by the server. More information about the apache logging can be found at
-  ``http://httpd.apache.org/docs/current/logs.html``.

doc/usage.rst

@@ -1,24 +0,0 @@
-Usage
-=====
-.. index:: usage, client sync usage
-
-To start ownCloud Client, click on the desktop icon or start it from the
-application menu. In the system tray, an ownCloud icon appears.
-
-.. index:: start application
-
-A left click on the tray icon open a status dialog which gives an overview on
-the configured sync folders and allows to add and remove more sync folder
-connections as well as pausing a sync connection.
-
-A right click on the tray icon gives other configuration options.
-
-Options
--------
-.. index:: command line switches, command line, options, parameters
-.. include:: options.rst
-
-Config File
------------
-.. index:: config file
-.. include:: conffile.rst

exclude.lst

@@ -2,7 +2,6 @@
 *~
 *.bak
 *.part
-*.crdownload
 
 *.unison*
 *csync_timedif.ctmp*
@@ -20,17 +19,5 @@ Thumbs.db
 *.out
 *.toc
 
-*_conflict-*
 
-.Temporary Items
-.Trashes
-.Document Revisions-V100
-.fseventd
-.apdisk
 
-.htaccess
-
-Icon\r*
-
-~$*
-.~lock.*

issue_template.md

@@ -1,48 +0,0 @@
-### Expected behaviour
-Tell us what should happen
-
-### Actual behaviour
-Tell us what happens instead
-
-### Steps to reproduce
-1. 
-2. 
-3. 
-
-### Server configuration
-Operating system:
-
-Web server: 
-
-Database:
-
-PHP version:
-
-ownCloud version:
-
-### Client configuration
-Client version:
-
-Operating system:
-
-OS language:
-
-Installation path of client:
-
-### Logs
-
-#### output of `owncloud --logwindow` or `owncloud --logfile log.txt`
-```
-Insert your log output here
-```
-
-#### Web server error log
-```
-Insert your webserver log here
-```
-
-#### ownCloud log (data/owncloud.log)
-```
-Insert your ownCloud log here
-```
-

mirall.desktop.in

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-GenericName=Folder Sync
-Icon=@APPLICATION_SHORTNAME@

mirall.qrc

@@ -1,16 +1,34 @@
 <RCC>
     <qresource prefix="/mirall">
+        <file>resources/mirall-32.png</file>
+        <file>resources/mirall-64.png</file>
+        <file>resources/mirall-128.png</file>
+        <file>resources/folder-grey-32.png</file>
+        <file>resources/folder-remote-32.png</file>
+        <file>resources/folder-grey-22.png</file>
+        <file>resources/folder-remote-22.png</file>
+        <file>resources/mirall-22.png</file>
+        <file>resources/mirall-48.png</file>
+        <file>resources/folder-grey-48.png</file>
+        <file>resources/folder-remote-48.png</file>
         <file>resources/dialog-close.png</file>
         <file>resources/dialog-ok.png</file>
         <file>resources/dialog-cancel.png</file>
-        <file>resources/folder-remote-32.png</file>
-        <file>resources/folder-remote.png</file>
-        <file>resources/folder-sync.png</file>
-        <file>resources/folder-grey.png</file>
-        <file>resources/mirall-32.png</file>
-        <file>resources/mirall-128.png</file>
-        <file>resources/mirall-48.png</file>
-        <file>resources/task-ongoing.png</file>
         <file>resources/view-refresh.png</file>
+        <file>resources/folder-favorites.png</file>
+        <file>resources/folder-sync-48.png</file>
+        <file>resources/folder-important.png</file>
+        <file>resources/folder-grey.png</file>
+        <file>resources/owncloud_splash.png</file>
+        <file>resources/task-ongoing.png</file>
+
+
+        <file>resources/owncloud-icon-32.png</file>
+        <file>resources/owncloud-icon-48.png</file>
+        <file>resources/owncloud-icon-framed-64.png</file>
+        <file>resources/owncloud-icon-sync-48.png</file>
+        <file>resources/owncloud-icon-error-48.png</file>
+        <file>resources/owncloud-icon-sync-ok-48.png</file>
+
     </qresource>
 </RCC>

src/CMakeLists.txt

@@ -3,13 +3,6 @@ include(${QT_USE_FILE})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 QT4_ADD_RESOURCES ( MIRALL_RC_SRC ../mirall.qrc)
-if ( DEFINED OEM_THEME_DIR)
-    QT4_ADD_RESOURCES ( MIRALL_RC_SRC ${OEM_THEME_DIR}/theme.qrc)
-    set(theme_dir ${OEM_THEME_DIR}/theme)
-else()
-    QT4_ADD_RESOURCES ( MIRALL_RC_SRC ../theme.qrc)
-    set(theme_dir ${CMAKE_CURRENT_SOURCE_DIR}/../theme)
-endif()
 
 set(mirall_UI
 mirall/folderwizardsourcepage.ui
@@ -23,9 +16,9 @@ mirall/createanowncloudpage.ui
 mirall/owncloudftpaccesspage.ui
 mirall/owncloudwizardresultpage.ui
 mirall/owncloudcredentialspage.ui
-mirall/sslerrordialog.ui
+mirall/sslerrorsdialog.ui
 mirall/proxydialog.ui
-mirall/fileitemdialog.ui
+mirall/passworddialog.ui
 )
 
 set(3rdparty_SRC
@@ -64,11 +57,11 @@ set(libsync_SRCS
     mirall/folderman.cpp
     mirall/folder.cpp
     mirall/folderwatcher.cpp
+    mirall/gitfolder.cpp
     mirall/syncresult.cpp
     mirall/unisonfolder.cpp
     mirall/networklocation.cpp
     mirall/mirallconfigfile.cpp
-    mirall/credentialstore.cpp
     mirall/csyncfolder.cpp
     mirall/owncloudfolder.cpp
     mirall/csyncthread.cpp
@@ -76,77 +69,39 @@ set(libsync_SRCS
     mirall/theme.cpp
     mirall/owncloudtheme.cpp
     mirall/miralltheme.cpp
-    mirall/owncloudinfo.cpp
-    mirall/logger.cpp
-    mirall/utility.cpp
 )
 set(libsync_HEADERS 
     mirall/folderman.h
     mirall/folder.h
     mirall/folderwatcher.h
+    mirall/gitfolder.h
     mirall/unisonfolder.h
     mirall/csyncfolder.h
     mirall/owncloudfolder.h
     mirall/csyncthread.h
-    mirall/owncloudinfo.h
-    mirall/credentialstore.h
-    mirall/logger.h
 )
 
 IF( INOTIFY_FOUND )
     set(libsync_SRCS ${libsync_SRCS} mirall/inotify.cpp)
-    set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_inotify.cpp)
     set(libsync_HEADERS ${libsync_HEADERS} mirall/inotify.h)
-    set(libsync_HEADERS ${libsync_HEADERS} mirall/folderwatcher_inotify.h)
 ENDIF()
-IF( WIN32 ) 
-    set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_win.cpp)
-    set(libsync_HEADERS ${libsync_HEADERS} mirall/folderwatcher_win.h)
-ENDIF()
-IF( APPLE )
-    set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_mac.cpp)
-ENDIF()
-
 
 qt4_wrap_cpp(syncMoc ${libsync_HEADERS})
 
-list(APPEND libsync_LINK_TARGETS
-    ${QT_LIBRARIES}
-    ${CSYNC_LIBRARY}
-    dl
-)
-
-if(QTKEYCHAIN_FOUND)
-    list(APPEND libsync_LINK_TARGETS ${QTKEYCHAIN_LIBRARY})
-    include_directories(${QTKEYCHAIN_INCLUDE_DIR})
-endif()
-
+add_library(mirallsync   SHARED ${libsync_SRCS} ${syncMoc})
 add_library(owncloudsync SHARED ${libsync_SRCS} ${syncMoc})
 set_target_properties( owncloudsync PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT)
-set_target_properties( owncloudsync  PROPERTIES
-	VERSION ${VERSION}
-	SOVERSION ${SOVERSION}
-)
-
-target_link_libraries(owncloudsync ${libsync_LINK_TARGETS} )
-
-if ( APPLE )
-    target_link_libraries(owncloudsync /System/Library/Frameworks/CoreServices.framework)
-endif()
+target_link_libraries(mirallsync ${QT_LIBRARIES} ${CSYNC_LIBRARY} )
+target_link_libraries(owncloudsync ${QT_LIBRARIES} ${CSYNC_LIBRARY} )
 
 if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
-    install(TARGETS owncloudsync
+    install(TARGETS mirallsync owncloudsync
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     )
-    if(NOT WIN32)
-        configure_file(${CMAKE_SOURCE_DIR}/mirall.desktop.in
-                       ${APPLICATION_SHORTNAME}.desktop)
-        install(FILES  ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_SHORTNAME}.desktop DESTINATION share/applications )
-    endif()
 else()
-    install(TARGETS owncloudsync DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS)
+    install(TARGETS mirallsync owncloudsync DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS)
 endif()
 
 set(mirall_SRCS
@@ -155,17 +110,21 @@ set(mirall_SRCS
     mirall/statusdialog.cpp
     mirall/owncloudwizard.cpp
     mirall/owncloudsetupwizard.cpp
+    mirall/owncloudinfo.cpp
     mirall/updatedetector.cpp
     mirall/occinfo.cpp
     mirall/sslerrordialog.cpp
     mirall/logbrowser.cpp
     mirall/proxydialog.cpp
-    mirall/fileitemdialog.cpp
+    mirall/encryption.cpp
+    mirall/keymanager.cpp
+    mirall/passworddialog.cpp
 )
 
 set(mirall_HEADERS
     mirall/application.h
     mirall/folderwizard.h
+    mirall/owncloudinfo.h
     mirall/owncloudsetupwizard.h
     mirall/owncloudwizard.h
     mirall/statusdialog.h
@@ -173,7 +132,9 @@ set(mirall_HEADERS
     mirall/sslerrordialog.h
     mirall/logbrowser.h
     mirall/proxydialog.h
-    mirall/fileitemdialog.h
+    mirall/encryption.h
+    mirall/keymanager.h
+    mirall/passworddialog.h
 )
 
 if( UNIX AND NOT APPLE)
@@ -205,35 +166,29 @@ set( final_src
 # add executable icon on windows and osx
 include( AddAppIconMacro )
 set(ownCloud_old ${ownCloud})
-
-kde4_add_app_icon( ownCloud "${theme_dir}/colored/${APPLICATION_SHORTNAME}-icon*.png")
+kde4_add_app_icon( ownCloud "${CMAKE_CURRENT_SOURCE_DIR}/../resources/owncloud-icon-*.png") 
 list(APPEND final_src ${ownCloud})
 set(ownCloud ${ownCloud_old})
 
 if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
     set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
-if(NOT WIN32)
-    install(FILES ${CMAKE_SOURCE_DIR}/resources/mirall-48.png 
-        DESTINATION share/icons/hicolor/48x48/apps/ RENAME mirall.png)
-    install(FILES
-        ${theme_dir}/colored/${APPLICATION_SHORTNAME}-icon-48.png 
-        DESTINATION share/icons/hicolor/48x48/apps/ RENAME ${APPLICATION_SHORTNAME}.png)
-endif(NOT WIN32)
+    install(FILES ${CMAKE_SOURCE_DIR}/resources/mirall-48.png DESTINATION share/icons/hicolor/48x48/apps/ RENAME mirall.png)
+    install(FILES ${CMAKE_SOURCE_DIR}/resources/owncloud-icon-48.png DESTINATION share/icons/hicolor/48x48/apps/ RENAME owncloud.png)
 
     install(FILES ${mirall_I18N} DESTINATION share/mirall/i18n)
 
     # we may not add MACOSX_BUNDLE here, if not building one
 
-    # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src})
-    add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src})
-    set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT)
+    # add_executable(owncloud main.cpp ${final_src})
+    add_executable(owncloud WIN32 main.cpp ${final_src})
+    set_target_properties( owncloud PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT) 
 
     # mirall is not built for the bundle
     add_executable( mirall WIN32 main.cpp ${final_src})
 
     target_link_libraries(mirall ${QT_LIBRARIES} )
-    target_link_libraries(mirall owncloudsync)
+    target_link_libraries(mirall mirallsync)
     target_link_libraries(mirall ${CSYNC_LIBRARY})
 
     set_target_properties( mirall PROPERTIES
@@ -251,45 +206,36 @@ else()
     set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns")
 
     # we must add MACOSX_BUNDLE only if building a bundle
-    add_executable( ${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${final_src})
-    set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT)
+    add_executable(owncloud WIN32 MACOSX_BUNDLE main.cpp ${final_src})
+    set_target_properties( owncloud PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT)
 
     #FIXME: hardcoded path
-    if ( EXISTS ${CSYNC_BINARY_DIR}/modules/ocsync_owncloud.so )
-        install(FILES ${CSYNC_BINARY_DIR}/modules/ocsync_owncloud.so DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins)
-    else()
-        install(FILES /usr/local/lib/ocsync-0/ocsync_owncloud.so DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins)
-    endif()
+    install(FILES /usr/local/lib/csync-0/csync_owncloud.so DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins)
+    install(FILES ${mirall_I18N} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/translations)
 
-    set (QM_DIR ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/Translations)
-    install(FILES ${mirall_I18N} DESTINATION ${QM_DIR})
-    file(GLOB qt_I18N ${QT_TRANSLATIONS_DIR}/qt_??.qm ${QT_TRANSLATIONS_DIR}/qt_??_??.qm)
-    install(FILES ${qt_I18N} DESTINATION ${QM_DIR})
-    file(GLOB qtkeychain_I18N ${QT_TRANSLATIONS_DIR}/qtkeychain*.qm)
-    install(FILES ${qtkeychain_I18N} DESTINATION ${QM_DIR})
     list(APPEND dirs "/usr/local/lib")
 endif()
 
 
-set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
+set_target_properties( owncloud PROPERTIES
         RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY}
 )
-target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
-target_link_libraries( ${APPLICATION_EXECUTABLE} owncloudsync )
-target_link_libraries( ${APPLICATION_EXECUTABLE} ${CSYNC_LIBRARY} )
+target_link_libraries(owncloud ${QT_LIBRARIES} )
+target_link_libraries(owncloud owncloudsync)
+target_link_libraries(owncloud ${CSYNC_LIBRARY})
 
-install(TARGETS ${APPLICATION_EXECUTABLE}
+install(TARGETS owncloud
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION lib
         ARCHIVE DESTINATION lib
         BUNDLE  DESTINATION "."
 )
 
-#FIXME: find a nice solution to make the second if(BUILD_OWNCLOUD_OSX_BUNDLE) unnecessary
+#FIXME: find a nice solution to make the second if(BUILD_OWNCLOUD_OSX_BUNDLE) unneccessary
 # currently it needs to be done because the code right above needs to be executed no matter
 # if building a bundle or not and the install_qt4_executable needs to be called afterwards
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
-    install_qt4_executable(${OWNCLOUD_OSX_BUNDLE} "" "${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins/ocsync_owncloud.so" ${dirs})
+    install_qt4_executable(${OWNCLOUD_OSX_BUNDLE} "" "${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins/csync_owncloud.so" ${dirs})
 endif()
 
 find_program(KRAZY2_EXECUTABLE krazy2)

src/main.cpp

@@ -21,21 +21,16 @@ int main(int argc, char **argv)
     Mirall::Application app(argc, argv);
     app.initialize();
    
+    qint64 pid = -1;
+
     // if the application is already running, notify it.
     if( app.isRunning() ) {
-        QStringList args = app.arguments();
-        if ( args.size() > 1 && ! app.giveHelp() ) {
-            QString msg = args.join( QLatin1String("|") );
-            if( ! app.sendMessage( msg ) )
-                return -1;
-        }
-        return 0;
+        if( app.sendMessage( QLatin1String("A message to the master"), 5000, pid ))
+	   return 0;
     }
     // if help requested, show on command line and exit.
-    if( ! app.giveHelp() ) {
+    if( ! app.giveHelp() )
         return app.exec();
-    } else {
-        app.showHelp();
-    }
+
 }
 

src/mirall/application.h

@@ -18,7 +18,6 @@
 #include <QApplication>
 #include <QSystemTrayIcon>
 #include <QNetworkReply>
-#include <QSslError>
 
 #include "qtsingleapplication.h"
 
@@ -26,7 +25,6 @@
 #include "mirall/folder.h"
 #include "mirall/logbrowser.h"
 #include "mirall/folderman.h"
-#include "mirall/fileitemdialog.h"
 
 class QAction;
 class QMenu;
@@ -42,7 +40,6 @@ class FolderWizard;
 class StatusDialog;
 class OwncloudSetupWizard;
 class ownCloudInfo;
-class SslErrorDialog;
 class UpdateDetector;
 
 class Application : public SharedTools::QtSingleApplication
@@ -53,7 +50,6 @@ public:
     ~Application();
 
     bool giveHelp();
-    void showHelp();
 
 signals:
 
@@ -65,15 +61,10 @@ protected slots:
     void slotInfoFolder( const QString& );
     void slotConfigure();
     void slotConfigureProxy();
-    void slotParseOptions( const QString& );
-    void slotShowTrayMessage(const QString&, const QString&);
 
     void slotSyncStateChange( const QString& );
-    void slotownCloudWizardDone(int);
 protected:
 
-    void parseOptions(const QStringList& );
-    void setupTranslations();
     void setupActions();
     void setupSystemTray();
     void setupContextMenu();
@@ -87,21 +78,17 @@ protected slots:
     void slotTrayClicked( QSystemTrayIcon::ActivationReason );
     void slotFolderOpenAction(const QString & );
     void slotOpenOwnCloud();
-    void slotStartFolderSetup(int result = QDialog::Accepted); // defaulting to Accepted
+    void slotStartFolderSetup(int result = 1); // defaulting to Accepted
     void slotOwnCloudFound( const QString&, const QString&, const QString&, const QString& );
     void slotNoOwnCloudFound( QNetworkReply* );
     void slotCheckAuthentication();
     void slotAuthCheck( const QString& ,QNetworkReply* );
     void slotOpenLogBrowser();
-    void slotAbout();
-    void slotSSLFailed( QNetworkReply *reply, QList<QSslError> errors );
-    void slotFetchCredentials();
-    void slotCredentialsFetched( bool );
+
     void slotStartUpdateDetector();
 
 private:
-    void setHelp();
-    void raiseDialog( QWidget* );
+    void showHelp();
 
     // configuration file -> folder
     QSystemTrayIcon *_tray;
@@ -111,7 +98,6 @@ private:
     QAction *_actionConfigure;
     QAction *_actionOpenoC;
     QAction *_actionConfigureProxy;
-    QAction *_actionAbout;
 
 #if QT_VERSION >= 0x040700
     QNetworkConfigurationManager *_networkMgr;
@@ -119,12 +105,10 @@ private:
 
     FolderWizard  *_folderWizard;
     OwncloudSetupWizard *_owncloudSetupWizard;
-    SslErrorDialog *_sslErrorDialog;
 
     // tray's menu
     QMenu *_contextMenu;
     StatusDialog *_statusDialog;
-    FileItemDialog *_fileItemDialog;
 
     FolderMan *_folderMan;
     Theme *_theme;
@@ -132,10 +116,7 @@ private:
     UpdateDetector *_updateDetector;
     QMap<QString, QString> _overallStatusStrings;
     LogBrowser *_logBrowser;
-    QString _logFile;
-    bool _showLogWindow;
-    bool _logFlush;
-    bool _helpOnly;
+    bool        _helpOnly;
 };
 
 } // namespace Mirall

src/mirall/credentialstore.cpp

@@ -1,402 +0,0 @@
-/*
- * Copyright (C) by Klaas Freitag <freitag@owncloud.com>
- *
- * 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; version 2 of the License.
- *
- * 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.
- */
-
-#include <QtGui>
-#include <QInputDialog>
-
-#include "config.h"
-
-#include "mirall/credentialstore.h"
-#include "mirall/mirallconfigfile.h"
-#include "mirall/theme.h"
-
-#ifdef WITH_QTKEYCHAIN
-#include <qtkeychain/keychain.h>
-using namespace QKeychain;
-#endif
-
-#define MAX_LOGIN_ATTEMPTS 3
-
-namespace Mirall {
-
-CredentialStore *CredentialStore::_instance=0;
-CredentialStore::CredState CredentialStore::_state = NotFetched;
-QString CredentialStore::_passwd   = QString::null;
-QString CredentialStore::_user     = QString::null;
-QString CredentialStore::_url      = QString::null;
-QString CredentialStore::_errorMsg = QString::null;
-int     CredentialStore::_tries    = 0;
-#ifdef WITH_QTKEYCHAIN
-CredentialStore::CredentialType CredentialStore::_type = KeyChain;
-#else
-CredentialStore::CredentialType CredentialStore::_type = Settings;
-#endif
-
-CredentialStore::CredentialStore(QObject *parent) :
-    QObject(parent)
-{
-}
-
-CredentialStore *CredentialStore::instance()
-{
-    if( !CredentialStore::_instance ) CredentialStore::_instance = new CredentialStore;
-    return CredentialStore::_instance;
-}
-
-QString CredentialStore::password() const
-{
-    return _passwd;
-}
-QString CredentialStore::user() const
-{
-    return _user;
-}
-
-CredentialStore::CredState CredentialStore::state()
-{
-    return _state;
-}
-
-bool CredentialStore::canTryAgain()
-{
-    bool canDoIt = false;
-
-    if( _tries > MAX_LOGIN_ATTEMPTS ) {
-        qDebug() << "canTryAgain: Max attempts reached.";
-        return false;
-    }
-
-    if( _state == NotFetched ) {
-        return true;
-    }
-
-    switch( _type ) {
-    case CredentialStore::User:
-        canDoIt = true;
-        break;
-    case CredentialStore::Settings:
-        break;
-    case CredentialStore::KeyChain:
-        canDoIt = true;
-        break;
-    default:
-        break;
-    }
-    return canDoIt;
-}
-
-void CredentialStore::fetchCredentials()
-{
-    MirallConfigFile cfgFile;
-    if( ++_tries > MAX_LOGIN_ATTEMPTS ) {
-        qDebug() << "Too many attempts to enter password!";
-        _state = TooManyAttempts;
-        emit( fetchCredentialsFinished(false) );
-        return;
-    }
-
-    bool ok = false;
-    QString pwd;
-    _user = cfgFile.ownCloudUser();
-    _url  = cfgFile.ownCloudUrl();
-    if( !cfgFile.passwordStorageAllowed() ) {
-        _type = CredentialStore::User;
-    }
-
-    QString key = keyChainKey(_url);
-
-    if( key.isNull() ) {
-        qDebug() << "Can not fetch credentials, url is zero!";
-        _state = Error;
-        emit( fetchCredentialsFinished(false) );
-        return;
-    }
-
-    switch( _type ) {
-    case CredentialStore::User: {
-        /* Ask the user for the password */
-        /* Fixme: Move user interaction out here. */
-        _state = AsyncFetching;
-        _inputDialog = new QInputDialog;
-        _inputDialog->setWindowTitle(QApplication::translate("MirallConfigFile","Password Required") );
-        _inputDialog->setLabelText( QApplication::translate("MirallConfigFile","Please enter your %1 password:")
-                .arg(Theme::instance()->appNameGUI()));
-        _inputDialog->setInputMode( QInputDialog::TextInput );
-        _inputDialog->setTextEchoMode( QLineEdit::Password );
-
-        connect(_inputDialog, SIGNAL(finished(int)), SLOT(slotUserDialogDone(int)));
-        _inputDialog->exec();
-        break;
-    }
-    case CredentialStore::Settings: {
-        /* Read from config file. */
-        _state = Fetching;
-        pwd = cfgFile.ownCloudPasswd();
-        ok = true;
-        break;
-    }
-    case CredentialStore::KeyChain: {
-        // If the credentials are here already, return.
-        if( _state == Ok ) {
-            emit(fetchCredentialsFinished(true));
-            return;
-        }
-        // otherwise fetch asynchronious.
-#ifdef WITH_QTKEYCHAIN
-        _state = AsyncFetching;
-        if( !_user.isEmpty() ) {
-            ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName());
-            job->setKey( key );
-
-            connect( job, SIGNAL(finished(QKeychain::Job*)), this,
-                     SLOT(slotKeyChainReadFinished(QKeychain::Job*)));
-            job->start();
-        }
-#else
-        qDebug() << "QtKeyChain: Not yet implemented!";
-        _state = Error;
-#endif
-        break;
-    }
-    default: {
-        break;
-    }
-    }
-
-    if( _state == Fetching ) { // ...but not AsyncFetching
-        if( ok ) {
-            _passwd = pwd;
-            _state = Ok;
-        }
-        if( !ok && _state == Fetching ) {
-            _state = Error;
-        }
-
-        emit( fetchCredentialsFinished(ok) );
-    } else {
-        // in case of AsyncFetching nothing happens here. The finished-Slot
-        // will emit the finish signal.
-    }
-}
-
-void CredentialStore::slotUserDialogDone( int result )
-{
-    if( result == QDialog::Accepted ) {
-        _passwd = _inputDialog->textValue();
-        _state = Ok;
-    } else {
-        _state = UserCanceled;
-        _passwd = QString::null;
-    }
-    _inputDialog->deleteLater();
-    emit(fetchCredentialsFinished(_state == Ok));
-}
-
-void CredentialStore::reset()
-{
-    _state = NotFetched;
-    _user   = QString::null;
-    _passwd = QString::null;
-    _tries = 0;
-}
-
-QString CredentialStore::keyChainKey( const QString& url ) const
-{
-    QString u(url);
-    if( u.isEmpty() ) {
-        qDebug() << "Empty url in keyChain, error!";
-        return QString::null;
-    }
-    if( _user.isEmpty() ) {
-        qDebug() << "Error: User is emty!";
-        return QString::null;
-    }
-
-    if( !u.endsWith(QChar('/')) ) {
-        u.append(QChar('/'));
-    }
-
-    QString key = _user+QLatin1Char(':')+u;
-    return key;
-}
-
-void CredentialStore::slotKeyChainReadFinished(QKeychain::Job* job)
-{
-#ifdef WITH_QTKEYCHAIN
-    ReadPasswordJob *pwdJob = static_cast<ReadPasswordJob*>(job);
-    if( pwdJob ) {
-        switch( pwdJob->error() ) {
-        case QKeychain::NoError:
-            _passwd = pwdJob->textData();
-#ifdef Q_OS_LINUX
-            // Currently there is a bug in the keychain on linux that if no
-            // entry is there, an empty password comes back, but no error.
-            if( _passwd.isEmpty() ) {
-                _state = EntryNotFound;
-                _errorMsg = tr("No password entry found in keychain. Please reconfigure.");
-            } else
-#endif
-            _state = Ok;
-            break;
-        case QKeychain::EntryNotFound:
-            _state = EntryNotFound;
-            break;
-        case QKeychain::CouldNotDeleteEntry:
-            _state = Error;
-            break;
-        case QKeychain::AccessDeniedByUser:
-           _state = AccessDeniedByUser;
-            break;
-        case QKeychain::AccessDenied:
-            _state = AccessDenied;
-            break;
-        case QKeychain::NoBackendAvailable:
-            _state = NoKeychainBackend;
-            break;
-        case QKeychain::NotImplemented:
-            _state = NoKeychainBackend;
-            break;
-        case QKeychain::OtherError:
-        default:
-            _state = Error;
-
-        }
-        /* In case there is no backend, tranparentely switch to Settings file. */
-        if( _state == NoKeychainBackend ) {
-            qDebug() << "No Storage Backend, falling back to Settings mode.";
-            _type = CredentialStore::Settings;
-            fetchCredentials();
-            return;
-        }
-
-        if( _state == EntryNotFound ) {
-            // try to migrate.
-        }
-
-        if( _state != Ok ) {
-            qDebug() << "Error with keychain: " << pwdJob->errorString();
-            if(_errorMsg.isEmpty()) _errorMsg = pwdJob->errorString();
-        } else {
-            _errorMsg = QString::null;
-        }
-    } else {
-        _state = Error;
-        qDebug() << "Error: KeyChain Read Password Job failed!";
-    }
-    emit(fetchCredentialsFinished(_state == Ok));
-#else
-    (void) job;
-#endif
-}
-
-QString CredentialStore::errorMessage()
-{
-    return _errorMsg;
-}
-
-void CredentialStore::setCredentials( const QString& url, const QString& user,
-                                      const QString& pwd, bool allowToStore )
-{
-    _passwd = pwd;
-    _user = user;
-    if( allowToStore ) {
-#ifdef WITH_QTKEYCHAIN
-        _type = KeyChain;
-#else
-        _type = Settings;
-#endif
-    } else {
-        _type = User;
-    }
-    _url  = url;
-    _state = Ok;
-}
-
-void CredentialStore::saveCredentials( )
-{
-    MirallConfigFile cfgFile;
-    QString key = keyChainKey(_url);
-    if( key.isNull() ) {
-        qDebug() << "Error: Can not save credentials, URL is zero!";
-        return;
-    }
-#ifdef WITH_QTKEYCHAIN
-    WritePasswordJob *job = NULL;
-#endif
-
-    switch( _type ) {
-    case CredentialStore::User:
-        deleteKeyChainCredential( key );
-        break;
-    case CredentialStore::KeyChain:
-#ifdef WITH_QTKEYCHAIN
-        // Set password in KeyChain
-        job = new WritePasswordJob(Theme::instance()->appName());
-        job->setKey( key );
-        job->setTextData(_passwd);
-
-        connect( job, SIGNAL(finished(QKeychain::Job*)), this,
-                 SLOT(slotKeyChainWriteFinished(QKeychain::Job*)));
-        job->start();
-#endif
-        break;
-    case CredentialStore::Settings:
-        cfgFile.writePassword( _passwd );
-        reset();
-        break;
-    default:
-        // unsupported.
-        break;
-    }
-}
-
-void CredentialStore::slotKeyChainWriteFinished( QKeychain::Job *job )
-{
-#ifdef WITH_QTKEYCHAIN
-    WritePasswordJob *pwdJob = static_cast<WritePasswordJob*>(job);
-    if( pwdJob ) {
-        QKeychain::Error err = pwdJob->error();
-
-        if( err != QKeychain::NoError ) {
-            qDebug() << "Error with keychain: " << pwdJob->errorString();
-            if( err == NoBackendAvailable || err == NotImplemented ||
-                    pwdJob->errorString().contains(QLatin1String("Could not open wallet"))) {
-                _type = Settings;
-                saveCredentials();
-            }
-        } else {
-            qDebug() << "Successfully stored password for user " << _user;
-            // Try to remove password formerly stored in the config file.
-            MirallConfigFile cfgFile;
-            cfgFile.clearPasswordFromConfig();
-        }
-    } else {
-        qDebug() << "Error: KeyChain Write Password Job failed!";
-    }
-#else
-    (void) job;
-#endif
-}
-
-// Called if a user chooses to not store the password locally.
-void CredentialStore::deleteKeyChainCredential( const QString& key )
-{
-#ifdef WITH_QTKEYCHAIN
-    // Start the remove job, do not care so much about the result.
-    DeletePasswordJob *job = new DeletePasswordJob(Theme::instance()->appName());
-    job->setKey( key );
-    job->start();
-#endif
-}
-
-}

src/mirall/credentialstore.h

@@ -1,146 +0,0 @@
-/*
- * Copyright (C) by Klaas Freitag <freitag@owncloud.com>
- *
- * 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; version 2 of the License.
- *
- * 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.
- */
-
-#ifndef CREDENTIALSTORE_H
-#define CREDENTIALSTORE_H
-
-#include <QObject>
-#include <QInputDialog>
-
-namespace QKeychain {
-  class Job;
-}
-
-namespace Mirall {
-
-/*
- * This object holds the credential information of the ownCloud connection. It
- * is implemented as a singleton.
- * At startup of the client, at first the fetchCredentials() method must be called
- * which tries to get credentials from one of the supported backends. To determine
- * which backend should be used, MirallConfigFile::credentialType() is called as
- * the backend is configured in the config file.
- *
- * The fetchCredentials() call changes the internal state of the credential store
- * to one of
- *   Ok: There are credentials. Note that it's unknown if they are correct!!
- *   UserCanceled: The fetching involved user interaction and the user canceled
- *                 the operation. No valid credentials are there.
- *   TooManyAttempts: The user tried to often to enter a password.
- *   Fetching: The fetching is not yet finished.
- *   Error:    A general error happened.
- * After fetching has finished, signal fetchCredentialsFinished(bool) is emitted.
- * The result can be retrieved with state() and password() and user() methods.
- */
-
-class CredentialStore : public QObject
-{
-    Q_OBJECT
-public:
-    enum CredState { NotFetched = 0,
-                     Ok,
-                     UserCanceled,
-                     Fetching,
-                     AsyncFetching,
-                     EntryNotFound,
-                     AccessDeniedByUser,
-                     AccessDenied,
-                     NoKeychainBackend,
-                     Error,
-                     TooManyAttempts };
-
-    enum CredentialType {
-        User = 0,
-        Settings,
-        KeyChain
-    };
-
-    QString password( ) const;
-    QString user( ) const;
-
-    /**
-     * @brief state
-     * @return the state of the Credentialstore.
-     */
-    CredState state();
-
-    /**
-     * @brief fetchCredentials - start to retrieve user credentials.
-     *
-     * This method must be called first to retrieve the credentials.
-     * At the end, this method emits the fetchKeyChainFinished() signal.
-     */
-    void fetchCredentials();
-
-    /**
-     * @brief instance - singleton pointer.
-     * @return the singleton pointer to access the object.
-     */
-    static CredentialStore *instance();
-
-    /**
-     * @brief setCredentials - sets the user credentials.
-     *
-     * This function is called from the setup wizard to set the credentials
-     * int this store. Note that it does not store the password.
-     * The function also sets the state to ok.
-     * @param url - the connection url
-     * @param user - the user name
-     * @param password - the password.
-     */
-    void setCredentials( const QString&, const QString&, const QString&, bool );
-
-    void saveCredentials( );
-
-    QString errorMessage();
-
-    /**
-     * @brief canTryAgain - check if another try to get credentials makes sense.
-    */
-    bool canTryAgain();
-
-    void reset();
-signals:
-    /**
-     * @brief fetchCredentialsFinished
-     *
-     * emitted as soon as the fetching of the credentials has finished.
-     * If the parameter is true, there is a password and user. This does
-     * however, not say if the credentials are valid log in data.
-     * If false, the user pressed cancel.
-     */
-    void fetchCredentialsFinished(bool);
-
-protected slots:
-    void slotKeyChainReadFinished( QKeychain::Job* );
-    void slotKeyChainWriteFinished( QKeychain::Job* );
-    void slotUserDialogDone(int);
-
-private:
-    explicit CredentialStore(QObject *parent = 0);
-    void deleteKeyChainCredential( const QString& );
-    QString keyChainKey( const QString& ) const;
-
-    static CredentialStore *_instance;
-    static CredState _state;
-    static QString _passwd;
-    static QString _user;
-    static QString _url;
-    static QString _errorMsg;
-    static int     _tries;
-    static CredentialType _type;
-    QInputDialog   *_inputDialog;
-};
-}
-
-#endif // CREDENTIALSTORE_H

src/mirall/csyncfolder.cpp

@@ -33,7 +33,6 @@ CSyncFolder::CSyncFolder(const QString &alias,
                          QObject *parent)
       : Folder(alias, path, secondPath, parent)
       , _csync(0)
-      , _thread(0)
       , _csyncError(false)
 
 {
@@ -45,36 +44,31 @@ CSyncFolder::~CSyncFolder()
 
 bool CSyncFolder::isBusy() const
 {
-    return (_csync && _thread && _thread->isRunning() );
+    return (_csync && _csync->isRunning() );
 }
 
 void CSyncFolder::startSync(const QStringList &pathList)
 {
-    if (_thread && _thread->isRunning()) {
+    if (_csync && _csync->isRunning()) {
         qCritical() << "* ERROR csync is still running and new sync requested.";
         return;
     }
     delete _csync;
-    delete _thread;
     _errors.clear();
     _csyncError = false;
-    _syncResult.setStatus( SyncResult::SyncRunning );
-    emit syncStateChange();
 
-    _thread = new QThread(this);
     _csync = new CSyncThread( path(), secondPath() );
-    connect(_csync, SIGNAL(started()), SLOT(slotCSyncStarted()), Qt::QueuedConnection);
-    connect(_csync, SIGNAL(finished()), SLOT(slotCSyncFinished()), Qt::QueuedConnection);
-    connect(_csync, SIGNAL(csyncError(QString)), SLOT(slotCSyncError(QString)), Qt::QueuedConnection);
-    _csync->moveToThread(_thread);
-    _thread->start();
-    QMetaObject::invokeMethod(_csync, "startSync", Qt::QueuedConnection);
+    connect(_csync, SIGNAL(started()), SLOT(slotCSyncStarted()));
+    connect(_csync, SIGNAL(finished()), SLOT(slotCSyncFinished()));
+    connect(_csync, SIGNAL(csyncError(QString)), SLOT(slotCSyncError(QString)));
+
+    _csync->start();
 }
 
 void CSyncFolder::slotTerminateSync()
 {
-    if( _thread ) {
-        _thread->terminate();
+    if( _csync ) {
+        _csync->terminate();
     }
 }
 
@@ -89,7 +83,7 @@ void CSyncFolder::slotCSyncFinished()
     SyncResult res(SyncResult::Success);
     if( _csyncError ) {
         res.setStatus( SyncResult::Error );
-        res.setErrorString( _errors.join(QLatin1String("\n")));
+        res.setErrorString( _errors.join(QLatin1String("\\n")));
     }
     emit syncFinished( res );
 }

src/mirall/csyncfolder.h

@@ -48,7 +48,6 @@ protected slots:
 private:
     bool    _csyncError;
     CSyncThread *_csync;
-    QThread    *_thread;
     QStringList _errors;
 };
 

src/mirall/csyncthread.cpp

@@ -15,52 +15,114 @@
 
 #include "mirall/csyncthread.h"
 #include "mirall/mirallconfigfile.h"
-#include "mirall/theme.h"
-#include "mirall/logger.h"
-#include "mirall/utility.h"
-#include "mirall/owncloudinfo.h"
-
-#ifdef Q_OS_WIN
-#include <windows.h>
-#else
-#include <unistd.h>
-#endif
 
 #include <QDebug>
-#include <QSslSocket>
 #include <QDir>
 #include <QMutexLocker>
 #include <QThread>
 #include <QStringList>
 #include <QTextStream>
 #include <QTime>
-#include <QApplication>
-#include <QUrl>
-#include <QSslCertificate>
 
 namespace Mirall {
 
 /* static variables to hold the credentials */
 QString CSyncThread::_user;
 QString CSyncThread::_passwd;
-QNetworkProxy CSyncThread::_proxy;
+QString CSyncThread::_proxyType;
+QString CSyncThread::_proxyPwd;
+QString CSyncThread::_proxyPort;
+QString CSyncThread::_proxyHost;
+QString CSyncThread::_proxyUser;
 
 QString CSyncThread::_csyncConfigDir;  // to be able to remove the lock file.
 
 QMutex CSyncThread::_mutex;
 
-void csyncLogCatcher(CSYNC *ctx,
-                     int verbosity,
-                     const char *function,
-                     const char *buffer,
-                     void *userdata)
-{
-  Logger::instance()->csyncLog( QString::fromUtf8(buffer) );
-}
 
-CSyncThread::CSyncThread(const QString &source, const QString &target)
+struct ProxyInfo {
+    char *proxyType;
+    char *proxyHost;
+    char *proxyPort;
+    char *proxyUser;
+    char *proxyPwd;
+};
+
+ int CSyncThread::checkPermissions( TREE_WALK_FILE* file, void *data )
+ {
+     WalkStats *wStats = static_cast<WalkStats*>(data);
+
+     if( !wStats ) {
+         qDebug() << "WalkStats is zero - must not be!";
+         return -1;
+     }
+
+     wStats->seenFiles++;
+
+     switch(file->instruction) {
+     case CSYNC_INSTRUCTION_NONE:
+
+         break;
+     case CSYNC_INSTRUCTION_EVAL:
+         wStats->eval++;
+         break;
+     case CSYNC_INSTRUCTION_REMOVE:
+         wStats->removed++;
+         break;
+     case CSYNC_INSTRUCTION_RENAME:
+         wStats->renamed++;
+         break;
+     case CSYNC_INSTRUCTION_NEW:
+         wStats->newFiles++;
+         break;
+     case CSYNC_INSTRUCTION_CONFLICT:
+         wStats->conflicts++;
+         break;
+     case CSYNC_INSTRUCTION_IGNORE:
+         wStats->ignores++;
+         break;
+     case CSYNC_INSTRUCTION_SYNC:
+         wStats->sync++;
+         break;
+     case CSYNC_INSTRUCTION_STAT_ERROR:
+     case CSYNC_INSTRUCTION_ERROR:
+         /* instructions for the propagator */
+     case CSYNC_INSTRUCTION_DELETED:
+     case CSYNC_INSTRUCTION_UPDATED:
+         wStats->error++;
+         wStats->errorType = WALK_ERROR_INSTRUCTIONS;
+         break;
+     default:
+         wStats->error++;
+         wStats->errorType = WALK_ERROR_WALK;
+         break;
+     }
+
+     if( file ) {
+         QString source = QString::fromLocal8Bit(wStats->sourcePath);
+         source.append(QString::fromLocal8Bit(file->path));
+         QFileInfo fi(source);
+
+         if( fi.isDir()) {  // File type directory.
+             if( !(fi.isWritable() && fi.isExecutable()) ) {
+                 wStats->dirPermErrors++;
+                 wStats->errorType = WALK_ERROR_DIR_PERMS;
+             }
+         }
+     }
+
+     // qDebug() << wStats->seenFiles << ". Path: " << file->path << ": uid= " << file->uid << " - type: " << file->type;
+     if( !( wStats->errorType == WALK_ERROR_NONE || wStats->errorType == WALK_ERROR_DIR_PERMS )) {
+         return -1;
+     }
+     return 0;
+ }
+
+CSyncThread::CSyncThread(const QString &source, const QString &target, bool localCheckOnly)
+
     : _source(source)
     , _target(target)
+    , _localCheckOnly( localCheckOnly )
 
 {
     _mutex.lock();
@@ -73,355 +135,225 @@ CSyncThread::~CSyncThread()
 
 }
 
-QString CSyncThread::csyncErrorToString( CSYNC_ERROR_CODE err, const char *errString )
+void CSyncThread::run()
 {
-    QString errStr;
-
-    switch( err ) {
-    case CSYNC_ERR_NONE:
-        errStr = tr("Success.");
-        break;
-    case CSYNC_ERR_LOG:
-        errStr = tr("CSync Logging setup failed.");
-        break;
-    case CSYNC_ERR_LOCK:
-        errStr = tr("CSync failed to create a lock file.");
-        break;
-    case CSYNC_ERR_STATEDB_LOAD:
-        errStr = tr("CSync failed to load the state db.");
-        break;
-    case CSYNC_ERR_MODULE:
-        errStr = tr("<p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p>").arg(Theme::instance()->appNameGUI());
-        break;
-    case CSYNC_ERR_TIMESKEW:
-        errStr = tr("The system time on this client is different than the system time on the server. "
-                    "Please use a time synchronization service (NTP) on the server and client machines "
-                    "so that the times remain the same.");
-        break;
-    case CSYNC_ERR_FILESYSTEM:
-        errStr = tr("CSync could not detect the filesystem type.");
-        break;
-    case CSYNC_ERR_TREE:
-        errStr = tr("CSync got an error while processing internal trees.");
-        break;
-    case CSYNC_ERR_MEM:
-        errStr = tr("CSync failed to reserve memory.");
-        break;
-    case CSYNC_ERR_PARAM:
-        errStr = tr("CSync fatal parameter error.");
-        break;
-    case CSYNC_ERR_UPDATE:
-        errStr = tr("CSync processing step update failed.");
-        break;
-    case CSYNC_ERR_RECONCILE:
-        errStr = tr("CSync processing step reconcile failed.");
-        break;
-    case CSYNC_ERR_PROPAGATE:
-        errStr = tr("CSync processing step propagate failed.");
-        break;
-    case CSYNC_ERR_ACCESS_FAILED:
-        errStr = tr("<p>The target directory %1 does not exist.</p><p>Please check the sync setup.</p>").arg(_target);
-        // this is critical. The database has to be removed.
-        emit wipeDb();
-        break;
-    case CSYNC_ERR_REMOTE_CREATE:
-    case CSYNC_ERR_REMOTE_STAT:
-        errStr = tr("A remote file can not be written. Please check the remote access.");
-        break;
-    case CSYNC_ERR_LOCAL_CREATE:
-    case CSYNC_ERR_LOCAL_STAT:
-        errStr = tr("The local filesystem can not be written. Please check permissions.");
-        break;
-    case CSYNC_ERR_PROXY:
-        errStr = tr("CSync failed to connect through a proxy.");
-        break;
-    case CSYNC_ERR_LOOKUP:
-        errStr = tr("CSync failed to lookup proxy or server.");
-        break;
-    case CSYNC_ERR_AUTH_SERVER:
-        errStr = tr("CSync failed to authenticate at the %1 server.").arg(Theme::instance()->appNameGUI());
-        break;
-    case CSYNC_ERR_AUTH_PROXY:
-        errStr = tr("CSync failed to authenticate at the proxy.");
-        break;
-    case CSYNC_ERR_CONNECT:
-        errStr = tr("CSync failed to connect to the network.");
-        break;
-    case CSYNC_ERR_TIMEOUT:
-        errStr = tr("A network connection timeout happend.");
-        break;
-    case CSYNC_ERR_HTTP:
-        errStr = tr("A HTTP transmission error happened.");
-        break;
-    case CSYNC_ERR_PERM:
-        errStr = tr("CSync failed due to not handled permission deniend.");
-        break;
-    case CSYNC_ERR_NOT_FOUND:
-        errStr = tr("CSync failed to find a specific file.");
-        break;
-    case CSYNC_ERR_EXISTS:
-        errStr = tr("CSync tried to create a directory that already exists.");
-        break;
-    case CSYNC_ERR_NOSPC:
-        errStr = tr("CSync: No space on %1 server available.").arg(Theme::instance()->appNameGUI());
-        break;
-    case CSYNC_ERR_UNSPEC:
-        errStr = tr("CSync unspecified error.");
-
-    default:
-        errStr = tr("An internal error number %1 happend.").arg( (int) err );
-    }
-
-    if( errString ) {
-        errStr += tr("<br/>Backend Message: ")+QString::fromUtf8(errString);
-    }
-    return errStr;
-
-}
-
-const char* CSyncThread::proxyTypeToCStr(QNetworkProxy::ProxyType type)
-{
-    switch (type) {
-    case QNetworkProxy::NoProxy:
-        return "NoProxy";
-    case QNetworkProxy::DefaultProxy:
-        return "DefaultProxy";
-    case QNetworkProxy::Socks5Proxy:
-        return "Socks5Proxy";
-    case QNetworkProxy::HttpProxy:
-        return "HttpProxy";
-    case QNetworkProxy::HttpCachingProxy:
-        return "HttpCachingProxy";
-    case QNetworkProxy::FtpCachingProxy:
-        return "FtpCachingProxy";
-    default:
-        return "NoProxy";
-    }
-}
-
-int CSyncThread::treewalkLocal( TREE_WALK_FILE* file, void *data )
-{
-    return static_cast<CSyncThread*>(data)->treewalkFile( file, false );
-}
-
-int CSyncThread::treewalkRemote( TREE_WALK_FILE* file, void *data )
-{
-    return static_cast<CSyncThread*>(data)->treewalkFile( file, true );
-}
-
-int CSyncThread::walkFinalize(TREE_WALK_FILE* file, void *data )
-{
-    return static_cast<CSyncThread*>(data)->treewalkError( file);
-}
-
-int CSyncThread::treewalkFile( TREE_WALK_FILE *file, bool remote )
-{
-    if( ! file ) return -1;
-    SyncFileItem item;
-    item._file = QString::fromUtf8( file->path );
-    item._instruction = file->instruction;
-    item._dir = SyncFileItem::None;
-
-    SyncFileItem::Direction dir;
-
-    int re = 0;
-
-    switch(file->instruction) {
-    case CSYNC_INSTRUCTION_NONE:
-    case CSYNC_INSTRUCTION_IGNORE:
-        break;
-    default:
-        if (!_needsUpdate)
-            _needsUpdate = true;
-    }
-    switch(file->instruction) {
-    case CSYNC_INSTRUCTION_NONE:
-        // No need to do anything.
-        return re;
-        break;
-    case CSYNC_INSTRUCTION_RENAME:
-        dir = !remote ? SyncFileItem::Down : SyncFileItem::Up;
-        item._renameTarget = QString::fromUtf8( file->rename_path );
-        break;
-    case CSYNC_INSTRUCTION_REMOVE:
-        dir = !remote ? SyncFileItem::Down : SyncFileItem::Up;
-        break;
-    case CSYNC_INSTRUCTION_CONFLICT:
-    case CSYNC_INSTRUCTION_IGNORE:
-    case CSYNC_INSTRUCTION_ERROR:
-        dir = SyncFileItem::None;
-        break;
-    case CSYNC_INSTRUCTION_EVAL:
-    case CSYNC_INSTRUCTION_NEW:
-    case CSYNC_INSTRUCTION_SYNC:
-    case CSYNC_INSTRUCTION_STAT_ERROR:
-    case CSYNC_INSTRUCTION_DELETED:
-    case CSYNC_INSTRUCTION_UPDATED:
-    default:
-        dir = remote ? SyncFileItem::Down : SyncFileItem::Up;
-        break;
-    }
-
-    item._dir = dir;
-    _mutex.lock();
-    _syncedItems.append(item);
-    _mutex.unlock();
-
-    return re;
-}
-
-int CSyncThread::treewalkError(TREE_WALK_FILE* file)
-{
-    SyncFileItem item;
-    item._file= QString::fromUtf8(file->path);
-    int indx = _syncedItems.indexOf(item);
-
-    if ( indx == -1 )
-        return 0;
-
-    if( item._instruction == CSYNC_INSTRUCTION_STAT_ERROR ||
-            item._instruction == CSYNC_INSTRUCTION_ERROR ) {
-        _mutex.lock();
-        _syncedItems[indx]._instruction = item._instruction;
-        _mutex.unlock();
-    }
-
-    return 0;
-}
-
-struct CSyncRunScopeHelper {
-    CSyncRunScopeHelper(CSYNC *_ctx, CSyncThread *_parent)
-        : ctx(_ctx), parent(_parent)
-    {
-        t.start();
-    }
-    ~CSyncRunScopeHelper() {
-        csync_destroy(ctx);
-
-        qDebug() << "CSync run took " << t.elapsed() << " Milliseconds";
-        emit(parent->finished());
-    }
-    CSYNC *ctx;
-    QTime t;
-    CSyncThread *parent;
-};
-
-void CSyncThread::handleSyncError(CSYNC *ctx, const char *state) {
-    CSYNC_ERROR_CODE err = csync_get_error( ctx );
-    const char *errMsg = csync_get_error_string( ctx );
-    QString errStr = csyncErrorToString(err, errMsg);
-    qDebug() << " #### ERROR during "<< state << ": " << errStr;
-    switch (err) {
-    case CSYNC_ERR_SERVICE_UNAVAILABLE:
-    case CSYNC_ERR_CONNECT:
-        emit csyncUnavailable();
-        break;
-    default:
-        emit csyncError(errStr);
-    }
-}
-
-void CSyncThread::startSync()
-{
-    qDebug() << "starting to sync " << qApp->thread() << QThread::currentThread();
     CSYNC *csync;
-    int proxyPort = _proxy.port();
+    WalkStats *wStats = new WalkStats;
+    QTime walkTime;
+
+    wStats->sourcePath = 0;
+    wStats->errorType  = 0;
+    wStats->eval       = 0;
+    wStats->removed    = 0;
+    wStats->renamed    = 0;
+    wStats->newFiles   = 0;
+    wStats->ignores    = 0;
+    wStats->sync       = 0;
+    wStats->seenFiles  = 0;
+    wStats->conflicts  = 0;
+    wStats->error      = 0;
+    wStats->dirPermErrors = 0;
+
+    ProxyInfo *proxyInfo  = new ProxyInfo;
 
     _mutex.lock();
-    _syncedItems.clear();
-    _needsUpdate = false;
-    _mutex.unlock();
+    proxyInfo->proxyType = qstrdup( _proxyType.toAscii().constData() );
+    proxyInfo->proxyHost = qstrdup( _proxyHost.toAscii().constData() );
+    proxyInfo->proxyPort = qstrdup( _proxyPort.toAscii().constData() );
+    proxyInfo->proxyUser = qstrdup( _proxyUser.toAscii().constData() );
+    proxyInfo->proxyPwd  = qstrdup( _proxyPwd.toAscii().constData() );
 
     if( csync_create(&csync,
                      _source.toUtf8().data(),
                      _target.toUtf8().data()) < 0 ) {
         emit csyncError( tr("CSync create failed.") );
     }
-
-    MirallConfigFile cfg;
-    csync_set_config_dir( csync, cfg.configPath().toUtf8() );
-
-    _mutex.lock();
-    _csyncConfigDir = cfg.configPath();
+    // FIXME: Check if we really need this stringcopy!
+    wStats->sourcePath = qstrdup( _source.toUtf8().constData() );
+    _csyncConfigDir = QString::fromUtf8( csync_get_config_dir( csync ));
     _mutex.unlock();
 
+    qDebug() << "## CSync Thread local only: " << _localCheckOnly;
+    csync_set_auth_callback( csync, getauth );
     csync_enable_conflictcopys(csync);
+
+
+    MirallConfigFile cfg;
     QString excludeList = cfg.excludeFile();
+
     if( !excludeList.isEmpty() ) {
-        qDebug() << "==== added CSync exclude List: " << excludeList.toUtf8();
-        csync_add_exclude_list( csync, excludeList.toUtf8() );
+        qDebug() << "==== added CSync exclude List: " << excludeList.toAscii();
+        csync_add_exclude_list( csync, excludeList.toAscii() );
     }
 
-    // cleans up behind us and emits finished() to ease error handling
-    CSyncRunScopeHelper helper(csync, this);
+    QTime t;
+    t.start();
 
-    csync_set_userdata(csync, this);
-
-    csync_set_log_callback( csync, csyncLogCatcher );
-    csync_set_auth_callback( csync, getauth );
-    csync_set_progress_callback( csync, progress );
+    _mutex.lock();
+    if( _localCheckOnly ) {
+        csync_set_local_only( csync, true );
+    }
+    csync_set_userdata(csync, (void*) proxyInfo);
+    _mutex.unlock();
 
     if( csync_init(csync) < 0 ) {
-        handleSyncError(csync, "csync_init");
-        return;
+        CSYNC_ERROR_CODE err = csync_get_error( csync );
+        QString errStr;
+
+        switch( err ) {
+        case CSYNC_ERR_LOCK:
+            errStr = tr("CSync failed to create a lock file.");
+            break;
+        case CSYNC_ERR_STATEDB_LOAD:
+            errStr = tr("CSync failed to load the state db.");
+            break;
+        case CSYNC_ERR_TIMESKEW:
+            errStr = tr("The system time on this client is different than the system time on the server. "
+                        "Please use a time synchronization service (NTP) on the server and client machines "
+                        "so that the times remain the same.");
+            break;
+        case CSYNC_ERR_FILESYSTEM:
+            errStr = tr("CSync could not detect the filesystem type.");
+            break;
+        case CSYNC_ERR_TREE:
+            errStr = tr("CSync got an error while processing internal trees.");
+            break;
+        case CSYNC_ERR_ACCESS_FAILED:
+            errStr = tr("<p>The target directory %1 does not exist.</p><p>Please check the sync setup.</p>").arg(_target);
+            // this is critical. The database has to be removed.
+            emitStateDb(csync); // to make the name of the csync db known.
+            emit wipeDb();
+            break;
+        case CSYNC_ERR_MODULE:
+            errStr = tr("<p>The ownCloud plugin for csync could not be loaded.<br/>Please verify the installation!</p>");
+            break;
+        case CSYNC_ERR_LOCAL_CREATE:
+        case CSYNC_ERR_LOCAL_STAT:
+            errStr = tr("The local filesystem can not be written. Please check permissions.");
+            break;
+        case CSYNC_ERR_REMOTE_CREATE:
+        case CSYNC_ERR_REMOTE_STAT:
+            errStr = tr("A remote file can not be written. Please check the remote access.");
+            break;
+        default:
+            errStr = tr("An internal error number %1 happend.").arg( (int) err );
+        }
+        qDebug() << " #### ERROR String emitted: " << errStr;
+        emit csyncError(errStr);
+        goto cleanup;
     }
 
-    // set module properties, mainly the proxy information.
-    // do not use QLatin1String here because that has to be real const char* for C.
-    csync_set_log_verbosity(csync, 11);
-    csync_set_module_property(csync, "csync_context", csync);
-    csync_set_module_property(csync, "proxy_type", (char*) proxyTypeToCStr(_proxy.type()) );
-    csync_set_module_property(csync, "proxy_host", _proxy.hostName().toUtf8().data() );
-    csync_set_module_property(csync, "proxy_port", &proxyPort );
-    csync_set_module_property(csync, "proxy_user", _proxy.user().toUtf8().data()     );
-    csync_set_module_property(csync, "proxy_pwd" , _proxy.password().toUtf8().data() );
+    emitStateDb(csync);
 
     qDebug() << "#### Update start #################################################### >>";
     if( csync_update(csync) < 0 ) {
-        handleSyncError(csync, "csync_update");
-        return;
+        CSYNC_ERROR_CODE err = csync_get_error( csync );
+        QString errStr;
+
+        switch( err ) {
+        case CSYNC_ERR_PROXY:
+            errStr = tr("CSync failed to reach the host. Either host or proxy settings are not valid.");
+            break;
+        default:
+            errStr = tr("CSync Update failed.");
+            break;
+        }
+        emit csyncError( errStr );
+        goto cleanup;
     }
     qDebug() << "<<#### Update end ###########################################################";
 
-    if( csync_reconcile(csync) < 0 ) {
-        handleSyncError(csync, "cysnc_reconcile");
-        return;
-    }
+    csync_set_userdata(csync, wStats);
 
-    bool walkOk = true;
-    if( csync_walk_local_tree(csync, &treewalkLocal, 0) < 0 ) {
-        qDebug() << "Error in local treewalk.";
-        walkOk = false;
-    }
-    if( walkOk && csync_walk_remote_tree(csync, &treewalkRemote, 0) < 0 ) {
-        qDebug() << "Error in remote treewalk.";
-    }
-
-    if (_needsUpdate)
-        emit(started());
-
-    if( csync_propagate(csync) < 0 ) {
-        handleSyncError(csync, "cysnc_reconcile");
-        return;
-    }
-
-    if( walkOk ) {
-        if( csync_walk_local_tree(csync, &walkFinalize, 0) < 0 ||
-            csync_walk_remote_tree( csync, &walkFinalize, 0 ) < 0 ) {
-          qDebug() << "Error in finalize treewalk.";
-        } else {
-        // emit the treewalk results.
-            emit treeWalkResult(_syncedItems);
+    walkTime.start();
+    if( csync_walk_local_tree(csync, &checkPermissions, 0) < 0 ) {
+        qDebug() << "Error in treewalk.";
+        if( wStats->errorType == WALK_ERROR_WALK ) {
+            emit csyncError(tr("CSync encountered an error while examining the file system.\n"
+                               "Syncing is not possible."));
+        } else if( wStats->errorType == WALK_ERROR_INSTRUCTIONS ) {
+            emit csyncError(tr("CSync update generated a strange instruction.\n"
+                               "Please write a bug report."));
         }
+        emit csyncError(tr("Local filesystem problems. Better disable Syncing and check."));
+        goto cleanup;
+    } else {
+        // only warn, do not stop the sync process.
+        if( wStats->errorType == WALK_ERROR_DIR_PERMS ) {
+            emit csyncError(tr("The local filesystem has %1 write protected directories."
+                               "That can hinder successful syncing.<p/>"
+                               "Please make sure that all local directories are writeable.").arg(wStats->dirPermErrors));
+        }
+    }
+
+    // emit the treewalk results. Do not touch the wStats after this.
+    emit treeWalkResult(wStats);
+
+    _mutex.lock();
+    if( _localCheckOnly ) {
+        _mutex.unlock();
+        qDebug() << " ..... Local only walk finished: " << walkTime.elapsed();
+        // we have to go out here as its local check only.
+        goto cleanup;
+    } else {
+        _mutex.unlock();
+        // check if we can write all over.
+
+        if( csync_reconcile(csync) < 0 ) {
+            emit csyncError(tr("CSync reconcile failed."));
+            goto cleanup;
+        }
+        if( csync_propagate(csync) < 0 ) {
+            emit csyncError(tr("CSync propagate failed."));
+            goto cleanup;
+        }
+    }
+cleanup:
+    csync_destroy(csync);
+
+    if( proxyInfo->proxyType ) free( proxyInfo->proxyType );
+    if( proxyInfo->proxyHost ) free( proxyInfo->proxyHost );
+    if( proxyInfo->proxyPort ) free( proxyInfo->proxyPort );
+    if( proxyInfo->proxyUser ) free( proxyInfo->proxyUser );
+    if( proxyInfo->proxyPwd  ) free( proxyInfo->proxyPwd  );
+
+    free( proxyInfo );
+
+    /*
+     * Attention: do not delete the wStat memory here. it is deleted in the
+     * slot catching the signel treeWalkResult because this thread can faster
+     * die than the slot has read out the data.
+     */
+    qDebug() << "CSync run took " << t.elapsed() << " Milliseconds";
+}
+
+void CSyncThread::emitStateDb( CSYNC *csync )
+{
+    // After csync_init the statedb file name can be emitted
+    const char *statedb = csync_get_statedb_file( csync );
+    if( statedb ) {
+        QString stateDbFile = QString::fromUtf8(statedb);
+        free((void*)statedb);
+
+        emit csyncStateDbFile( stateDbFile );
+    } else {
+        qDebug() << "WRN: Unable to get csync statedb file name";
     }
 }
 
-void CSyncThread::setConnectionDetails( const QString &user, const QString &passwd, const QNetworkProxy &proxy )
+void CSyncThread::setConnectionDetails( const QString& user, const QString& passwd,
+                                        const QString& proxyType, const QString& proxyHost,
+                                        int proxyPort , const QString& proxyUser, const QString& proxyPwd )
 {
     _mutex.lock();
     _user = user;
     _passwd = passwd;
-    _proxy = proxy;
+    _proxyType = proxyType;
+    _proxyHost = proxyHost;
+    _proxyPort = QString::number(proxyPort);
+    qDebug() << "Proxy-Port: " << _proxyPort;
+    _proxyUser = proxyUser;
+    _proxyPwd  = proxyPwd;
     _mutex.unlock();
 }
 
@@ -440,69 +372,27 @@ int CSyncThread::getauth(const char *prompt,
 {
     int re = 0;
 
-    QString qPrompt = QString::fromLatin1( prompt ).trimmed();
+    QString qPrompt = QString::fromLocal8Bit( prompt ).trimmed();
+    _mutex.lock();
 
     if( qPrompt == QLatin1String("Enter your username:") ) {
         // qDebug() << "OOO Username requested!";
-        QMutexLocker locker( &_mutex );
         qstrncpy( buf, _user.toUtf8().constData(), len );
     } else if( qPrompt == QLatin1String("Enter your password:") ) {
-        QMutexLocker locker( &_mutex );
         // qDebug() << "OOO Password requested!";
         qstrncpy( buf, _passwd.toUtf8().constData(), len );
     } else {
         if( qPrompt.startsWith( QLatin1String("There are problems with the SSL certificate:"))) {
             // SSL is requested. If the program came here, the SSL check was done by mirall
-            // It needs to be checked if the  chain is still equal to the one which
-            // was verified by the user.
-            QRegExp regexp("fingerprint: ([\\w\\d:]+)");
-            bool certOk = false;
-
-            int pos = 0;
-
-
-            // This is the set of certificates which QNAM accepted, so we should accept
-            // them as well
-            QList<QSslCertificate> certs = ownCloudInfo::instance()->certificateChain();
-
-            while (!certOk && (pos = regexp.indexIn(qPrompt, 1+pos)) != -1) {
-                QString neon_fingerprint = regexp.cap(1);
-
-                foreach( const QSslCertificate& c, certs ) {
-                    QString verified_shasum = Utility::formatFingerprint(c.digest(QCryptographicHash::Sha1).toHex());
-                    qDebug() << "SSL Fingerprint from neon: " << neon_fingerprint << " compared to verified: " << verified_shasum;
-                    if( verified_shasum == neon_fingerprint ) {
-                        certOk = true;
-                        break;
-                    }
-                }
-            }
-            // certOk = false;     DEBUG setting, keep disabled!
-            if( !certOk ) { // Problem!
-                qstrcpy( buf, "no" );
-                re = -1;
-            } else {
-                qstrcpy( buf, "yes" ); // Certificate is fine!
-            }
+            // the answer is simply yes here.
+            qstrcpy( buf, "yes" );
         } else {
             qDebug() << "Unknown prompt: <" << prompt << ">";
             re = -1;
         }
     }
+    _mutex.unlock();
     return re;
 }
 
-
-void CSyncThread::progress(const char *remote_url, enum csync_notify_type_e kind,
-                                        long long o1, long long o2, void *userdata)
-{
-    (void) o1; (void) o2;
-    if (kind == CSYNC_NOTIFY_FINISHED_DOWNLOAD) {
-        QString path = QUrl::fromEncoded(remote_url).toString();
-        CSyncThread *thread = static_cast<CSyncThread*>(userdata);
-        thread->fileReceived(path);
-    }
-}
-
-
 }

src/mirall/csyncthread.h

@@ -1,3 +1,6 @@
+#ifndef CSYNCTHREAD_H
+#define CSYNCTHREAD_H
+
 /*
  * Copyright (C) by Duncan Mac-Vicar P. <duncan@kde.org>
  * Copyright (C) by Klaas Freitag <freitag@owncloud.com>
@@ -13,66 +16,69 @@
  * for more details.
  */
 
-#ifndef CSYNCTHREAD_H
-#define CSYNCTHREAD_H
-
 #include <stdint.h>
 
 #include <QMutex>
 #include <QThread>
 #include <QString>
-#include <QNetworkProxy>
 
 #include <csync.h>
 
-#include "mirall/syncfileitem.h"
-
 class QProcess;
 
 namespace Mirall {
 
-class CSyncThread : public QObject
+enum walkErrorTypes {
+    WALK_ERROR_NONE = 0,
+    WALK_ERROR_WALK,
+    WALK_ERROR_INSTRUCTIONS,
+    WALK_ERROR_DIR_PERMS
+};
+
+struct walkStats_s {
+    const char *sourcePath;
+    int errorType;
+
+    ulong eval;
+    ulong removed;
+    ulong renamed;
+    ulong newFiles;
+    ulong conflicts;
+    ulong ignores;
+    ulong sync;
+    ulong error;
+
+    ulong dirPermErrors;
+
+    ulong seenFiles;
+};
+
+typedef walkStats_s WalkStats;
+
+class CSyncThread : public QThread
 {
     Q_OBJECT
 public:
-    CSyncThread(const QString &source, const QString &target);
+    CSyncThread(const QString &source, const QString &target, bool = false);
     ~CSyncThread();
 
-    static void setConnectionDetails( const QString&, const QString&, const QNetworkProxy& );
+    virtual void run();
+
+    static void setConnectionDetails( const QString&, const QString&,
+                                      const QString&, const QString&, int,
+                                      const QString&, const QString& );
+    static int checkPermissions( TREE_WALK_FILE* file, void *data);
     static QString csyncConfigDir();
 
-    const char* proxyTypeToCStr(QNetworkProxy::ProxyType);
-    QString csyncErrorToString( CSYNC_ERROR_CODE, const char * );
-
-    Q_INVOKABLE void startSync();
-
 signals:
-    void fileReceived( const QString& );
-    void fileRemoved( const QString& );
+    void treeWalkResult(WalkStats*);
     void csyncError( const QString& );
-    void csyncWarning( const QString& );
-    void csyncUnavailable();
-    void treeWalkResult(const SyncFileItemVector&);
 
     void csyncStateDbFile( const QString& );
     void wipeDb();
 
-    void finished();
-    void started();
-
 private:
-    void handleSyncError(CSYNC *ctx, const char *state);
-    static void progress(const char *remote_url,
-                    enum csync_notify_type_e kind,
-                    long long o1, long long o2,
-                    void *userdata);
-
-    static int treewalkLocal( TREE_WALK_FILE*, void *);
-    static int treewalkRemote( TREE_WALK_FILE*, void *);
-    int treewalkFile( TREE_WALK_FILE*, bool );
-    int treewalkError( TREE_WALK_FILE* );
-
-    static int walkFinalize(TREE_WALK_FILE*, void* );
+    void emitStateDb( CSYNC *csync );
 
     static int getauth(const char *prompt,
                 char *buf,
@@ -85,17 +91,17 @@ private:
     static QMutex _mutex;
     static QString _user;
     static QString _passwd;
-    static QNetworkProxy _proxy;
+    static QString _proxyType;
+    static QString _proxyHost;
+    static QString _proxyPort;
+    static QString _proxyUser;
+    static QString _proxyPwd;
 
     static QString _csyncConfigDir;
 
-    SyncFileItemVector _syncedItems;
-
     QString _source;
     QString _target;
-    bool _needsUpdate;
-
-    friend class CSyncRunScopeHelper;
+    bool    _localCheckOnly;
 };
 }
 

src/mirall/encryption.cpp

@@ -0,0 +1,262 @@
+/*
+ * Copyright (C) 2012 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "encryption.h"
+#include "keymanager.h"
+#include <QMap>
+#include <iostream>
+#include <QtNetwork>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QAuthenticator>
+#include <QDomDocument>
+#include <QFile>
+#include <openssl/rsa.h>
+#include <openssl/pem.h>
+#include <openssl/evp.h>
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <stdio.h>
+
+Encryption::Encryption(QString baseurl, QString username, QString password, QObject *parent) :
+    QObject(parent)
+{
+    setBaseUrl(baseurl);
+    setAuthCredentials(username, password);
+    _nam = new QNetworkAccessManager(this);
+
+    connect( _nam, SIGNAL(finished(QNetworkReply*)),this,SLOT(slotHttpRequestResults(QNetworkReply*)));
+    connect( _nam, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), this, SLOT(slotHttpAuth(QNetworkReply*,QAuthenticator*)));
+}
+
+void Encryption::setBaseUrl(QString baseurl)
+{
+    _baseurl = baseurl;
+}
+
+void Encryption::setAuthCredentials(QString username, QString password) {
+    _username = username;
+    _password = password;
+}
+
+void Encryption::getUserKeys(QString password)
+{
+    QNetworkReply *reply = _nam->get(QNetworkRequest(QUrl(_baseurl + "/ocs/v1.php/cloud/userkeys")));
+    _directories[reply] = Encryption::GetUserKeys;
+    _data[reply].insert("password", password);
+}
+
+void Encryption::generateUserKeys(QString password)
+{
+    RSA *rsa;
+    int bits = 1024;	//	512, 1024, 2048, 4096
+    unsigned long exp = RSA_F4;	//	RSA_3
+
+    if ( (rsa = RSA_generate_key(bits, exp, NULL, NULL)) == NULL) {
+         qDebug() << "Couldn't generate RSA Key";
+         return;
+    }
+
+    Keymanager::Instance()->setRSAkey(rsa);
+
+    sendUserKeys(key2pem(password), Encryption::SetUserKeys);
+}
+
+void Encryption::changeUserKeyPassword(QString oldpasswd, QString newpasswd)
+{
+    QNetworkReply *reply = _nam->get(QNetworkRequest(QUrl(_baseurl + "/ocs/v1.php/cloud/userkeys")));
+    _directories[reply] = Encryption::ChangeKeyPassword;
+    _data[reply].insert("oldpassword", oldpasswd);
+    _data[reply].insert("newpassword", newpasswd);
+    _data[reply].insert("step", "import");
+}
+
+void Encryption::sendUserKeys(QMap<QString, QString> keypair, OCSCalls operation)
+{
+    QUrl postData;
+
+    postData.addQueryItem("privatekey", QUrl::toPercentEncoding(keypair["privatekey"]));
+    postData.addQueryItem("publickey", QUrl::toPercentEncoding(keypair["publickey"]));
+
+    QNetworkRequest req;
+    req.setUrl(QUrl(_baseurl + "/ocs/v1.php/cloud/userkeys"));
+    req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
+
+    QNetworkReply *reply = _nam->post(req, postData.encodedQuery());
+    _directories[reply] = operation;
+
+    QEventLoop eventLoop;
+    // stay here until request is finished to avoid losing postData to early
+    connect(_nam, SIGNAL(finished()), &eventLoop, SLOT(quit()));
+    eventLoop.exec();
+}
+
+QMap<QString, QString> Encryption::key2pem(QString password)
+{
+    QMap<QString, QString> keypair;
+    BUF_MEM *bptr;
+    BIO *pubBio = BIO_new(BIO_s_mem());
+    BIO *privBio = BIO_new(BIO_s_mem());
+    EVP_PKEY *pkey;
+
+    pkey = EVP_PKEY_new();
+    EVP_PKEY_assign_RSA(pkey, Keymanager::Instance()->getRSAkey());
+
+    PEM_write_bio_RSA_PUBKEY(pubBio, Keymanager::Instance()->getRSAkey());
+    PEM_write_bio_PKCS8PrivateKey(privBio, pkey, EVP_aes_128_cfb(), NULL, 0, 0,  password.toLocal8Bit().data());
+
+    BIO_get_mem_ptr(pubBio, &bptr);
+    keypair["publickey"] = QString::fromAscii(bptr->data, bptr->length);
+
+    BIO_get_mem_ptr(privBio, &bptr);
+    keypair["privatekey"] = QString::fromAscii(bptr->data, bptr->length);
+
+    BIO_free_all(pubBio);
+    BIO_free_all(privBio);
+    EVP_PKEY_free(pkey);
+
+    return keypair;
+}
+
+bool Encryption::pem2key(QString privatekey, QString password)
+{
+    QByteArray ba = privatekey.toLocal8Bit();
+    char *c_privatekey = ba.data();
+
+    BIO *privBio =  BIO_new_mem_buf(c_privatekey, -1);
+    RSA *rsa = RSA_new();
+
+    if (PEM_read_bio_RSAPrivateKey(privBio, &rsa, 0, password.toLocal8Bit().data()) == NULL) {
+        return false;
+    }
+
+    Keymanager::Instance()->setRSAkey(rsa);
+
+    BIO_free_all(privBio);
+
+    return true;
+}
+
+
+/**
+ * Qt slots
+ */
+
+void Encryption::slotHttpRequestResults(QNetworkReply *reply)
+{
+    OCSCalls call = _directories.value(reply);
+    QMap<QString, QString> result;
+    QList<QString> returnValues;
+
+    if(reply->error() == QNetworkReply::NoError) {
+
+        QString xml =  reply->readAll();
+
+        switch (call)
+        {
+        case Encryption::GetUserKeys:
+            returnValues << "statuscode" << "publickey" << "privatekey";
+            result = parseXML(xml, returnValues);
+            if (result["statuscode"] == "100") {
+                if (!pem2key( result["privatekey"], _data.value(reply).value("password"))) {
+                    result["statuscode"] = "-1";
+                }
+            }
+            emit ocsGetUserKeysResults(result);
+            break;
+        case Encryption::SetUserKeys:
+            returnValues << "statuscode";
+            result = parseXML(xml, returnValues);
+            emit ocsSetUserKeysResults(result);
+            break;
+        case Encryption::ChangeKeyPassword:
+            if (_data.value(reply).constFind("step") !=  _data.value(reply).constEnd()) { // get key and check old password before setting the new one
+                returnValues << "statuscode" << "privatekey";
+                result = parseXML(xml, returnValues);
+                if (result["statuscode"] == "100") {
+                    if (!pem2key(result["privatekey"], _data.value(reply).value("oldpassword"))) {
+                        result["statuscode"] = "-1";
+                        emit ocsChangePasswordResult(result);
+                        break;
+                    }
+                    sendUserKeys(key2pem(_data.value(reply).value("newpassword")), Encryption::ChangeKeyPassword);
+                }
+            } else { //check if key was uploaded successfully
+                returnValues << "statuscode";
+                result = parseXML(xml, returnValues);
+                emit ocsChangePasswordResult(result);
+            }
+            break;
+        default :
+            qDebug() << "Something went wrong!";
+        }
+
+    } else {
+        onError(reply);
+        qDebug() << reply->errorString();
+    }
+    _directories.remove(reply);
+    _data.remove(reply);
+}
+
+void Encryption::onError(QNetworkReply *reply)
+{
+    OCSCalls call = _directories.value(reply);
+    QMap<QString, QString> result;
+    result.insert("statuscode", "-10");
+
+    switch (call)
+    {
+    case Encryption::GetUserKeys:
+        emit ocsGetUserKeysResults(result);
+        break;
+    case Encryption::SetUserKeys:
+        emit ocsSetUserKeysResults(result);
+        break;
+    case Encryption::ChangeKeyPassword:
+        emit ocsChangePasswordResult(result);
+        break;
+    default :
+        qDebug() << "Something went wrong!";
+    }
+
+}
+
+void Encryption::slotHttpAuth(QNetworkReply *reply, QAuthenticator *auth)
+{
+    auth->setUser(_username);
+    auth->setPassword(_password);
+}
+
+/**
+ * some helper functions
+ */
+
+QMap<QString, QString> Encryption::parseXML(QString xml, QList<QString> tags)
+{
+    QMap<QString, QString> result;
+
+    QDomDocument doc("results");
+    doc.setContent(xml);
+
+    for (int i = 0; i < tags.size(); ++i) {
+        QString tag = tags.at(i);
+        QDomNodeList elements = doc.elementsByTagName(tag);
+        if (elements.size() ==  1 ) {
+            result[tag] = elements.at(0).toElement().text();
+        }
+    }
+    return result;
+}
+

src/mirall/encryption.h

@@ -0,0 +1,67 @@
+#ifndef ENCRYPTION_H
+#define ENCRYPTION_H
+
+/*
+ * Copyright (C) 2012 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include <QObject>
+#include <QList>
+#include <QMap>
+#include <QHash>
+#include <openssl/rsa.h>
+
+class QNetworkAccessManager;
+class QNetworkReply;
+class QAuthenticator;
+
+class Encryption : public QObject
+{
+    Q_OBJECT
+public:
+    explicit Encryption(QString baseurl = "", QString username = "", QString password = "", QObject *parent = 0);
+    void setBaseUrl(QString baseurl);
+    void setAuthCredentials(QString username, QString password);
+    void getUserKeys(QString password);
+    void generateUserKeys(QString password);
+    void changeUserKeyPassword(QString oldpasswd, QString newpasswd);
+
+private:    
+    enum OCSCalls { SetUserKeys,
+                    GetUserKeys,
+                    ChangeKeyPassword };
+    QString _baseurl;
+    QString _username;
+    QString _password;
+    QNetworkAccessManager *_nam;
+    QHash<QNetworkReply*, OCSCalls> _directories;
+    QHash<QNetworkReply*, QHash<QString, QString> > _data;
+
+    QMap<QString, QString> parseXML(QString xml, QList<QString> tags);
+    QMap<QString, QString> key2pem(QString password);
+    bool pem2key(QString privatekey, QString password);
+    void sendUserKeys(QMap<QString, QString> keypair, OCSCalls operation);
+    void onError(QNetworkReply *reply);
+
+signals:
+    void ocsGetUserKeysResults(QMap<QString, QString>);
+    void ocsSetUserKeysResults(QMap<QString, QString>);
+    void ocsChangePasswordResult(QMap<QString, QString>);
+
+protected slots:
+    void slotHttpRequestResults(QNetworkReply*);
+    void slotHttpAuth(QNetworkReply*,QAuthenticator*);
+    
+};
+
+#endif // ENCRYPTION_H

src/mirall/fileitemdialog.cpp

@@ -1,295 +0,0 @@
-/*
- * Copyright (C) by Klaas Freitag <freitag@owncloud.com>
- *
- * 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; version 2 of the License.
- *
- * 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.
- */
-
-#include <QtGui>
-
-#include "mirall/fileitemdialog.h"
-#include "mirall/theme.h"
-#include "mirall/syncresult.h"
-
-#define TYPE_SUCCESS  1
-#define TYPE_CONFLICT 2
-#define TYPE_NEW      3
-#define TYPE_DELETED  4
-#define TYPE_ERROR    5
-#define TYPE_RENAME   6
-#define TYPE_IGNORE   7
-
-#define FILE_TYPE    100
-
-namespace Mirall {
-
-FileItemDialog::FileItemDialog(Theme *theme, QWidget *parent) :
-    QDialog(parent),
-    _theme(theme)
-{
-    setupUi(this);
-    connect(_dialogButtonBox->button(QDialogButtonBox::Close), SIGNAL(clicked()),
-            this, SLOT(accept()));
-
-    QStringList header;
-    header << tr("Files");
-    QString firstColString = tr("File Count");
-    header << firstColString;
-    _treeWidget->setHeaderLabels( header );
-
-    _treeWidget->setColumnWidth(0, 480);
-    _timer.setInterval(1000);
-    connect(&_timer, SIGNAL(timeout()), this, SLOT(slotSetFolderMessage()));
-
-    QPushButton *copyBtn = _dialogButtonBox->addButton(tr("Copy"), QDialogButtonBox::ActionRole);
-    connect(copyBtn, SIGNAL(clicked()), SLOT(copyToClipboard()));
-
-    setWindowTitle(tr("Sync Protocol"));
-
-}
-
-void FileItemDialog::setSyncResult( const SyncResult& result )
-{
-    QString folderMessage;
-
-    SyncResult::Status syncStatus = result.status();
-    switch( syncStatus ) {
-    case SyncResult::Undefined:
-        folderMessage = tr( "Undefined Folder State" );
-        break;
-    case SyncResult::NotYetStarted:
-        folderMessage = tr( "The folder waits to start syncing." );
-        break;
-    case SyncResult::Unavailable:
-        folderMessage = tr( "Server is currently not available." );
-        break;
-    case SyncResult::SyncRunning:
-        folderMessage = tr("Sync is running.");
-        break;
-    case SyncResult::Success:
-        folderMessage = tr("Last Sync was successful.");
-        break;
-    case SyncResult::Error:
-        folderMessage = tr( "Syncing Error." );
-        break;
-    case SyncResult::SetupError:
-        folderMessage = tr( "Setup Error." );
-        break;
-    default:
-        folderMessage = tr( "Undefined Error State." );
-    }
-
-    _folderMessage = folderMessage;
-    _lastSyncTime = result.syncTime();
-
-    if( result.errorStrings().count() ) {
-        _errorLabel->setVisible(true);
-        _errorLabel->setTextFormat(Qt::RichText);
-        QString errStr;
-        foreach( QString err, result.errorStrings() ) {
-            errStr.append(QString("<p>%1</p>").arg(err));
-        }
-
-        _errorLabel->setText(errStr);
-    } else {
-        _errorLabel->setText(QString::null);
-        _errorLabel->setVisible(false);
-    }
-
-    slotSetFolderMessage();
-    if( syncStatus == SyncResult::SyncRunning ) {
-        _timer.stop();
-    } else {
-        _timer.start();
-    }
-
-    setSyncFileItems( result.syncFileItemVector() );
-
-}
-
-void FileItemDialog::slotSetFolderMessage()
-{
-    QDateTime now = QDateTime::currentDateTime();
-    int secs = _lastSyncTime.secsTo(now);
-
-    _timelabel->setText(tr("%1  (finished %2 sec. ago)").arg(_folderMessage).arg(secs));
-}
-
-void FileItemDialog::copyToClipboard()
-{
-    QString text;
-    QTextStream ts(&text);
-
-    int topLevelItems = _treeWidget->topLevelItemCount();
-    for (int i = 0; i < topLevelItems; i++) {
-        QTreeWidgetItem *item = _treeWidget->topLevelItem(i);
-        ts << left << qSetFieldWidth(50)
-           << item->data(0, Qt::DisplayRole).toString()
-           << right << qSetFieldWidth(6)
-           << item->data(1, Qt::DisplayRole).toString()
-           << endl;
-        int childItems = item->childCount();
-        for (int j = 0; j < childItems; j++) {
-            QTreeWidgetItem *child =item->child(j);
-            ts << left << qSetFieldWidth(0) << QLatin1String("   ")
-               << child->data(0,Qt::DisplayRole).toString()
-               << QString::fromLatin1(" (%1)").arg(
-                      child->data(1, Qt::DisplayRole).toString()
-                      )
-               << endl;
-        }
-    }
-
-    QApplication::clipboard()->setText(text);
-}
-
-void FileItemDialog::accept()
-{
-    _timer.stop();
-    QDialog::accept();
-}
-
-void FileItemDialog::setSyncFileItems( const SyncFileItemVector& list )
-{
-    _treeWidget->clear();
-    QStringList strings;
-    QFont headerFont;
-    headerFont.setWeight(QFont::Bold);
-
-    strings.clear();
-    strings.append(tr("Synced Files"));
-    _syncedFileItem = new QTreeWidgetItem( _treeWidget, strings, TYPE_SUCCESS );
-    _syncedFileItem->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless);
-    _treeWidget->addTopLevelItem(_syncedFileItem);
-
-    strings.clear();
-    strings.append(tr("New Files"));
-    _newFileItem = new QTreeWidgetItem( _treeWidget, strings, TYPE_NEW );
-    _newFileItem->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless);
-    _treeWidget->addTopLevelItem(_newFileItem);
-
-    strings.clear();
-    strings.append(tr("Deleted Files"));
-    _deletedFileItem = new QTreeWidgetItem( _treeWidget, strings, TYPE_DELETED );
-    _deletedFileItem->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless);
-    _treeWidget->addTopLevelItem(_deletedFileItem);
-
-    strings.clear();
-    strings.append(tr("Renamed Files"));
-    _renamedFileItem = new QTreeWidgetItem( _treeWidget, strings, TYPE_RENAME);
-    _renamedFileItem->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless);
-    _treeWidget->addTopLevelItem(_renamedFileItem);
-
-    strings.clear();
-    strings.append(tr("Ignored Files"));
-    _ignoredFileItem = new QTreeWidgetItem( _treeWidget, strings, TYPE_IGNORE);
-    _ignoredFileItem->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless);
-    _treeWidget->addTopLevelItem(_renamedFileItem);
-
-    strings.clear();
-    strings.append(tr("Errors"));
-    _errorFileItem = new QTreeWidgetItem( _treeWidget, strings, TYPE_ERROR );
-    _errorFileItem->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless);
-    _treeWidget->addTopLevelItem(_errorFileItem);
-
-    strings.clear();
-    strings.append(tr("Conflicts"));
-    _conflictFileItem = new QTreeWidgetItem( _treeWidget, strings, TYPE_CONFLICT);
-    _conflictFileItem->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless);
-    _treeWidget->addTopLevelItem(_conflictFileItem);
-
-    QList<QTreeWidgetItem*> syncedItems;
-    QList<QTreeWidgetItem*> renamedItems;
-    QList<QTreeWidgetItem*> newItems;
-    QList<QTreeWidgetItem*> deletedItems;
-    QList<QTreeWidgetItem*> ignoredItems;
-    QList<QTreeWidgetItem*> conflictItems;
-    QList<QTreeWidgetItem*> errorItems;
-
-    quint64 overall_files = 0;
-
-    foreach( SyncFileItem item, list ) {
-        overall_files++;
-
-        QString dir;
-        QStringList str( item._file );
-        if( item._dir == SyncFileItem::Up )   dir = tr("Up");
-        if( item._dir == SyncFileItem::Down ) dir = tr("Down");
-        str << dir;
-
-        switch( item._instruction ) {
-        case   CSYNC_INSTRUCTION_NONE:
-            // do nothing.
-            break;
-        case CSYNC_INSTRUCTION_EVAL:
-            // should not happen
-            break;
-        case CSYNC_INSTRUCTION_REMOVE:
-        case CSYNC_INSTRUCTION_DELETED:
-            deletedItems.append( new QTreeWidgetItem(_deletedFileItem, str, FILE_TYPE) );
-            break;
-        case CSYNC_INSTRUCTION_RENAME:
-            renamedItems.append( new QTreeWidgetItem(_renamedFileItem, str, FILE_TYPE) );
-            break;
-        case CSYNC_INSTRUCTION_NEW:
-            newItems.append( new QTreeWidgetItem(_newFileItem, str, FILE_TYPE) );
-            break;
-        case CSYNC_INSTRUCTION_CONFLICT:
-            conflictItems.append( new QTreeWidgetItem(_conflictFileItem, str, FILE_TYPE) );
-            break;
-        case CSYNC_INSTRUCTION_IGNORE:
-            ignoredItems.append( new QTreeWidgetItem(_ignoredFileItem, str, FILE_TYPE) );
-            break;
-        case CSYNC_INSTRUCTION_SYNC:
-        case CSYNC_INSTRUCTION_UPDATED:
-            syncedItems.append( new QTreeWidgetItem(_syncedFileItem, str, FILE_TYPE) );
-            break;
-        case CSYNC_INSTRUCTION_STAT_ERROR:
-        case CSYNC_INSTRUCTION_ERROR:
-            errorItems.append( new QTreeWidgetItem(_errorFileItem, str, FILE_TYPE) );
-            break;
-        default:
-            break;
-        }
-    }
-
-    formatHeaderItem( _syncedFileItem, syncedItems );
-    formatHeaderItem( _newFileItem, newItems );
-    formatHeaderItem( _deletedFileItem, deletedItems );
-    formatHeaderItem( _renamedFileItem, renamedItems );
-    formatHeaderItem( _errorFileItem, errorItems );
-    formatHeaderItem( _conflictFileItem, conflictItems );
-    formatHeaderItem( _ignoredFileItem, ignoredItems );
-
-}
-
-void FileItemDialog::formatHeaderItem( QTreeWidgetItem *header, const QList<QTreeWidgetItem*>& list )
-{
-    if( !header ) return;
-
-    header->addChildren( list );
-    int count = list.count();
-#if LEAVE_THAT_TO_DESIGNERS
-    QColor col("#adc5d3");
-    header->setBackgroundColor(0, col);
-    header->setBackgroundColor(1, col);
-#endif
-    header->setText(1, QString::number( count ));
-    if( count ) {
-        QFont font;
-        font.setWeight( QFont::Bold );
-        header->setFont(0, font);
-        header->setFont(1, font);
-        header->setExpanded(true);
-    } else {
-        header->setExpanded(false);
-    }
-}
-
-}

src/mirall/fileitemdialog.h

@@ -1,65 +0,0 @@
-/*
- * Copyright (C) by Klaas Freitag <freitag@owncloud.com>
- *
- * 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; version 2 of the License.
- *
- * 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.
- */
-
-#ifndef FILEITEMDIALOG_H
-#define FILEITEMDIALOG_H
-
-#include <QDialog>
-#include <QDateTime>
-#include <QTimer>
-
-#include "mirall/syncfileitem.h"
-
-#include "ui_fileitemdialog.h"
-
-namespace Mirall {
-class Theme;
-class SyncResult;
-
-
-class FileItemDialog : public QDialog, public Ui::_fileItemDialog
-{
-    Q_OBJECT
-public:
-    explicit FileItemDialog(Theme*, QWidget *parent = 0);
-    void setSyncResult( const SyncResult& );
-
-signals:
-
-public slots:
-    void accept();
-
-protected slots:
-    void slotSetFolderMessage();
-    void copyToClipboard();
-
-private:
-    void setSyncFileItems( const SyncFileItemVector& list );
-    void formatHeaderItem( QTreeWidgetItem *, const QList<QTreeWidgetItem*>& );
-
-    QTreeWidgetItem *_newFileItem;
-    QTreeWidgetItem *_syncedFileItem;
-    QTreeWidgetItem *_deletedFileItem;
-    QTreeWidgetItem *_renamedFileItem;
-    QTreeWidgetItem *_errorFileItem;
-    QTreeWidgetItem *_conflictFileItem;
-    QTreeWidgetItem *_ignoredFileItem;
-
-    Theme    *_theme;
-    QString   _folderMessage;
-    QDateTime _lastSyncTime;
-    QTimer    _timer;
-};
-
-}
-#endif // FILEITEMDIALOG_H

src/mirall/fileitemdialog.ui

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>_fileItemDialog</class>
- <widget class="QWidget" name="_fileItemDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>612</width>
-    <height>543</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="font">
-        <font>
-         <pointsize>14</pointsize>
-        </font>
-       </property>
-       <property name="text">
-        <string>Detailed Sync Protocol</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QTreeWidget" name="_treeWidget">
-       <property name="alternatingRowColors">
-        <bool>true</bool>
-       </property>
-       <property name="rootIsDecorated">
-        <bool>true</bool>
-       </property>
-       <property name="uniformRowHeights">
-        <bool>true</bool>
-       </property>
-       <property name="sortingEnabled">
-        <bool>true</bool>
-       </property>
-       <property name="columnCount">
-        <number>2</number>
-       </property>
-       <column>
-        <property name="text">
-         <string notr="true">1</string>
-        </property>
-       </column>
-       <column>
-        <property name="text">
-         <string notr="true">2</string>
-        </property>
-       </column>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="_timelabel">
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="_errorLabel">
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="_dialogButtonBox">
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Close</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

src/mirall/fileutils.cpp

@@ -25,7 +25,7 @@ QStringList FileUtils::subFoldersList(QString folder,
                                       SubFolderListOptions options)
 {
     QDir dir(folder);
-    dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks);
+    dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
 
     QFileInfoList list = dir.entryInfoList();
     QStringList dirList;

src/mirall/folder.cpp

@@ -11,7 +11,6 @@
  * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
  * for more details.
  */
-#include "config.h"
 
 #include "mirall/folder.h"
 #include "mirall/folderwatcher.h"
@@ -49,6 +48,7 @@ Folder::Folder(const QString &alias, const QString &path, const QString& secondP
     QObject::connect(_pollTimer, SIGNAL(timeout()), this, SLOT(slotPollTimerTimeout()));
     _pollTimer->start();
 
+#ifdef USE_INOTIFY
     _watcher = new Mirall::FolderWatcher(path, this);
 
     MirallConfigFile cfg;
@@ -57,6 +57,7 @@ Folder::Folder(const QString &alias, const QString &path, const QString& secondP
 
     QObject::connect(_watcher, SIGNAL(folderChanged(const QStringList &)),
                      SLOT(slotChanged(const QStringList &)));
+#endif
     QObject::connect(this, SIGNAL(syncStarted()),
                      SLOT(slotSyncStarted()));
     QObject::connect(this, SIGNAL(syncFinished(const SyncResult &)),
@@ -69,52 +70,18 @@ Folder::Folder(const QString &alias, const QString &path, const QString& secondP
     _online = true;
 #endif
 
+    _pathWatcher = new QFileSystemWatcher(this);
+    _pathWatcher->addPath( _path );
+    connect(_pathWatcher, SIGNAL(directoryChanged(QString)),SLOT(slotLocalPathChanged(QString)));
+
     _syncResult.setStatus( SyncResult::NotYetStarted );
 
-    // check if the local path exists
-    checkLocalPath();
 }
 
 Folder::~Folder()
 {
 }
 
-void Folder::checkLocalPath()
-{
-    QFileInfo fi(_path);
-
-    if( fi.isDir() && fi.isReadable() ) {
-        qDebug() << "Checked local path ok";
-    } else {
-        if( !fi.exists() ) {
-            // try to create the local dir
-            QDir d(_path);
-            if( d.mkpath(_path) ) {
-                qDebug() << "Successfully created the local dir " << _path;
-            }
-        }
-        // Check directory again
-        if( !fi.exists() ) {
-            _syncResult.setErrorString(tr("Local folder %1 does not exist.").arg(_path));
-            _syncResult.setStatus( SyncResult::SetupError );
-        } else if( !fi.isDir() ) {
-            _syncResult.setErrorString(tr("%1 should be a directory but is not.").arg(_path));
-            _syncResult.setStatus( SyncResult::SetupError );
-        } else if( !fi.isReadable() ) {
-            _syncResult.setErrorString(tr("%1 is not readable.").arg(_path));
-            _syncResult.setStatus( SyncResult::SetupError );
-        }
-    }
-
-    // if all is fine, connect a FileSystemWatcher
-    if( _syncResult.status() != SyncResult::SetupError ) {
-        _pathWatcher = new QFileSystemWatcher(this);
-        _pathWatcher->addPath( _path );
-        connect(_pathWatcher, SIGNAL(directoryChanged(QString)),
-                SLOT(slotLocalPathChanged(QString)));
-    }
-}
-
 QString Folder::alias() const
 {
     return _alias;
@@ -122,11 +89,7 @@ QString Folder::alias() const
 
 QString Folder::path() const
 {
-    QString p(_path);
-    if( ! p.endsWith(QLatin1Char('/')) ) {
-        p.append(QLatin1Char('/'));
-    }
-    return p;
+    return _path;
 }
 
 QString Folder::secondPath() const
@@ -141,7 +104,7 @@ QString Folder::nativePath() const
 
 QString Folder::nativeSecondPath() const
 {
-    return secondPath();
+    return QDir::toNativeSeparators(_secondPath);
 }
 
 bool Folder::syncEnabled() const
@@ -152,7 +115,9 @@ bool Folder::syncEnabled() const
 void Folder::setSyncEnabled( bool doit )
 {
   _enabled = doit;
+#ifdef USE_INOTIFY
   _watcher->setEventsEnabled( doit );
+#endif
   if( doit && ! _pollTimer->isActive() ) {
       _pollTimer->start();
   }
@@ -193,11 +158,6 @@ int Folder::pollInterval() const
     return _pollTimer->interval();
 }
 
-void Folder::setSyncState(SyncResult::Status state)
-{
-    _syncResult.setStatus(state);
-}
-
 void Folder::setPollInterval(int milliseconds)
 {
     _pollTimer->setInterval( milliseconds );
@@ -219,10 +179,12 @@ void Folder::incrementErrorCount()
   // of the watcher is doubled.
   _errorCount++;
   if( _errorCount > 1 ) {
+#ifdef USE_INOTIFY
     int interval = _watcher->eventInterval();
     int newInt = 2*interval;
     qDebug() << "Set new watcher interval to " << newInt;
     _watcher->setEventInterval( newInt );
+#endif
     _errorCount = 0;
   }
 }
@@ -253,10 +215,18 @@ void Folder::evaluateSync(const QStringList &pathList)
 
 }
 
+void Folder::startSync( const QStringList &pathList )
+{
+    _syncResult.setStatus( SyncResult::SyncRunning );
+    emit syncStateChange();
+}
+
 void Folder::slotPollTimerTimeout()
 {
     qDebug() << "* Polling" << alias() << "for changes. Ignoring all pending events until now";
+#ifdef USE_INOTIFY
     _watcher->clearPendingEvents();
+#endif
     evaluateSync(QStringList());
 }
 
@@ -275,12 +245,16 @@ void Folder::slotChanged(const QStringList &pathList)
 void Folder::slotSyncStarted()
 {
     // disable events until syncing is done
+#ifdef USE_INOTIFY
     _watcher->setEventsEnabled(false);
+#endif
 }
 
 void Folder::slotSyncFinished(const SyncResult &result)
 {
-    _watcher->setEventsEnabledDelayed(2000);
+#ifdef USE_INOTIFY
+    _watcher->setEventsEnabled(true);
+#endif
 
     qDebug() << "OO folder slotSyncFinished: result: " << int(result.status()) << " local: " << result.localRunOnly();
     emit syncStateChange();
@@ -307,16 +281,6 @@ void Folder::slotLocalPathChanged( const QString& dir )
     }
 }
 
-void Folder::setConfigFile( const QString& file )
-{
-    _configFile = file;
-}
-
-QString Folder::configFile()
-{
-    return _configFile;
-}
-
 void Folder::setBackend( const QString& b )
 {
   _backend = b;

src/mirall/folder.h

@@ -15,12 +15,12 @@
 #ifndef MIRALL_FOLDER_H
 #define MIRALL_FOLDER_H
 
+#include "config.h"
 
 #include <QObject>
 #include <QString>
 #include <QStringList>
 #include <QHash>
-#include <QTimer>
 
 #if QT_VERSION >= 0x040700
 #include <QNetworkConfigurationManager>
@@ -29,12 +29,15 @@
 #include "mirall/syncresult.h"
 
 class QAction;
+class QTimer;
 class QIcon;
 class QFileSystemWatcher;
 
 namespace Mirall {
 
+#ifdef USE_INOTIFY
 class FolderWatcher;
+#endif
 
 class Folder : public QObject
 {
@@ -45,7 +48,6 @@ public:
     virtual ~Folder();
 
     typedef QHash<QString, Folder*> Map;
-    typedef QHashIterator<QString, Folder*> MapIterator;
 
     /**
      * alias or nickname
@@ -135,12 +137,6 @@ public:
      */
      QString backend() const;
 
-     /**
-      * set the config file name.
-      */
-     void setConfigFile( const QString& );
-     QString configFile();
-
      /**
       * This is called if the sync folder definition is removed. Do cleanups here.
       */
@@ -149,12 +145,6 @@ public:
      QIcon icon( int size ) const;
      QTimer   *_pollTimer;
 
-signals:
-    void syncStateChange();
-    void syncStarted();
-    void syncFinished(const SyncResult &result);
-    void scheduleToSync( const QString& );
-
 public slots:
      void slotSyncFinished(const SyncResult &);
 
@@ -168,24 +158,55 @@ public slots:
        */
      virtual void slotTerminateSync() = 0;
 
-     /**
-      * Sets minimum amounts of milliseconds that will separate
-      * poll intervals
-      */
-     void setPollInterval( int );
-
 protected:
     /**
      * The minimum amounts of seconds to wait before
      * doing a full sync to see if the remote changed
      */
     int pollInterval() const;
-    void setSyncState(SyncResult::Status state);
 
+    /**
+     * Sets minimum amounts of milliseconds that will separate
+     * poll intervals
+     */
+    void setPollInterval( int );
+
+signals:
+    void syncStateChange();
+    void syncStarted();
+    void syncFinished(const SyncResult &result);
+    void scheduleToSync( const QString& );
+
+protected:
+#ifdef USE_INOTIFY
     FolderWatcher *_watcher;
+#endif
     int _errorCount;
     SyncResult _syncResult;
 
+private:
+
+    /**
+     * Starts a sync (calling startSync)
+     * if the policies allow for it
+     */
+    void evaluateSync(const QStringList &pathList);
+
+    QString   _path;
+    QString   _secondPath;
+    QString   _alias;
+    bool      _onlyOnlineEnabled;
+    bool      _onlyThisLANEnabled;
+
+    QFileSystemWatcher *_pathWatcher;
+
+#if QT_VERSION >= 0x040700
+    QNetworkConfigurationManager _networkMgr;
+#endif
+    bool       _online;
+    bool       _enabled;
+    QString    _backend;
+
 protected slots:
 
     void slotOnlineChanged(bool online);
@@ -202,32 +223,6 @@ protected slots:
      */
     virtual void slotLocalPathChanged( const QString& );
 
-private:
-
-    /**
-     * Starts a sync (calling startSync)
-     * if the policies allow for it
-     */
-    void evaluateSync(const QStringList &pathList);
-
-    virtual void checkLocalPath();
-
-    QString   _path;
-    QString   _secondPath;
-    QString   _alias;
-    bool      _onlyOnlineEnabled;
-    bool      _onlyThisLANEnabled;
-    QString   _configFile;
-
-    QFileSystemWatcher *_pathWatcher;
-
-#if QT_VERSION >= 0x040700
-    QNetworkConfigurationManager _networkMgr;
-#endif
-    bool       _online;
-    bool       _enabled;
-    QString    _backend;
-
 };
 
 }