ChangeLog

to recover from invalid databases. Features
a big fat warning.

CMakeLists.txt

@@ -4,17 +4,34 @@ project(mirall)
 set(PACKAGE "mirall")
 set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 
-if ( EXISTS ${CMAKE_SOURCE_DIR}/OEM.cmake )
-     include ( ${CMAKE_SOURCE_DIR}/OEM.cmake )
+set(OEM_THEME_DIR "" CACHE STRING "Define directory containing a custom theme")
+if ( 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_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${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)
     set(CMAKE_INSTALL_SYSCONFDIR "/etc")
@@ -37,13 +54,29 @@ else()
 endif()
 #####
 
+#####
+## handle DBUS for Fdo notifications
+if( UNIX AND NOT APPLE )
+    add_definitions( -DUSE_FDO_NOTIFICATIONS)
+endif()
+####
+
+#### find libs
 find_package(Qt4 4.6.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest REQUIRED )
-find_package(Csync)
+if( UNIX AND NOT APPLE ) # Fdo notifications
+    find_package(Qt4 4.6.0 COMPONENTS QtDBus REQUIRED )
+endif()
+find_package(Csync REQUIRED)
+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)
@@ -69,12 +102,6 @@ set(CPACK_SOURCE_IGNORE_FILES
 
 include(OwnCloudCPack.cmake)
 
-#
-# 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
-# but if that fails because cmake is too old, uncomment this here if you want to build
-# owncloud.
-# add_definitions(-DOWNCLOUD_CLIENT)
 add_definitions(-DUNICODE)
 add_definitions(-D_UNICODE)
 

CONTRIBUTING.md

@@ -0,0 +1,48 @@
+## 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].
+
+### Bug Reporting Guidelines
+* Important: 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/

CPackOptions.cmake.in

@@ -9,9 +9,10 @@ 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 ( EXISTS "${CMAKE_SOURCE_DIR}/OEM.cmake" )
-     include ( "${CMAKE_SOURCE_DIR}/OEM.cmake" )
+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()

ChangeLog

@@ -1,6 +1,105 @@
 ChangeLog
 =========
-version 1.1.2 (release 2012-11- ), csync 0.60.2 required
+version 1.3.0 (release 2013-06-25 ), csync 0.80.0 required
+
+  * Default proxy port to 8080
+  * Don't lose proxy settings when changing passwords
+  * Support SOCKS5 proxy (useful in combination with ssh   *D)
+  * Propagate proxy changes to csync at runtime
+  * Improve proxy wizard
+  * Display proxy errors
+  * Solved problems with lock files
+  * Warn if for some reason all files are scheduled for removal on either side
+  * Avoid infinite loop if authentication fails in certain cases
+  * Fix reading the password from the config in certain cases
+  * Do not crash when configured sync target disappears
+  * Make --help work on windows
+  * Make sync feedback less ambiguous.
+  * Fix icon tray tooltip sometimes showing repeated content
+  * More use of native directory separators on Windows
+  * Remove journal when reusing a directory that used to have a journal before
+  * Visual clean up of status dialog items
+  * Wizard: When changing the URL or user name, allow the user to push his data
+    to the new location or wipe the folder and start from scratch
+  * Wizard: Make setting a custom folder as a sync target work again
+  * Fix application icon
+  * User-Agent now contains "Mozilla/5.0" and the Platform name (for firewall/proxy compat)
+  * Server side directory moves will be detected
+  * New setup wizard, defaulting to root syncing (only for new setups)
+  * Improved thread stop/termination
+
+version 1.2.5 (release 2013-04-23 ), csync 0.70.7 required
+  * [Fixes] NSIS installer fixes
+  * [Fixes] Fix crash race by making certificateChain() thread safe
+  * [Fixes] Build with older CMake versions (CentOS/RHEL 6) 
+  * [Fixes] Wording in GUI
+  * [Fixes] Silently ignore "installed = true" status.php
+  * Set log verbosity before calling csync_init.
+  * GUI feedback for the statistics copy action
+  * Safer approach for detecting duplicate sync runs
+
+version 1.2.4 (release 2013-04-11 ), csync 0.70.6 required
+  * [Fixes] Clarify string in folder wizard
+  * [Fixes] Fixed some valgrind warnings
+  * [Fixes] Ensure that only one sync thread can ever run 
+  * [Fixes] Fix default config storage path
+  * [Fixes] Skip folders with no absolute path
+  * [Fixes] Allow setting the configuration directory on command line
+
+version 1.2.3 (release 2013-04-02 ), csync 0.70.5 required
+  * [Fixes] Unbreak self-signed certificate handling
+
+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.
@@ -18,23 +117,19 @@ version 1.1.2 (release 2012-11- ), csync 0.60.2 required
   * [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]   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] 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 
+  * [Fixes] csync: Fix memory leak
+  * [Fixes] csync: Allow single quote (') in file names
+  * [Fixes] csync: Remove stray temporary files
 
-version 1.1.0 (release 2012-10-10), csync 0.60.0 required
-  * [GUI]   Added an about dialog
-  * [GUI]   Improved themeing capabilities of the client.
-  * [GUI]   Minor fixes in folder assistant.
   * [GUI]   Reworked tray context menu.
   * [GUI]   Users can now sync the server root folder.
   * [Fixes] Proxy support: now supports Proxy Auto-Configuration (PAC)
@@ -53,7 +148,7 @@ version 1.1.0 (release 2012-10-10), csync 0.60.0 required
   * [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, 
+            /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()
 
@@ -62,7 +157,7 @@ version 1.0.5 (release 2012-08-14), csync 0.50.8 required
 
 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
@@ -73,13 +168,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.
@@ -88,7 +183,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.
@@ -129,4 +224,3 @@ version 1.0.1 (release 2012-04-18), csync 0.50.5 required
   * [Platform] MacOSX Bundle creation added
   * [Platform] Enabled ranslations on Windows.
 
-

OWNCLOUD.cmake

@@ -1,7 +1,10 @@
 set( APPLICATION_SHORTNAME  "owncloud" )
 set( APPLICATION_NAME       "ownCloud" )
 set( APPLICATION_EXECUTABLE "owncloud"        )
-set( APPLICATION_DOMAIN     "owncloud.org"    )
-set( APPLICATION_VENDOR     "ownCloud.org"    )
+set( APPLICATION_DOMAIN     "owncloud.com"    )
+set( APPLICATION_VENDOR     "ownCloud, Inc"   )
 set( THEME_CLASS            "ownCloudTheme"   )
-set( APPLICATION_REV_DOMAIN "org.owncloud.desktopclient" )
+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,8 +2,8 @@ include( InstallRequiredSystemLibraries )
 
 set( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )
 
-if ( EXISTS "${CMAKE_SOURCE_DIR}/OEM.cmake" )
-     include ( "${CMAKE_SOURCE_DIR}/OEM.cmake" )
+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()
@@ -45,12 +45,12 @@ if(WIN32)
     # 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  "ownCloud Syncing Client" ) #  Description summary of a project
+    set( CPACK_PACKAGE_DESCRIPTION_SUMMARY  "${APPLICATION_NAME} 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://owncloud.com" )   # Package vendor name
+    set( CPACK_PACKAGE_VENDOR  "http://${APPLICATION_DOMAIN}" )   # 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

@@ -2,50 +2,12 @@
 
 ## Introduction
 
-Mirall synchronizes your folders with another computer.
-
-The ultimate goals of Mirall are:
-
-* Network location aware: should not try to sync against your NAS if you are
-  not in the home network
-* It is a zero-interaction tool. So forget about resolving conflicts.
-* It should work silently and realiably.
-
-Mirall is in early stages of development, and may still eat your
-files or hang your computer.
-
-* Network location awareness not implemented yet
-* Current version supports local and remote (sftp and smb) folders.
-* It is powered by csync (http://www.csync.org), however
-  the user does not know and other tools will be incorporated to provide other
-  functionality.
-
-## Current issues
-
-* No sane way to backup conflicting versions yet, this should be solved
-  in a near csync release (--conflictcopy, available in Jann's branch).
-  Right now the newest copy wins.
-* You can't remove folder configurations
-  Workaround: delete ~/.local/share/data/Mirall/folders/$alias and restart
-* Some tasks block the GUI (initial setup of watchers)
-* May be some concurrency issues
-
-## Roadmap
-
-* Improve robustness to minimize user interaction
-* Improve feedback and sync results
-* Add support for other folder types: tarsnap, duplicity, git (SparkleShare)
-
-## Requirements
-
-* Linux (currently it uses inotify to detect file changes)
-* unison installed in the local and remote machine
-  (you should not care if you got Mirall with your favorite
-   distribution)
+Mirall is a tool to synchronize files from ownCloud Server with your computer.
+It uses OCSync as its syncing backend.
 
 ## Download
 
-### openSUSE
+### Binary packages
 
 * Refer to the download page http://owncloud.org/sync-clients/
 
@@ -55,23 +17,12 @@ files or hang your computer.
 
 ## Building the source code
 
-You need Qt 4.7 and cmake:
-
-    mkdir build
-    cd build
-    cmake ..
-    make
-
-To generate a tarball:
-
-    mkdir build
-    cd build
-    cmake ..
-    make package_source
+Please refer to [Building the Client](http://doc.owncloud.org/desktop/1.2/building.html)
+in the ownCloud client manual.
 
 ## Authors
 
-* Duncan Mac-Vicar P. <duncan@kde.org>
+* Duncan Mac-Vicar P. <duncan@kde.org> (original Mirall author)
 * Klaas Freitag <freitag@owncloud.com>
 * Daniel Molkentin <danimo@owncloud.com>
 

VERSION.cmake

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

admin/osx/sign_dmg.sh

@@ -11,7 +11,7 @@ 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 2s
+sleep 12s
 pushd $mount
 codesign -s "$identity" $mount/*.app
 popd

admin/win/Toolchain-mingw32-openSUSE.cmake

@@ -32,3 +32,7 @@ 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

cmake/modules/FindCsync.cmake

@@ -1,28 +1,28 @@
-IF(EXISTS "${CMAKE_SOURCE_DIR}/../csync/src/csync.h")
-  SET(CSYNC_INCLUDE_PATH ${CMAKE_SOURCE_DIR}/../csync/src/)
-ELSE()
-  FIND_PATH(CSYNC_INCLUDE_PATH NAMES csync.h HINTS $ENV{CSYNC_DIR} )
-ENDIF()
 
-IF( DEFINED CSYNC_LIBRARY_PATH AND DEFINED CSYNC_INCLUDE_PATH )
-  IF( WIN32 )
-    SET(CSYNC_LIBRARY ${CSYNC_LIBRARY_PATH}/src/libocsync.dll)
-  ELSEIF ( APPLE )
-    SET(CSYNC_LIBRARY ${CSYNC_LIBRARY_PATH}/src/libocsync.dylib)
+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_LIBRARY_PATH}/src/libocsync.so)
-  ENDIF( )
-  SET(CSYNC_BINARY_DIR ${CSYNC_LIBRARY_PATH})
+    SET(CSYNC_LIBRARY ${CSYNC_BUILD_PATH}/src/libocsync.so)
+  ENDIF()
 ELSE()
   FIND_LIBRARY(CSYNC_LIBRARY NAMES ocsync HINTS $ENV{CSYNC_DIR})
 ENDIF()
 
+IF(NOT DEFINED CSYNC_INCLUDE_PATH)
+  FIND_PATH(CSYNC_INCLUDE_PATH NAMES csync.h HINTS $ENV{CSYNC_DIR} )
+ENDIF()
+
 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)
+find_path(INOTIFY_INCLUDE_DIR sys/inotify.h 
+          HINTS /usr/include/${CMAKE_LIBRARY_ARCHITECTURE})
 mark_as_advanced(INOTIFY_INCLUDE_DIR)
 
-
-# handle the QUIETLY and REQUIRED arguments and set INOTIFY_FOUND to TRUE if
 # all listed variables are TRUE
+# handle the QUIETLY and REQUIRED arguments and set INOTIFY_FOUND to TRUE if
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(INOTIFY DEFAULT_MSG INOTIFY_INCLUDE_DIR)
 

cmake/modules/FindQtKeychain.cmake

@@ -0,0 +1,18 @@
+# - 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/GetGitRevisionDescription.cmake

@@ -0,0 +1,123 @@
+# - 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

@@ -0,0 +1,38 @@
+# 
+# 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/NSIS.template.in

@@ -6,9 +6,7 @@
 !define APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@.exe"
 !define APPLICATION_DOMAIN "@APPLICATION_DOMAIN@"
 !define APPLICATION_LICENSE "@APPLICATION_LICENSE@"
-
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.${APPLICATION_DOMAIN}"
-
+!define WIN_SETUP_BITMAP_PATH "@WIN_SETUP_BITMAP_PATH@"
 
 ;-----------------------------------------------------------------------------
 ; Some installer script options (comment-out options not required)
@@ -33,9 +31,11 @@
 !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"
 
@@ -63,7 +63,6 @@
 ; Initial installer setup and definitions.
 ;-----------------------------------------------------------------------------
 Name "@CPACK_NSIS_PACKAGE_NAME@"
-Caption "${APPLICATION_NAME} Setup"
 BrandingText "${APPLICATION_NAME} ${VERSION}  -- ${BUILD_TIME}"
 OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
 InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
@@ -103,14 +102,12 @@ 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 ${NSI_PATH}\welcome_${APPLICATION_SHORTNAME}.bmp
-!define MUI_WELCOMEPAGE_TITLE "Welcome to the @CPACK_PACKAGE_NAME@ ${VERSION} Setup Wizard"
-!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation.$\r$\n$\r$\n$_CLICK"
+!define MUI_WELCOMEFINISHPAGE_BITMAP ${WIN_SETUP_BITMAP_PATH}/welcome.bmp
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP ${NSI_PATH}\page_header_${APPLICATION_SHORTNAME}.bmp
+!define MUI_HEADERIMAGE_BITMAP  ${WIN_SETUP_BITMAP_PATH}/page_header.bmp
 !define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_FINISHPAGE_TITLE "@CPACK_PACKAGE_NAME@ Setup Completed"
-!define MUI_FINISHPAGE_LINK "Click here to visit the @CPACK_PACKAGE_NAME@ website."
+!define MUI_FINISHPAGE_LINK "www.${APPLICATION_DOMAIN}"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.${APPLICATION_DOMAIN}"
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !ifdef OPTION_FINISHPAGE_RELEASE_NOTES
    !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
@@ -128,7 +125,7 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 ;-----------------------------------------------------------------------------
 !insertmacro MUI_PAGE_WELCOME
 !ifdef OPTION_LICENSE_AGREEMENT
-   !insertmacro MUI_PAGE_LICENSE "${source_path}/${APPLICATION_LICENSE}"
+   !insertmacro MUI_PAGE_LICENSE "${APPLICATION_LICENSE}"
 !endif
 Page custom PageReinstall PageLeaveReinstall
 !insertmacro MUI_PAGE_COMPONENTS
@@ -270,7 +267,7 @@ FunctionEnd
 #   INSTALLER SECTIONS                                                       #
 #                                                                            #
 ##############################################################################
-Section "${APPLICATION_NAME}" SEC_OWNCLOUD
+Section "${APPLICATION_NAME}" SEC_APPLICATION
    SectionIn 1 2 3 RO
    SetDetailsPrint listonly
 
@@ -287,22 +284,83 @@ 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
@@ -316,7 +374,7 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD
 
    ;License & release notes.
    File "@CPACK_RESOURCE_FILE_LICENSE@"
-   File /oname=NOTES.txt ${NSI_PATH}\RELEASE_NOTES.txt
+   ;File /oname=NOTES.txt ${NSI_PATH}\RELEASE_NOTES.txt
 
    ;QT stuff:
    File "${QT_DLL_PATH}\QtCore4.dll"
@@ -324,6 +382,9 @@ 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 "${MING_BIN}\libsqlite3-0.dll"
    File "${MING_BIN}\libiniparser.dll"
@@ -331,14 +392,10 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD
    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
@@ -349,11 +406,10 @@ 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-8.dll"
-   File "${MING_BIN}\libssl-8.dll"
+   File "${MING_BIN}\libcrypto-10.dll"
+   File "${MING_BIN}\libssl-10.dll"
 
    ; CSync configs
-   File "${CSYNC_CONFIG_DIR}/ocsync.conf"
    File "${SOURCE_PATH}/sync-exclude.lst"
 
 SectionEnd
@@ -369,9 +425,9 @@ SectionGroup "Shortcuts"
       SetShellVarContext all
       RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}"
       CreateDirectory "$SMPROGRAMS\${APPLICATION_NAME}"
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
+      ;CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
       CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}"
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Release notes.lnk" "$INSTDIR\NOTES.txt"
+      ;CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Release notes.lnk" "$INSTDIR\NOTES.txt"
       CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe"
       SetShellVarContext current
    ${MementoSectionEnd}
@@ -406,7 +462,7 @@ SectionGroupEnd
       DetailPrint "Creating Windows Start Entry"
       SetDetailsPrint listonly
       WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Run" \
-               "${APPLICATION_NAME}" "$INSTDIR\${APPLICATION_EXECUTABLE}" 
+               "${APPLICATION_NAME}" "$INSTDIR\${APPLICATION_EXECUTABLE}"
   ${MementoSectionEnd}
 !endif
 
@@ -419,7 +475,7 @@ ${MementoSectionDone}
 !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_AUTOSTART} "Register ${APPLICATION_NAME} to run on Windows startup."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 Section -post

config.h.in

@@ -3,6 +3,10 @@
 
 #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

@@ -9,20 +9,34 @@ if(SPHINX_FOUND)
     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)
-    add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
+
+    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}
@@ -34,6 +48,9 @@ if(SPHINX_FOUND)
 		                   ${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
@@ -45,6 +62,7 @@ if(SPHINX_FOUND)
 				-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/branding.rst

@@ -1,87 +0,0 @@
-Adding 3rd-Party Branding
-=========================
-
-The ownCloud Client supports theming in the setup assistant dialog in both the
-account setting and the result window. These customizations do not require a
-recompile of the client.
-
-The dialogs have places where custom content can be inserted. Please take a look
-on the screenshot below. For example the connection wizard has the two green
-rectangles as well as the area at the bottom with the black line and the red
-text.
-
-The content places can be altered by a file called ``custom.ini`` which contains
-content for the specific places in the dialogs.
-
-On windows, the custom.ini has to be stored at
-
-+-----------------+------------------------------------------------------------+
-| OS              | Path                                                       |
-+=================+============================================================+
-| Windows (64 bit)| ``%ProgramFiles(x86)%\ownCloud\custom.ini``                |
-+-----------------+------------------------------------------------------------+
-| Windows (32 bit)| ``%ProgramFiles%\ownCloud\custom.ini``                     |
-+-----------------+------------------------------------------------------------+
-| Mac OS          | ``owncloud.app/Contents/Resources/custom.ini``             |
-+-----------------+------------------------------------------------------------+
-| Linux           | ``/etc/ownCloud/custom.ini``                               |
-+-----------------+------------------------------------------------------------+
-
-The config file needs to be in a usual `Windows INI file format`_.
-
-Under the group definition [GUICustomize] the following keys can be set:
-
-* ``oCSetupTop``: The top area of the connect wizard, account page.
-* ``oCSetupSide``: The side area of the connect wizard, account page.
-* ``ocSetupBottom``: The bottom area of the connect wizard, account page
-* ``oCSetupResultTop``: The top area of the connect wizard result page.
-* ``oCSetupFixUrl``: A fixed url to the ownCloud instance. If this is set, the
-  user can not access the url entry field and it is hidden.
-
-The keys can be set to either an image file or a `rich text`_ snippet, which
-must be enclosed with  double quotes. Image files must be addressed by the
-complete file name. On windows, the pathes should be noted with slashes
-instead of backslashes. Instead of absolute file pathes, you can use
-the ``%RESOURCES`` placeholder (note the single ``%``!).
-
-Example::
-
-  %RESOURCES/custom/myimage_top.png
-
-.. note:: ``%RESOURCES`` is currently undefined on Linux, it points to the
-          directory location of ``custom.ini`` on all other platforms.
-
-Example
-~~~~~~~
-
-A config file ``custom.ini`` like this::
-
-  [GUICustomize]
-  oCSetupTop=/home/kf/owncloud.com/topimg.png
-  oCSetupSide=/home/kf/owncloud.com/sideimg.png
-  oCSetupBottom="
-  <hr />
-  The Power of now: ownCloud Client
-
-  This nice ownCloud Client was presented by <a
-  href="http://owncloud.com">ownCloud Inc.</a>
-  "
-  oCSetupResultTop=/home/kf/owncloud.com/topimg.png
-
-will produce this setup dialog:
-
-.. figure:: images/branding_setup.png
-
-  Setup Dialog Customization
-
-Packaging remarks
-~~~~~~~~~~~~~~~~~
-
-While you do not need to rebuild the client, you will need to repackage
-the client on your own. This also means you will have to resign those
-packages with your own signing key.
-
-.. _`Windows INI file format`: http://en.wikipedia.org/wiki/INI_file
-.. _`rich text`: http://qt-project.org/doc/qt-5.0/richtext-html-subset.html 
-
-

doc/building.rst

@@ -20,20 +20,24 @@ Linux
 Mac OS X
 --------
 
-Follow the `generic build instructions`_.
- 
-You can install the missing dependencies via MacPorts_ or Homebrew_.
+Next to XCode (and the command line tools!), you will need some
+extra dependencies.
+
+You can install these 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::
+The tested and preferred way is to use HomeBrew_. The ownCloud team has
+its own repository which contains non-standard recipes.  Add it with::
 
-  brew tap dschmidt/owncloud
-  brew install iniparser
+  brew tap owncloud/owncloud
 
-Otherwise, you need to copy the header and lib files to
-``/usr/local/include`` and ``/usr/local/lib`` respectively. 
+Next, install the missing dependencies::
+
+  brew install $(brew deps ocsync)
+  brew install $(brew deps mirall)
+
+To build mirall and cmake, follow the `generic build instructions`_.
 
 .. note::
   You should not call ``make install`` at any time, since the product of the
@@ -51,32 +55,47 @@ 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/isv:ownCloud:devel:mingw:win32.repo
-  http://download.opensuse.org/repositories/windows:/mingw/openSUSE_12.1/windows:mingw.repo
-  http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_12.1/windows:mingw:win32.repo
+  zypper ar http://download.opensuse.org/repositories/isv:/ownCloud:/devel:/mingw:/win32/openSUSE_12.1/isv:ownCloud:devel:mingw:win32.repo
+  zypper ar http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_12.1/windows:mingw:win32.repo
+  zypper ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_12.1/windows:mingw.repo
 
 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-gnutls \
-                 mingw32-libneon mingw32-libbeecrypt mingw32-libopenssl \
-                 mingw32-openssl
+  zypper install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
+                 mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \
+                 mingw32-headers  mingw32-runtime site-config mingw32-iniparser-devel \
+                 mingw32-libsqlite-devel mingw32-dlfcn-devel mingw32-libssh2-devel \
+                 kdewin-png2ico mingw32-libqt4 mingw32-libqt4-devel mingw32-libgcrypt \
+                 mingw32-libgnutls mingw32-libneon mingw32-libneon-devel mingw32-libbeecrypt \
+                 mingw32-libopenssl mingw32-openssl mingw32-libpng-devel mingw32-libsqlite \
+                 mingw32-qtkeychain mingw32-qtkeychain-devel mingw32-iniparser mingw32-dlfcn \
+                 mingw32-libintl-devel mingw32-libneon-devel mingw32-libopenssl-devel \
+                 mingw32-libproxy-devel mingw32-libxml2-devel mingw32-zlib-devel
 
-For the installer, the NSIS installer packages are also required::
+For the installer, the NSIS installer package is also required::
 
-  zypper install mingw32-cross-nsis mingw32-cross-nsis-plugin-processes \
-                 mingw32-cross-nsis-plugin-uac 
+  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)::
+
+  rpm -ihv http://pmbs.links2linux.org/download/mingw:/32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-processes-0-1.1.x86_64.rpm
+  rpm -ihv 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
+2. for building ``mirall``, you need to use ``cmake`` again, but make sure
    to append the following parameter::
+3. Also, you need to specify *absolute pathes* for ``CSYNC_LIBRARY_PATH``
+   and ``CSYNC_LIBRARY_PATH`` when running ``cmake`` on mirall.
 
   ``-DCMAKE_TOOLCHAIN_FILE=../mirall/admin/win/Toolchain-mingw32-openSUSE.cmake``
 
@@ -111,37 +130,42 @@ Next, make sure to check out the 'dav' branch in the newly checked out
   cd ocsync
   git checkout dav
 
-The first package to buidld is CSync::
+The first package to build is CSync::
 
   cd ocsync-build
-  cmake -DCMAKE_BUILD_TYPE="Debug" -DLOG_TO_CALLBACK=ON -DWITH_LOG4C=OFF ../ocsync
+  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. ``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.
+``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_LIBRARY_PATH=../ocsync-build \
-        -DCSYNC_INCLUDE_PATH=../ocsync/src
+        -DCSYNC_BUILD_PATH=/path/to/ocsync-build \
+        -DCSYNC_INCLUDE_PATH=/path/to/ocsync/src
 
-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
+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)::
+To build an installer/app bundle (requires the mingw32-cross-nsis packages on Windows)::
 
   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

@@ -41,7 +41,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'ownCloud Client Manual'
-copyright = u'2012, The ownCloud developers'
+copyright = u'2013, 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
@@ -213,12 +213,12 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'owncloud', u'ownCloud Client Manual',
-     [u'The ownCloud developers'], 1)
+    ('owncloud.1', 'owncloud', u'File synchronisation desktop utility.',
+     [u'The ownCloud developers'], 1),
 ]
 
 # If true, show URL addresses after external links.
-#man_show_urls = False
+man_show_urls = True
 
 
 # -- Options for Texinfo output ------------------------------------------------
@@ -248,7 +248,7 @@ texinfo_documents = [
 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'
+epub_copyright = u'2013, The ownCloud developers'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.

doc/conffile.rst

@@ -0,0 +1,26 @@
+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.
+
+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
+

doc/index.rst

@@ -1,10 +1,4 @@
-.. ownCloud Documentation documentation master file, created by
-   sphinx-quickstart on Mon Oct 22 23:16:40 2012.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-ownCloud Desktop Client
-***********************
+.. _contents:
 
 Contents
 ========
@@ -15,7 +9,6 @@ Contents
    install
    usage 
    building 
-   branding
    architecture
    troubleshooting
    glossary 

doc/install.rst

@@ -19,7 +19,7 @@ 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
+1. Download the installation file Click ownCloud-x.y.z.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

doc/options.rst

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

doc/owncloud.1.rst

@@ -0,0 +1,37 @@
+owncloud(1)
+-----------
+
+
+SYNOPSIS
+========
+*owncloud* [`OPTIONS`...]
+
+
+DESCRIPTION
+===========
+ownCloud is a file synchronisation desktop utility 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)`
+

doc/scripts/README.rst

@@ -4,9 +4,12 @@ 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).
+Those files have been taken from the `HTML Help Project`_.
 
 License
 -------
 
-The HTML Help Project has licensed its software under LGPLv3 terms.
+The HTML Help Project has licensed_ its software under LGPLv2.1 terms
+
+.. _HTML Help Project: http://code.google.com/p/htmlhelp/wiki/HHW4Wine
+.. _licensed: https://code.google.com/p/htmlhelp/source/browse/trunk/pyhtmlhelp/COPYING

doc/troubleshooting.rst

@@ -1,28 +1,114 @@
 Troubleshooting
 ===============
 
-:All of my desktop clients fail to connect to ownCloud:
+If the client fails to start syncing it basically can have two
+basic reasons: Either the server setup has a problem or the client
+has a bug. When reporting bugs, it is crucial to find out what part
+of the system causes the problem.
+
+Identifying basic functionality problems
+----------------------------------------
+
+:Perform a general ownCloud Server test:
+  A very first check is to verify that you can log on to ownClouds web 
+  application. Assuming your ownCloud instance is installed at 
+  ``http://yourserver.com/owncloud``, type
+  ``http://yourserver.com/owncloud/`` into your browsers address bar.
+   
+  If you are not prompted to enter your user name and password, or if you 
+  see a red warning box on the page, your server setup is not correct or needs
+  fixes. Please verify that your server installation is working correctly.
+
+:Ensure the WebDAV API is working:
+  If all desktop clients fail to connect to ownCloud, but the access via the
+  web interface works, the problem often is a mis-configuration of the WebDAV
+  API.
+
+  The ownCloud client uses the built-in WebDAV access of the server content.
   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.
+  address bar.
 
   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.
 
+:Use a WebDAV command line tool to test:  
+  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. It can be used to further verify that the WebDAV server is
+  running properly, for example by performing PROPFIND calls:
 
-: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:
+  ``propget .`` called within cadaver will return some properties of the current
+  directory and thus be a successful WebDAV connect.
+
+Isolating other issues
+----------------------
+
+If the sync result is unreliable, please ensure that the folder synced with
+ownCloud is not shared with other syncing apps.
+
+.. note:: Syncing the same directory with ownCloud and other sync software such
+          as Unison, rsync, Microsoft Windows Offline Folders or cloud services
+          such as DropBox or Microsoft SkyDrive is not supported and should
+          not be attempted. In the worst case, doing so can result in data
+          loss.
+
+If you are operating your own server and use the local storage backend (the
+default), make sure that ownCloud has exclusive access to the directory.
+
+.. note:: The data directory on the server is exclusive to ownCloud and must
+          not be modified manually.
+
+If you are using a different backend, you can try to exclude a bug in the
+backend by reverting to the local backend.
+
+Logfiles
+========
+
+Doing effective debugging requires to provide as much as relevant logs as
+possible. The log output can help you with tracking down problem, and if you 
+report a bug, you're advised to include the output.
+
+:Client Logfile:
+Start the client with ``--logwindow``. That opens a window providing a view
+on the current log. It provides a Save button to let you save the log to a 
+file.
+
+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.
+It is also possible to directly log to a directory, which is an useful option
+in case the problem only happens ocassionally. In that case it is better to
+create a huge amount of data, as the log window has a limited buffer.
+
+To write logs to disk, start the client with ``--logfile <file>``, where
+``<file`` is the file you want to log to, or ``--logdir <dir>``, where ``<dir>``
+is an existing directory. In case of ``--logdir``, each sync run will create a
+new file.
+
+:ownCloud server Logfile:
+The ownCloud server maintains an ownCloud specific logfile as well. It can and
+must be enabled through the ownCloud Administration page. There you can adjust
+the loglevel. It is advisable to set it to a verbose level like ``Debug`` or
+``Info``.
+  
+The logfile can be viewed either in the web interface or can be found in the
+filesystem in the ownCloud server data dir.
+
+:Webserver Logfiles:
+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. Especially the access_log is a very good debugging tool as the
+log line contains a lot of information of every request and it's result.
+  
+More information about the apache logging can be found at
+``http://httpd.apache.org/docs/current/logs.html``.
+

doc/usage.rst

@@ -7,60 +7,49 @@ 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.
+Overview
+--------
 
-A right click on the tray icon gives other configuration options.
+ownCloud is represented by an icon in the Desktop's system tray, also known
+as notification area.
 
+The clients menu is accessed with a right click (Windows, Linux) or left click
+(Mac OS).
 
-Command line switches
----------------------
+The status of the current sync can be observed in the Status dialog, available
+trough the ``Open status...`` option. On Windows, a left click on the tray icon
+also opens the status dialog.
+
+.. note:: Until the intial setup has finished, the Connection Wizard will be
+          shown instead when left-clicking on Windows.
+ 
+The dialog provides an overview on the configured sync folders and allows to add
+and remove more sync folder connections as well as pausing a sync connection.
+
+Changing your password
+----------------------
+
+Use the ``Configure`` option. It will open the Connection Wizard, which next to
+reconfiguring your connection to use a different user or server also will allow
+to change the password for the local account, or to switch from HTTP to HTTPS.
+
+Setting up a proxy
+------------------
+
+By default, the configured system proxy will be picked up. This may not be
+working reliable on some Linux distributions, as only the ``http_proxy``
+variable gets parsed. You can configure a proxy different from your
+system default by choosing ``Configure proxy...`` from the menu.
+
+By default, ownCloud expects a HTTP proxy. If you want to specify a SOCKS5
+proxy instead, tick the "Use as SOCKSv5 proxy" option.
+
+Options
+-------
 .. index:: command line switches, command line, options, parameters
-
-
-ownCloud Client supports the following command line switches:
-
-+--------------------------+------------------------------------------------+
-| Switch                   | Action                                         |
-+==========================+================================================+
-| ``--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.          |
-+--------------------------+------------------------------------------------+
+.. include:: options.rst
 
 Config File
 -----------
 .. index:: config file
-
-ownCloud Client reads a configuration file which on Linux can be found at ``$HOME/.local/share/data/ownCloud/owncloud.cfg``
-.. todo:: Windows, Mac?
-It contains settings in the ini file format known from Windows. 
-
-.. note:: Changes here should be done carefully as wrong settings can cause disfunctionality.
-
-
-These are config settings that may be changed:
-
-+---------------------------+-----------+--------------+-----------+-----------------------------------------------------+
-| Setting                   | Data Type | Unit         | Default   | Description                                         |
-+===========================+===========+==============+===========+=====================================================+
-| ``remotePollinterval``    | integer   | milliseconds | ``30000`` | Poll time for the remote repository                 |
-+---------------------------+-----------+--------------+-----------+-----------------------------------------------------+
-| ``localPollinterval``     | integer   | milliseconds | ``10000`` | Poll time for local repository                      |
-+---------------------------+-----------+--------------+-----------+-----------------------------------------------------+
-| ``PollTimerExceedFactor`` | integer   | n/a          | ``10``    | Poll Timer Exceed Factor                            |
-+---------------------------+-----------+--------------+-----------+-----------------------------------------------------+
-| ``maxLogLines``           | integer   | lines        | ``20000`` | Maximum count of log lines shown in the log window  |
-+---------------------------+-----------+--------------+-----------+-----------------------------------------------------+
-
-* ``remotePollinterval`` is for systems which have notify for local file system changes (Linux only currently)
-  this is the frequency it polls for remote changes. The following two values are ignored.
-
-* ``localPollinterval`` is for systems which poll the local file system (currently Win and Mac) this is the
-  frequency they poll locally. The ``remotePollInterval`` is ignored on these systems.
-
-* ``PollTimerExceedFactor`` sets  the exceed factor is the factor after which a remote poll is done. That means the effective
-  frequency for remote poll is ``localPollInterval * pollTimerExceedFactor``.
+.. include:: conffile.rst

issue_template.md

@@ -0,0 +1,46 @@
+### 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:
+
+Storage backend:
+
+### Client configuration
+Client version:
+
+Operating system:
+
+OS language:
+
+Installation path of client:
+
+### Logs
+
+Please use Gist (https://gist.github.com/) or a similar code paster for longer
+logs.
+
+```Template for output < 10 lines```
+
+1. Output of `owncloud --logwindow` or `owncloud --logfile log.txt`
+
+2. Web server error log:
+
+3. ownCloud log (data/owncloud.log):
+

mirall.desktop.in

@@ -0,0 +1,7 @@
+[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,37 +1,15 @@
 <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/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-remote-32.png</file>
+        <file>resources/folder-remote.png</file>
+        <file>resources/folder-sync.png</file>
         <file>resources/folder-grey.png</file>
-        <file>resources/owncloud_splash.png</file>
         <file>resources/task-ongoing.png</file>
-
-        <file>resources/owncloud-icon-22.png</file>
-        <file>resources/owncloud-icon-32.png</file>
-        <file>resources/owncloud-icon-48.png</file>
-        <file>resources/owncloud-icon-64.png</file>
-        <file>resources/owncloud-icon-128.png</file>
-        <file>resources/owncloud-framed-64.png</file>
-        <file>resources/owncloud-error-48.png</file>
-        <file>resources/owncloud-sync-48.png</file>
-        <file>resources/owncloud-sync-ok-48.png</file>
-
+        <file>resources/view-refresh.png</file>
         <file>resources/warning-16.png</file>
+        <file>resources/owncloud_logo_blue.png</file>
     </qresource>
 </RCC>

src/3rdparty/LGPL_EXCEPTION.txt

@@ -0,0 +1,22 @@
+Digia Qt LGPL Exception version 1.1
+
+As an additional permission to the GNU Lesser General Public License version
+2.1, the object code form of a "work that uses the Library" may incorporate
+material from a header file that is part of the Library. You may distribute
+such object code under terms of your choice, provided that:
+(i) the header files of the Library have not been modified; and
+(ii) the incorporated material is limited to numerical parameters, data
+structure layouts, accessors, macros, inline functions and
+templates; and
+(iii) you comply with the terms of Section 6 of the GNU Lesser General
+Public License version 2.1.
+
+Moreover, you may apply this exception to a modified version of the Library,
+provided that such modification does not involve copying material from the
+Library into the modified Library's header files unless such material is
+limited to (i) numerical parameters; (ii) data structure layouts;
+(iii) accessors; and (iv) small macros, templates and inline functions of
+five lines or less in length.
+
+Furthermore, you are not required to apply this additional permission to a
+modified version of the Library.

src/3rdparty/QProgressIndicator/LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

src/3rdparty/QProgressIndicator/QProgressIndicator.cpp

@@ -0,0 +1,137 @@
+/*
+*
+* This file is part of QProgressIndicator,
+* an open-source recent files menu widget
+*
+* Copyright (C) 2009 - 2010 Morgan Leborgne
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with QRecentFilesMenu. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+#include "QProgressIndicator.h"
+
+#include <QPainter>
+
+QProgressIndicator::QProgressIndicator(QWidget* parent)
+    : QWidget(parent),
+      m_angle(0),
+      m_timerId(-1),
+      m_delay(40),
+      m_displayedWhenStopped(false),
+      m_color(Qt::black)
+{
+    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    setFocusPolicy(Qt::NoFocus);
+}
+
+bool QProgressIndicator::isAnimated () const
+{
+    return (m_timerId != -1);
+}
+
+void QProgressIndicator::setDisplayedWhenStopped(bool state)
+{
+    m_displayedWhenStopped = state;
+
+    update();
+}
+
+bool QProgressIndicator::isDisplayedWhenStopped() const
+{
+    return m_displayedWhenStopped;
+}
+
+void QProgressIndicator::startAnimation()
+{
+    m_angle = 0;
+
+    if (m_timerId == -1)
+        m_timerId = startTimer(m_delay);
+}
+
+void QProgressIndicator::stopAnimation()
+{
+    if (m_timerId != -1)
+        killTimer(m_timerId);
+
+    m_timerId = -1;
+
+    update();
+}
+
+void QProgressIndicator::setAnimationDelay(int delay)
+{
+    if (m_timerId != -1)
+        killTimer(m_timerId);
+
+    m_delay = delay;
+
+    if (m_timerId != -1)
+        m_timerId = startTimer(m_delay);
+}
+
+void QProgressIndicator::setColor(const QColor & color)
+{
+    m_color = color;
+
+    update();
+}
+
+QSize QProgressIndicator::sizeHint() const
+{
+    return QSize(20,20);
+}
+
+int QProgressIndicator::heightForWidth(int w) const
+{
+    return w;
+}
+
+void QProgressIndicator::timerEvent(QTimerEvent * /*event*/)
+{
+    m_angle = (m_angle+30)%360;
+
+    update();
+}
+
+void QProgressIndicator::paintEvent(QPaintEvent * /*event*/)
+{
+    if (!m_displayedWhenStopped && !isAnimated())
+        return;
+
+    int width = qMin(this->width(), this->height());
+    
+    QPainter p(this);
+    p.setRenderHint(QPainter::Antialiasing);
+    
+    int outerRadius = (width-1)*0.5;
+    int innerRadius = (width-1)*0.5*0.38;
+
+    int capsuleHeight = outerRadius - innerRadius;
+    int capsuleWidth  = (width > 32 ) ? capsuleHeight *.23 : capsuleHeight *.35;
+    int capsuleRadius = capsuleWidth/2;
+
+    for (int i=0; i<12; i++)
+    {
+        QColor color = m_color;
+        color.setAlphaF(1.0f - (i/12.0f));
+        p.setPen(Qt::NoPen);
+        p.setBrush(color);       
+        p.save();
+        p.translate(rect().center());
+        p.rotate(m_angle - i*30.0f);
+        p.drawRoundedRect(-capsuleWidth*0.5, -(innerRadius+capsuleHeight), capsuleWidth, capsuleHeight, capsuleRadius, capsuleRadius);
+        p.restore();
+    }
+}

src/3rdparty/QProgressIndicator/QProgressIndicator.h

@@ -0,0 +1,108 @@
+/*
+*
+* This file is part of QProgressIndicator,
+* an open-source recent files menu widget
+*
+* Copyright (C) 2009 - 2010 Morgan Leborgne
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with QRecentFilesMenu. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+#ifndef QPROGRESSINDICATOR_H
+#define QPROGRESSINDICATOR_H
+
+#include <QWidget>
+#include <QColor>
+
+/*! 
+    \class QProgressIndicator
+    \brief The QProgressIndicator class lets an application display a progress indicator to show that a lengthy task is under way. 
+
+    Progress indicators are indeterminate and do nothing more than spin to show that the application is busy.
+    \sa QProgressBar
+*/
+class QProgressIndicator : public QWidget
+{
+    Q_OBJECT
+    Q_PROPERTY(int delay READ animationDelay WRITE setAnimationDelay)
+    Q_PROPERTY(bool displayedWhenStopped READ isDisplayedWhenStopped WRITE setDisplayedWhenStopped)
+    Q_PROPERTY(QColor color READ color WRITE setColor)
+public:
+    QProgressIndicator(QWidget* parent = 0);
+
+    /*! Returns the delay between animation steps.
+        \return The number of milliseconds between animation steps. By default, the animation delay is set to 40 milliseconds.
+        \sa setAnimationDelay
+     */
+    int animationDelay() const { return m_delay; }
+
+    /*! Returns a Boolean value indicating whether the component is currently animated.
+        \return Animation state.
+        \sa startAnimation stopAnimation
+     */
+    bool isAnimated () const;
+
+    /*! Returns a Boolean value indicating whether the receiver shows itself even when it is not animating.
+        \return Return true if the progress indicator shows itself even when it is not animating. By default, it returns false.
+        \sa setDisplayedWhenStopped
+     */
+    bool isDisplayedWhenStopped() const;
+
+    /*! Returns the color of the component.
+        \sa setColor
+      */
+    const QColor & color() const { return m_color; }
+
+    virtual QSize sizeHint() const;
+    int heightForWidth(int w) const;
+public slots:
+    /*! Starts the spin animation.
+        \sa stopAnimation isAnimated
+     */
+    void startAnimation();
+
+    /*! Stops the spin animation.
+        \sa startAnimation isAnimated
+     */
+    void stopAnimation();
+
+    /*! Sets the delay between animation steps.
+        Setting the \a delay to a value larger than 40 slows the animation, while setting the \a delay to a smaller value speeds it up.
+        \param delay The delay, in milliseconds. 
+        \sa animationDelay 
+     */
+    void setAnimationDelay(int delay);
+
+    /*! Sets whether the component hides itself when it is not animating. 
+       \param state The animation state. Set false to hide the progress indicator when it is not animating; otherwise true.
+       \sa isDisplayedWhenStopped
+     */
+    void setDisplayedWhenStopped(bool state);
+
+    /*! Sets the color of the components to the given color.
+        \sa color
+     */
+    void setColor(const QColor & color);
+protected:
+    virtual void timerEvent(QTimerEvent * event); 
+    virtual void paintEvent(QPaintEvent * event);
+private:
+    int m_angle;
+    int m_timerId;
+    int m_delay;
+    bool m_displayedWhenStopped;
+    QColor m_color;
+};
+
+#endif // QPROGRESSINDICATOR_H

src/3rdparty/QProgressIndicator/README.md

@@ -0,0 +1,14 @@
+## Description
+
+The QProgressIndicator class lets an application display a progress indicator to show that a lengthy task is under way.
+Will work at any size.
+
+<img src="https://raw.github.com/mojocorp/QProgressIndicator/master/screen-capture-1.png" >
+<img src="https://raw.github.com/mojocorp/QProgressIndicator/master/screen-capture-2.png" >
+
+## Dependency
+Qt 4.4.x.
+
+## License
+
+LGPL

src/3rdparty/fancylineedit/fancylineedit.cpp

@@ -0,0 +1,353 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "fancylineedit.h"
+
+#include <QEvent>
+#include <QDebug>
+#include <QString>
+#include <QPropertyAnimation>
+#include <QApplication>
+#include <QMenu>
+#include <QMouseEvent>
+#include <QLabel>
+#include <QAbstractButton>
+#include <QPainter>
+#include <QStyle>
+#include <QPaintEvent>
+#include <QDesktopWidget>
+
+/*! Opens a menu at the specified widget position.
+ * This functions computes the position where to show the menu, and opens it with
+ * QMenu::exec().
+ * \param menu The menu to open
+ * \param widget The widget next to which to open the menu
+ */
+static void execMenuAtWidget(QMenu *menu, QWidget *widget)
+{
+    QPoint p;
+    QRect screen = qApp->desktop()->availableGeometry(widget);
+    QSize sh = menu->sizeHint();
+    QRect rect = widget->rect();
+    if (widget->isRightToLeft()) {
+        if (widget->mapToGlobal(QPoint(0, rect.bottom())).y() + sh.height() <= screen.height())
+            p = widget->mapToGlobal(rect.bottomRight());
+        else
+            p = widget->mapToGlobal(rect.topRight() - QPoint(0, sh.height()));
+        p.rx() -= sh.width();
+    } else {
+        if (widget->mapToGlobal(QPoint(0, rect.bottom())).y() + sh.height() <= screen.height())
+            p = widget->mapToGlobal(rect.bottomLeft());
+        else
+            p = widget->mapToGlobal(rect.topLeft() - QPoint(0, sh.height()));
+    }
+    p.rx() = qMax(screen.left(), qMin(p.x(), screen.right() - sh.width()));
+    p.ry() += 1;
+
+    menu->exec(p);
+}
+
+/*!
+    \class Utils::FancyLineEdit
+
+    \brief A line edit with an embedded pixmap on one side that is connected to
+    a menu.
+
+    Additionally, it can display a grayed hintText (like "Type Here to")
+    when not focused and empty. When connecting to the changed signals and
+    querying text, one has to be aware that the text is set to that hint
+    text if isShowingHintText() returns true (that is, does not contain
+    valid user input).
+ */
+
+enum { margin = 6 };
+
+#define ICONBUTTON_HEIGHT 18
+#define FADE_TIME 160
+
+namespace Utils {
+
+// --------- FancyLineEditPrivate
+class FancyLineEditPrivate : public QObject
+{
+public:
+    explicit FancyLineEditPrivate(FancyLineEdit *parent);
+
+    virtual bool eventFilter(QObject *obj, QEvent *event);
+
+    FancyLineEdit  *m_lineEdit;
+    QPixmap m_pixmap[2];
+    QMenu *m_menu[2];
+    bool m_menuTabFocusTrigger[2];
+    IconButton *m_iconbutton[2];
+    bool m_iconEnabled[2];
+};
+
+
+FancyLineEditPrivate::FancyLineEditPrivate(FancyLineEdit *parent) :
+    QObject(parent), m_lineEdit(parent)
+{
+    for (int i = 0; i < 2; ++i) {
+        m_menu[i] = 0;
+        m_menuTabFocusTrigger[i] = false;
+        m_iconbutton[i] = new IconButton(parent);
+        m_iconbutton[i]->installEventFilter(this);
+        m_iconbutton[i]->hide();
+        m_iconbutton[i]->setAutoHide(false);
+        m_iconEnabled[i] = false;
+    }
+}
+
+bool FancyLineEditPrivate::eventFilter(QObject *obj, QEvent *event)
+{
+    int buttonIndex = -1;
+    for (int i = 0; i < 2; ++i) {
+        if (obj == m_iconbutton[i]) {
+            buttonIndex = i;
+            break;
+        }
+    }
+    if (buttonIndex == -1)
+        return QObject::eventFilter(obj, event);
+    switch (event->type()) {
+    case QEvent::FocusIn:
+        if (m_menuTabFocusTrigger[buttonIndex] && m_menu[buttonIndex]) {
+            m_lineEdit->setFocus();
+            execMenuAtWidget(m_menu[buttonIndex], m_iconbutton[buttonIndex]);
+            return true;
+        }
+    default:
+        break;
+    }
+    return QObject::eventFilter(obj, event);
+}
+
+
+// --------- FancyLineEdit
+FancyLineEdit::FancyLineEdit(QWidget *parent) :
+    QLineEdit(parent),
+    d(new FancyLineEditPrivate(this))
+{
+    ensurePolished();
+    updateMargins();
+
+    connect(this, SIGNAL(textChanged(QString)), this, SLOT(checkButtons(QString)));
+    connect(d->m_iconbutton[Left], SIGNAL(clicked()), this, SLOT(iconClicked()));
+    connect(d->m_iconbutton[Right], SIGNAL(clicked()), this, SLOT(iconClicked()));
+}
+
+void FancyLineEdit::checkButtons(const QString &text)
+{
+    if (m_oldText.isEmpty() || text.isEmpty()) {
+        for (int i = 0; i < 2; ++i) {
+            if (d->m_iconbutton[i]->hasAutoHide())
+                d->m_iconbutton[i]->animateShow(!text.isEmpty());
+        }
+        m_oldText = text;
+    }
+}
+
+FancyLineEdit::~FancyLineEdit()
+{
+}
+
+void FancyLineEdit::setButtonVisible(Side side, bool visible)
+{
+    d->m_iconbutton[side]->setVisible(visible);
+    d->m_iconEnabled[side] = visible;
+    updateMargins();
+}
+
+bool FancyLineEdit::isButtonVisible(Side side) const
+{
+    return d->m_iconEnabled[side];
+}
+
+void FancyLineEdit::iconClicked()
+{
+    IconButton *button = qobject_cast<IconButton *>(sender());
+    int index = -1;
+    for (int i = 0; i < 2; ++i)
+        if (d->m_iconbutton[i] == button)
+            index = i;
+    if (index == -1)
+        return;
+    if (d->m_menu[index]) {
+        execMenuAtWidget(d->m_menu[index], button);
+    } else {
+        emit buttonClicked((Side)index);
+        if (index == Left)
+            emit leftButtonClicked();
+        else if (index == Right)
+            emit rightButtonClicked();
+    }
+}
+
+void FancyLineEdit::updateMargins()
+{
+    bool leftToRight = (layoutDirection() == Qt::LeftToRight);
+    Side realLeft = (leftToRight ? Left : Right);
+    Side realRight = (leftToRight ? Right : Left);
+
+    int leftMargin = d->m_iconbutton[realLeft]->pixmap().width() + 8;
+    int rightMargin = d->m_iconbutton[realRight]->pixmap().width() + 8;
+    // Note KDE does not reserve space for the highlight color
+    if (style()->inherits("OxygenStyle")) {
+        leftMargin = qMax(24, leftMargin);
+        rightMargin = qMax(24, rightMargin);
+    }
+
+    QMargins margins((d->m_iconEnabled[realLeft] ? leftMargin : 0), 0,
+                     (d->m_iconEnabled[realRight] ? rightMargin : 0), 0);
+
+    setTextMargins(margins);
+}
+
+void FancyLineEdit::updateButtonPositions()
+{
+    QRect contentRect = rect();
+    for (int i = 0; i < 2; ++i) {
+        Side iconpos = (Side)i;
+        if (layoutDirection() == Qt::RightToLeft)
+            iconpos = (iconpos == Left ? Right : Left);
+
+        if (iconpos == FancyLineEdit::Right) {
+            const int iconoffset = textMargins().right() + 4;
+            d->m_iconbutton[i]->setGeometry(contentRect.adjusted(width() - iconoffset, 0, 0, 0));
+        } else {
+            const int iconoffset = textMargins().left() + 4;
+            d->m_iconbutton[i]->setGeometry(contentRect.adjusted(0, 0, -width() + iconoffset, 0));
+        }
+    }
+}
+
+void FancyLineEdit::resizeEvent(QResizeEvent *)
+{
+    updateButtonPositions();
+}
+
+void FancyLineEdit::setButtonPixmap(Side side, const QPixmap &buttonPixmap)
+{
+    d->m_iconbutton[side]->setPixmap(buttonPixmap);
+    updateMargins();
+    updateButtonPositions();
+    update();
+}
+
+QPixmap FancyLineEdit::buttonPixmap(Side side) const
+{
+    return d->m_pixmap[side];
+}
+
+void FancyLineEdit::setButtonMenu(Side side, QMenu *buttonMenu)
+{
+     d->m_menu[side] = buttonMenu;
+     d->m_iconbutton[side]->setIconOpacity(1.0);
+ }
+
+QMenu *FancyLineEdit::buttonMenu(Side side) const
+{
+    return  d->m_menu[side];
+}
+
+bool FancyLineEdit::hasMenuTabFocusTrigger(Side side) const
+{
+    return d->m_menuTabFocusTrigger[side];
+}
+
+void FancyLineEdit::setMenuTabFocusTrigger(Side side, bool v)
+{
+    if (d->m_menuTabFocusTrigger[side] == v)
+        return;
+
+    d->m_menuTabFocusTrigger[side] = v;
+    d->m_iconbutton[side]->setFocusPolicy(v ? Qt::TabFocus : Qt::NoFocus);
+}
+
+bool FancyLineEdit::hasAutoHideButton(Side side) const
+{
+    return d->m_iconbutton[side]->hasAutoHide();
+}
+
+void FancyLineEdit::setAutoHideButton(Side side, bool h)
+{
+    d->m_iconbutton[side]->setAutoHide(h);
+    if (h)
+        d->m_iconbutton[side]->setIconOpacity(text().isEmpty() ?  0.0 : 1.0);
+    else
+        d->m_iconbutton[side]->setIconOpacity(1.0);
+}
+
+void FancyLineEdit::setButtonToolTip(Side side, const QString &tip)
+{
+    d->m_iconbutton[side]->setToolTip(tip);
+}
+
+void FancyLineEdit::setButtonFocusPolicy(Side side, Qt::FocusPolicy policy)
+{
+    d->m_iconbutton[side]->setFocusPolicy(policy);
+}
+
+// IconButton - helper class to represent a clickable icon
+
+IconButton::IconButton(QWidget *parent)
+    : QAbstractButton(parent), m_autoHide(false)
+{
+    setCursor(Qt::ArrowCursor);
+    setFocusPolicy(Qt::NoFocus);
+}
+
+void IconButton::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    QRect pixmapRect = QRect(0, 0, m_pixmap.width(), m_pixmap.height());
+    pixmapRect.moveCenter(rect().center());
+
+    if (m_autoHide)
+        painter.setOpacity(m_iconOpacity);
+
+    painter.drawPixmap(pixmapRect, m_pixmap);
+}
+
+void IconButton::animateShow(bool visible)
+{
+    if (visible) {
+        QPropertyAnimation *animation = new QPropertyAnimation(this, "iconOpacity");
+        animation->setDuration(FADE_TIME);
+        animation->setEndValue(1.0);
+        animation->start(QAbstractAnimation::DeleteWhenStopped);
+    } else {
+        QPropertyAnimation *animation = new QPropertyAnimation(this, "iconOpacity");
+        animation->setDuration(FADE_TIME);
+        animation->setEndValue(0.0);
+        animation->start(QAbstractAnimation::DeleteWhenStopped);
+    }
+}
+
+} // namespace Utils

src/3rdparty/fancylineedit/fancylineedit.h

@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef FANCYLINEEDIT_H
+#define FANCYLINEEDIT_H
+
+#include <QLineEdit>
+#include <QAbstractButton>
+
+namespace Utils {
+
+class FancyLineEditPrivate;
+
+class IconButton: public QAbstractButton
+{
+    Q_OBJECT
+    Q_PROPERTY(float iconOpacity READ iconOpacity WRITE setIconOpacity)
+    Q_PROPERTY(bool autoHide READ hasAutoHide WRITE setAutoHide)
+    Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap)
+public:
+    explicit IconButton(QWidget *parent = 0);
+    void paintEvent(QPaintEvent *event);
+    void setPixmap(const QPixmap &pixmap) { m_pixmap = pixmap; update(); }
+    QPixmap pixmap() const { return m_pixmap; }
+    float iconOpacity() { return m_iconOpacity; }
+    void setIconOpacity(float value) { m_iconOpacity = value; update(); }
+    void animateShow(bool visible);
+
+    void setAutoHide(bool hide) { m_autoHide = hide; }
+    bool hasAutoHide() const { return m_autoHide; }
+
+private:
+    float m_iconOpacity;
+    bool m_autoHide;
+    QPixmap m_pixmap;
+};
+
+class FancyLineEdit : public QLineEdit
+{
+    Q_OBJECT
+    Q_ENUMS(Side)
+
+public:
+    enum Side {Left = 0, Right = 1};
+
+    explicit FancyLineEdit(QWidget *parent = 0);
+    ~FancyLineEdit();
+
+    QPixmap buttonPixmap(Side side) const;
+    void setButtonPixmap(Side side, const QPixmap &pixmap);
+
+    QMenu *buttonMenu(Side side) const;
+    void setButtonMenu(Side side, QMenu *menu);
+
+    void setButtonVisible(Side side, bool visible);
+    bool isButtonVisible(Side side) const;
+
+    void setButtonToolTip(Side side, const QString &);
+    void setButtonFocusPolicy(Side side, Qt::FocusPolicy policy);
+
+    // Set whether tabbing in will trigger the menu.
+    void setMenuTabFocusTrigger(Side side, bool v);
+    bool hasMenuTabFocusTrigger(Side side) const;
+
+    // Set if icon should be hidden when text is empty
+    void setAutoHideButton(Side side, bool h);
+    bool hasAutoHideButton(Side side) const;
+#if QT_VERSION <= 0x040700
+    void setPlaceholderText( const QString& ) { }
+#endif
+
+signals:
+    void buttonClicked(Utils::FancyLineEdit::Side side);
+    void leftButtonClicked();
+    void rightButtonClicked();
+
+private slots:
+    void checkButtons(const QString &);
+    void iconClicked();
+
+protected:
+    virtual void resizeEvent(QResizeEvent *e);
+
+private:
+    void updateMargins();
+    void updateButtonPositions();
+    friend class Utils::FancyLineEditPrivate;
+
+    FancyLineEditPrivate *d;
+    QString m_oldText;
+};
+
+} // namespace Utils
+
+#endif // FANCYLINEEDIT_H

src/CMakeLists.txt

@@ -3,39 +3,41 @@ include(${QT_USE_FILE})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 QT4_ADD_RESOURCES ( MIRALL_RC_SRC ../mirall.qrc)
+if ( IS_DIRECTORY ${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
 mirall/folderwizardtargetpage.ui
-mirall/folderwizardnetworkpage.ui
-mirall/folderwizardowncloudpage.ui
 mirall/statusdialog.ui
-mirall/owncloudwizardselecttypepage.ui
-mirall/owncloudsetuppage.ui
-mirall/createanowncloudpage.ui
-mirall/owncloudftpaccesspage.ui
+mirall/owncloudsetuppage_ng.ui
 mirall/owncloudwizardresultpage.ui
 mirall/owncloudcredentialspage.ui
 mirall/sslerrordialog.ui
 mirall/proxydialog.ui
+mirall/fileitemdialog.ui
 )
 
 set(3rdparty_SRC
 3rdparty/qtsingleapplication/qtsingleapplication.cpp
-3rdparty/qtsingleapplication/qtlocalpeer.h
 3rdparty/qtsingleapplication/qtlocalpeer.cpp
-3rdparty/qtsingleapplication/qtsingleapplication.h
-3rdparty/qtsingleapplication/qtsinglecoreapplication.h
 3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
-
-3rdparty/qtlockedfile/qtlockedfile.h
 3rdparty/qtlockedfile/qtlockedfile.cpp
+3rdparty/fancylineedit/fancylineedit.cpp
+3rdparty/QProgressIndicator/QProgressIndicator.cpp
 )
 
 set(3rdparty_HEADER
 3rdparty/qtsingleapplication/qtlocalpeer.h
 3rdparty/qtsingleapplication/qtsingleapplication.h
 3rdparty/qtsingleapplication/qtsinglecoreapplication.h
+3rdparty/fancylineedit/fancylineedit.h
+3rdparty/QProgressIndicator/QProgressIndicator.h
 )
 qt4_wrap_cpp(3rdparty_MOC ${3rdparty_HEADER})
 
@@ -48,6 +50,8 @@ endif()
 set(3rdparty_INC
     ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtlockedfile
     ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication
+    ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/QProgressIndicator
+    ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/fancylineedit
     )
 
 qt4_wrap_ui(mirall_UI_SRCS ${mirall_UI})
@@ -56,59 +60,90 @@ 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
     mirall/fileutils.cpp
     mirall/theme.cpp
     mirall/owncloudtheme.cpp
-    mirall/miralltheme.cpp
     mirall/owncloudinfo.cpp
+    mirall/logger.cpp
+    mirall/utility.cpp
+    mirall/connectionvalidator.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
+    mirall/connectionvalidator.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})
 
-add_library(mirallsync   SHARED ${libsync_SRCS} ${syncMoc})
+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(owncloudsync SHARED ${libsync_SRCS} ${syncMoc})
-set_target_properties( owncloudsync PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT)
-target_link_libraries(mirallsync ${QT_LIBRARIES} ${CSYNC_LIBRARY} )
-target_link_libraries(owncloudsync ${QT_LIBRARIES} ${CSYNC_LIBRARY} )
+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()
 
 if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
-    install(TARGETS mirallsync owncloudsync
+    install(TARGETS 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
+		${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_SHORTNAME}.desktop)
+        install(FILES  ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_SHORTNAME}.desktop DESTINATION share/applications )
+    endif()
 else()
-    install(TARGETS mirallsync owncloudsync DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS)
+    install(TARGETS owncloudsync DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS)
 endif()
 
 set(mirall_SRCS
     mirall/application.cpp
+    mirall/systray.cpp
     mirall/folderwizard.cpp
     mirall/statusdialog.cpp
     mirall/owncloudwizard.cpp
@@ -118,10 +153,12 @@ set(mirall_SRCS
     mirall/sslerrordialog.cpp
     mirall/logbrowser.cpp
     mirall/proxydialog.cpp
+    mirall/fileitemdialog.cpp
 )
 
 set(mirall_HEADERS
     mirall/application.h
+    mirall/systray.h
     mirall/folderwizard.h
     mirall/owncloudsetupwizard.h
     mirall/owncloudwizard.h
@@ -130,6 +167,7 @@ set(mirall_HEADERS
     mirall/sslerrordialog.h
     mirall/logbrowser.h
     mirall/proxydialog.h
+    mirall/fileitemdialog.h
 )
 
 if( UNIX AND NOT APPLE)
@@ -139,7 +177,7 @@ if( UNIX AND NOT APPLE)
 endif()
 
 # csync is required.
-include_directories(${CSYNC_INCLUDE_DIR}/csync ${CSYNC_INCLUDE_DIR} ${CMAKE_BINARY_DIR})
+include_directories(${CSYNC_INCLUDE_DIR}/csync ${CSYNC_INCLUDE_DIR} ${CSYNC_BUILD_PATH}/src)
 include_directories(${3rdparty_INC})
 
 qt4_wrap_cpp(mirallMoc ${mirall_HEADERS})
@@ -161,15 +199,19 @@ set( final_src
 # add executable icon on windows and osx
 include( AddAppIconMacro )
 set(ownCloud_old ${ownCloud})
-kde4_add_app_icon( ownCloud "${CMAKE_CURRENT_SOURCE_DIR}/../resources/owncloud-icon-*.png") 
+
+kde4_add_app_icon( ownCloud "${theme_dir}/colored/${APPLICATION_SHORTNAME}-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")
 
-    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)
+if(NOT WIN32)
+    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 ${mirall_I18N} DESTINATION share/mirall/i18n)
 
@@ -177,22 +219,7 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
 
     # 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)
 
-    # 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 mirallsync)
-    target_link_libraries(mirall ${CSYNC_LIBRARY})
-
-    set_target_properties( mirall PROPERTIES
-        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
-    install(TARGETS mirall
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    )
 else()
     set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
     include(DeployQt4)
@@ -202,7 +229,6 @@ else()
 
     # 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)
 
     #FIXME: hardcoded path
     if ( EXISTS ${CSYNC_BINARY_DIR}/modules/ocsync_owncloud.so )
@@ -210,8 +236,13 @@ else()
     else()
         install(FILES /usr/local/lib/ocsync-0/ocsync_owncloud.so DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins)
     endif()
-    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()
 
@@ -230,7 +261,7 @@ install(TARGETS ${APPLICATION_EXECUTABLE}
         BUNDLE  DESTINATION "."
 )
 
-#FIXME: find a nice solution to make the second if(BUILD_OWNCLOUD_OSX_BUNDLE) unneccessary
+#FIXME: find a nice solution to make the second if(BUILD_OWNCLOUD_OSX_BUNDLE) unnecessary
 # 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)

src/main.cpp

@@ -32,8 +32,10 @@ int main(int argc, char **argv)
         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

@@ -16,7 +16,6 @@
 #define APPLICATION_H
 
 #include <QApplication>
-#include <QSystemTrayIcon>
 #include <QNetworkReply>
 #include <QSslError>
 
@@ -26,6 +25,8 @@
 #include "mirall/folder.h"
 #include "mirall/logbrowser.h"
 #include "mirall/folderman.h"
+#include "mirall/fileitemdialog.h"
+#include "mirall/systray.h"
 
 class QAction;
 class QMenu;
@@ -52,6 +53,7 @@ public:
     ~Application();
 
     bool giveHelp();
+    void showHelp();
 
 signals:
 
@@ -59,25 +61,35 @@ protected slots:
     void slotAddFolder();
     void slotOpenStatus();
     void slotRemoveFolder( const QString& );
+    void slotResetFolder( const QString& );
     void slotEnableFolder( const QString&, const bool );
     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();
     void setupLogBrowser();
     void setupProxy();
+    void enterNextLogFile();
 
     //folders have to be disabled while making config changes
     void computeOverallSyncStatus();
 
+    // reimplemented
+#if defined(Q_WS_WIN)
+    bool winEventFilter( MSG * message, long * result );
+#endif
+
 protected slots:
     void slotTrayClicked( QSystemTrayIcon::ActivationReason );
     void slotFolderOpenAction(const QString & );
@@ -95,10 +107,11 @@ protected slots:
     void slotStartUpdateDetector();
 
 private:
-    void showHelp();
+    void setHelp();
+    void raiseDialog( QWidget* );
 
     // configuration file -> folder
-    QSystemTrayIcon *_tray;
+    Systray *_tray;
     QAction *_actionQuit;
     QAction *_actionAddFolder;
     QAction *_actionOpenStatus;
@@ -112,23 +125,25 @@ private:
 #endif
 
     FolderWizard  *_folderWizard;
-    OwncloudSetupWizard *_owncloudSetupWizard;
+    QScopedPointer<OwncloudSetupWizard> _owncloudSetupWizard;
     SslErrorDialog *_sslErrorDialog;
 
     // tray's menu
     QMenu *_contextMenu;
     StatusDialog *_statusDialog;
+    FileItemDialog *_fileItemDialog;
 
     FolderMan *_folderMan;
     Theme *_theme;
     QSignalMapper *_folderOpenActionMapper;
     UpdateDetector *_updateDetector;
-    QMap<QString, QString> _overallStatusStrings;
     LogBrowser *_logBrowser;
     QString _logFile;
+    QString _logDirectory;
+    int _logExpire;
     bool _showLogWindow;
     bool _logFlush;
-    bool        _helpOnly;
+    bool _helpOnly;
 };
 
 } // namespace Mirall

src/mirall/connectionvalidator.cpp

@@ -0,0 +1,193 @@
+/*
+ * 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 <QtCore>
+
+#include "mirall/connectionvalidator.h"
+#include "mirall/owncloudinfo.h"
+#include "mirall/mirallconfigfile.h"
+#include "mirall/theme.h"
+#include "mirall/credentialstore.h"
+
+namespace Mirall {
+
+ConnectionValidator::ConnectionValidator(QObject *parent) :
+    QObject(parent)
+{
+
+}
+
+ConnectionValidator::ConnectionValidator(const QString& connection, QObject *parent)
+    :_connection(connection)
+{
+    ownCloudInfo::instance()->setCustomConfigHandle(_connection);
+}
+
+QStringList ConnectionValidator::errors() const
+{
+    return _errors;
+}
+
+QString ConnectionValidator::statusString( Status )
+{
+    return QLatin1String("Get your street creds!");
+}
+
+
+void ConnectionValidator::checkConnection()
+{
+    if( ownCloudInfo::instance()->isConfigured() ) {
+        connect( ownCloudInfo::instance(),SIGNAL(ownCloudInfoFound(QString,QString,QString,QString)),
+                 SLOT(slotStatusFound(QString,QString,QString,QString)));
+
+        connect( ownCloudInfo::instance(),SIGNAL(noOwncloudFound(QNetworkReply*)),
+                 SLOT(slotNoStatusFound(QNetworkReply*)));
+
+        // checks for status.php
+        ownCloudInfo::instance()->checkInstallation();
+    } else {
+        emit connectionResult( NotConfigured );
+    }
+}
+
+void ConnectionValidator::slotStatusFound( const QString& url, const QString& versionStr, const QString& version, const QString& edition)
+{
+    // status.php was found.
+    qDebug() << "** Application: ownCloud found: " << url << " with version " << versionStr << "(" << version << ")";
+    // now check the authentication
+    MirallConfigFile cfgFile(_connection);
+
+    cfgFile.setOwnCloudVersion( version );
+    // disconnect from ownCloudInfo
+    disconnect( ownCloudInfo::instance(),SIGNAL(ownCloudInfoFound(QString,QString,QString,QString)),
+                this, SLOT(slotStatusFound(QString,QString,QString,QString)));
+
+    disconnect( ownCloudInfo::instance(),SIGNAL(noOwncloudFound(QNetworkReply*)),
+                this, SLOT(slotNoStatusFound(QNetworkReply*)));
+
+    if( version.startsWith("4.0") ) {
+        _errors.append( tr("<p>The configured server for this client is too old.</p>"
+                           "<p>Please update to the latest server and restart the client.</p>"));
+        emit connectionResult( ServerVersionMismatch );
+        return;
+    }
+
+    QTimer::singleShot( 0, this, SLOT( slotFetchCredentials() ));
+}
+
+// status.php could not be loaded.
+void ConnectionValidator::slotNoStatusFound(QNetworkReply *reply)
+{
+    // disconnect from ownCloudInfo
+    disconnect( ownCloudInfo::instance(),SIGNAL(ownCloudInfoFound(QString,QString,QString,QString)),
+                this, SLOT(slotStatusFound(QString,QString,QString,QString)));
+
+    disconnect( ownCloudInfo::instance(),SIGNAL(noOwncloudFound(QNetworkReply*)),
+                this, SLOT(slotNoStatusFound(QNetworkReply*)));
+
+    _errors.append( reply->errorString() );
+    emit connectionResult( StatusNotFound );
+
+}
+
+void ConnectionValidator::slotFetchCredentials()
+{
+    if( _connection.isEmpty() ) {
+        if( CredentialStore::instance()->canTryAgain() ) {
+            connect( CredentialStore::instance(), SIGNAL(fetchCredentialsFinished(bool)),
+                     this, SLOT(slotCredentialsFetched(bool)) );
+            CredentialStore::instance()->fetchCredentials();
+        }
+
+        if( CredentialStore::instance()->state() == CredentialStore::TooManyAttempts ) {
+            _errors << tr("Too many attempts to get a valid password.");
+            emit connectionResult( CredentialsTooManyAttempts );
+        }
+    } else {
+        // Pull credentials from Mirall config.
+        slotCredentialsFetched( true );
+    }
+}
+
+void ConnectionValidator::slotCredentialsFetched( bool ok )
+{
+    qDebug() << "Credentials successfully fetched: " << ok;
+    disconnect( CredentialStore::instance(), SIGNAL(fetchCredentialsFinished(bool)) );
+
+    if( ! ok ) {
+        Status stat;
+        _errors << tr("Error: Could not retrieve the password!");
+
+        if( CredentialStore::instance()->state() == CredentialStore::UserCanceled ) {
+            _errors << tr("Password dialog was canceled!");
+            stat = CredentialsUserCanceled;
+        } else {
+            _errors << CredentialStore::instance()->errorMessage();
+            stat = CredentialError;
+        }
+
+        qDebug() << "Could not fetch credentials" << _errors;
+
+        emit connectionResult( stat );
+    } else {
+        QString user, pwd;
+        if( _connection.isEmpty() ) {
+            user = CredentialStore::instance()->user();
+            pwd  = CredentialStore::instance()->password();
+        } else {
+            // in case of reconfiguration, the _connection is set.
+            MirallConfigFile cfg(_connection);
+            user = cfg.ownCloudUser();
+            pwd  = cfg.ownCloudPasswd();
+        }
+        ownCloudInfo::instance()->setCredentials( user, pwd );
+
+        // Credential fetched ok.
+        QTimer::singleShot( 0, this, SLOT( slotCheckAuthentication() ));
+    }
+}
+
+void ConnectionValidator::slotCheckAuthentication()
+{
+    connect( ownCloudInfo::instance(), SIGNAL(ownCloudDirExists(QString,QNetworkReply*)),
+             this, SLOT(slotAuthCheck(QString,QNetworkReply*)));
+
+    qDebug() << "# checking for authentication settings.";
+    ownCloudInfo::instance()->getRequest(QLatin1String("/"), true ); // this call needs to be authenticated.
+    // simply GET the webdav root, will fail if credentials are wrong.
+    // continue in slotAuthCheck here :-)
+}
+
+void ConnectionValidator::slotAuthCheck( const QString& ,QNetworkReply *reply )
+{
+    bool ok = true;
+    Status stat = Connected;
+
+    if( reply->error() == QNetworkReply::AuthenticationRequiredError ||
+            reply->error() == QNetworkReply::OperationCanceledError ) { // returned if the user is wrong.
+        qDebug() << "******** Password is wrong!";
+        _errors << "The provided credentials are wrong.";
+        stat = CredentialsWrong;
+        ok = false;
+    }
+
+    // disconnect from ownCloud Info signals
+    disconnect( ownCloudInfo::instance(),SIGNAL(ownCloudDirExists(QString,QNetworkReply*)),
+             this,SLOT(slotAuthCheck(QString,QNetworkReply*)));
+
+    emit connectionResult( stat );
+
+}
+
+
+}

src/mirall/connectionvalidator.h

@@ -0,0 +1,73 @@
+/*
+ * 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 CONNECTIONVALIDATOR_H
+#define CONNECTIONVALIDATOR_H
+
+#include <QObject>
+#include <QStringList>
+
+class QNetworkReply;
+
+namespace Mirall {
+
+class ConnectionValidator : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ConnectionValidator(QObject *parent = 0);
+    explicit ConnectionValidator(const QString& connection, QObject *parent = 0);
+
+    enum Status {
+        Undefined,
+        Connected,
+        NotConfigured,
+        ServerVersionMismatch,
+        CredentialsTooManyAttempts,
+        CredentialError,
+        CredentialsUserCanceled,
+        CredentialsWrong,
+        StatusNotFound
+
+    };
+
+    QStringList errors() const;
+
+    void checkConnection();
+
+    QString statusString( Status );
+
+signals:
+    void connectionResult( ConnectionValidator::Status );
+    void connectionAvailable();
+    void connectionFailed();
+
+public slots:
+
+protected slots:
+    void slotStatusFound( const QString&, const QString&, const QString&, const QString& );
+    void slotNoStatusFound(QNetworkReply *);
+
+    void slotFetchCredentials();
+    void slotCredentialsFetched( bool );
+    void slotCheckAuthentication();
+    void slotAuthCheck( const QString& ,QNetworkReply * );
+
+private:
+    QStringList _errors;
+    QString     _connection;
+};
+
+}
+
+#endif // CONNECTIONVALIDATOR_H

src/mirall/createanowncloudpage.ui

@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CreateAnOwncloudPage</class>
- <widget class="QWidget" name="CreateAnOwncloudPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>539</width>
-    <height>346</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout_12">
-     <item>
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="pixmap">
-        <pixmap resource="../../mirall.qrc">:/mirall/resources/mirall-32.png</pixmap>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_3">
-       <property name="font">
-        <font>
-         <pointsize>14</pointsize>
-         <weight>50</weight>
-         <bold>false</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Create a new ownCloud</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_17">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Where do you want to create your ownCloud?</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0" colspan="3">
-       <widget class="QRadioButton" name="createLocalRadioBtn">
-        <property name="font">
-         <font>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>create ownCloud on this computer</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>22</width>
-          <height>13</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="1" colspan="2">
-       <widget class="QLabel" name="label_2">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>20</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#585858;&quot;&gt;installs the ownCloud on this computer. Other people will not be able to access your data by default.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="textFormat">
-         <enum>Qt::AutoText</enum>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-        <property name="openExternalLinks">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="3">
-       <widget class="QRadioButton" name="createPerFTPRadioBtn">
-        <property name="font">
-         <font>
-          <weight>75</weight>
-          <bold>true</bold>
-          <underline>false</underline>
-         </font>
-        </property>
-        <property name="text">
-         <string>create ownCloud on my internet domain</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>22</width>
-          <height>13</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#585858;&quot;&gt;installs ownCloud on a domain you control. You need the FTP credentials for the installation.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; color:#585858;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#585858;&quot;&gt;This ownCloud will be accessible from the internet.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="textFormat">
-         <enum>Qt::AutoText</enum>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-        <property name="openExternalLinks">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>&amp;Domain:</string>
-        </property>
-        <property name="buddy">
-         <cstring>myDomainEdit</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="2">
-       <widget class="QLineEdit" name="myDomainEdit">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>388</width>
-       <height>72</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="../../mirall.qrc"/>
- </resources>
- <connections/>
-</ui>

src/mirall/credentialstore.cpp

@@ -12,18 +12,35 @@
  */
 
 #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;
-int     CredentialStore::_tries  = 0;
+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)
@@ -36,11 +53,11 @@ CredentialStore *CredentialStore::instance()
     return CredentialStore::_instance;
 }
 
-QString CredentialStore::password( const QString& ) const
+QString CredentialStore::password() const
 {
     return _passwd;
 }
-QString CredentialStore::user( const QString& ) const
+QString CredentialStore::user() const
 {
     return _user;
 }
@@ -50,58 +67,92 @@ CredentialStore::CredState CredentialStore::state()
     return _state;
 }
 
+bool CredentialStore::canTryAgain()
+{
+    if( _tries > MAX_LOGIN_ATTEMPTS ) {
+        qDebug() << "canTryAgain: Max attempts reached.";
+        return false;
+    }
+
+    /* Since QtKeyChain is required now, it makes sense to only query once. */
+    if( _state == NotFetched || _state == AsyncWriting ) {
+        return true;
+    } else {
+        return false;
+    }
+
+}
+
 void CredentialStore::fetchCredentials()
 {
-    _state = Fetching;
     MirallConfigFile cfgFile;
-    MirallConfigFile::CredentialType t;
-
-    if( _tries++ == 3 ) {
+    if( ++_tries > MAX_LOGIN_ATTEMPTS ) {
         qDebug() << "Too many attempts to enter password!";
         _state = TooManyAttempts;
+        emit( fetchCredentialsFinished(false) );
         return;
     }
-    t = cfgFile.credentialType();
 
     bool ok = false;
     QString pwd;
-    _state = Fetching;
     _user = cfgFile.ownCloudUser();
+    _url  = cfgFile.ownCloudUrl();
+    if( !cfgFile.passwordStorageAllowed() ) {
+        _type = CredentialStore::User;
+    }
 
-    switch( t ) {
-    case MirallConfigFile::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. */
-        pwd = QInputDialog::getText(0, QApplication::translate("MirallConfigFile","Password Required"),
-                                    QApplication::translate("MirallConfigFile","Please enter your %1 password:")
-                                    .arg(Theme::instance()->appName()),
-                                    QLineEdit::Password,
-                                    QString::null, &ok);
-        if( !ok ) {
-            _state = UserCanceled;
-        }
+        _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->open();
         break;
     }
-    case MirallConfigFile::Settings: {
+    case CredentialStore::Settings: {
         /* Read from config file. */
+        _state = Fetching;
         pwd = cfgFile.ownCloudPasswd();
         ok = true;
         break;
     }
-    case MirallConfigFile::KeyChain: {
-        /* Qt Keychain is not yet implemented. */
-#ifdef HAVE_QTKEYCHAIN
+    case CredentialStore::KeyChain: {
+        // If the credentials are here already, return.
+        if( _state == Ok || _state == AsyncWriting ) {
+            emit(fetchCredentialsFinished(true));
+            return;
+        }
+        // otherwise fetch asynchronious.
+#ifdef WITH_QTKEYCHAIN
+        _state = AsyncFetching;
         if( !_user.isEmpty() ) {
-            ReadPasswordJoei b job( QLatin1String(Theme::instance()->appName()) );
-            job.setAutoDelete( false );
-            job.setKey( _user );
+            ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName());
+            job->setKey( key );
 
-            job.connect( &job, SIGNAL(finished(QKeychain::Job*)), this,
-                         SLOT(slotKeyChainFinished(QKeyChain::Job*)));
-            job.start();
+            connect( job, SIGNAL(finished(QKeychain::Job*)), this,
+                     SLOT(slotKeyChainReadFinished(QKeychain::Job*)));
+            job->start();
         }
 #else
         qDebug() << "QtKeyChain: Not yet implemented!";
+        _state = Error;
 #endif
         break;
     }
@@ -110,45 +161,237 @@ void CredentialStore::fetchCredentials()
     }
     }
 
-    if( ok ) {
-        _passwd = pwd;
-        _state = Ok;
-    }
-    if( !ok && _state == Fetching ) {
-        _state = Error;
-    }
-
-    emit( fetchCredentialsFinished(ok) );
-}
-
-#ifdef HAVE_QTKEYCHAIN
-void CredentialsStore::slotKeyChainFinished(QKeyChain::Job* job)
-{
-    if( job ) {
-        if( job->error() ) {
-            qDebug() << "Error mit keychain: " << job->errorString();
-        } else {
-            _passwd = job.textData();
+    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.
     }
 }
-#endif
 
-
-QByteArray CredentialStore::basicAuthHeader() const
+void CredentialStore::slotUserDialogDone( int result )
 {
-    QString concatenated = _user + QLatin1Char(':') + _passwd;
-    const QString b(QLatin1String("Basic "));
-    QByteArray data = b.toLocal8Bit() + concatenated.toLocal8Bit().toBase64();
-
-    return data;
+    if( result == QDialog::Accepted ) {
+        _passwd = _inputDialog->textValue();
+        _state = Ok;
+    } else {
+        _state = UserCanceled;
+        _passwd = QString::null;
+    }
+    _inputDialog->deleteLater();
+    emit(fetchCredentialsFinished(_state == Ok));
 }
 
-void CredentialStore::setCredentials( const QString& user, const QString& pwd )
+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*)));
+        _state = AsyncWriting;
+        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"))) {
+                _state = NoKeychainBackend;
+                _type = Settings;
+                saveCredentials();
+            } else {
+                _state = Error;
+            }
+        } else {
+            qDebug() << "Successfully stored password for user " << _user;
+            // Try to remove password formerly stored in the config file.
+            MirallConfigFile cfgFile;
+            cfgFile.clearPasswordFromConfig();
+            _state = NotFetched;
+            _tries = 0;
+        }
+    } else {
+        qDebug() << "Error: KeyChain Write Password Job failed!";
+        _state = Error;
+    }
+#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

@@ -15,6 +15,11 @@
 #define CREDENTIALSTORE_H
 
 #include <QObject>
+#include <QInputDialog>
+
+namespace QKeychain {
+  class Job;
+}
 
 namespace Mirall {
 
@@ -42,10 +47,27 @@ class CredentialStore : public QObject
 {
     Q_OBJECT
 public:
-    enum CredState { NotFetched = 0, Ok, UserCanceled, Fetching, Error, TooManyAttempts };
+    enum CredState { NotFetched = 0,
+                     Ok,
+                     UserCanceled,
+                     Fetching,
+                     AsyncFetching,
+                     EntryNotFound,
+                     AccessDeniedByUser,
+                     AccessDenied,
+                     NoKeychainBackend,
+                     Error,
+                     AsyncWriting,
+                     TooManyAttempts };
 
-    QString password( const QString& connection = QString::null ) const;
-    QString user( const QString& connection = QString::null ) const;
+    enum CredentialType {
+        User = 0,
+        Settings,
+        KeyChain
+    };
+
+    QString password( ) const;
+    QString user( ) const;
 
     /**
      * @brief state
@@ -61,12 +83,6 @@ public:
      */
     void fetchCredentials();
 
-    /**
-     * @brief basicAuthHeader - return a basic authentication header.
-     * @return a QByteArray with a ready to use Header for HTTP basic auth.
-     */
-    QByteArray basicAuthHeader() const;
-
     /**
      * @brief instance - singleton pointer.
      * @return the singleton pointer to access the object.
@@ -77,11 +93,24 @@ public:
      * @brief setCredentials - sets the user credentials.
      *
      * This function is called from the setup wizard to set the credentials
-     * int this store. The function also sets the state to ok.
+     * 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& );
+    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
@@ -93,19 +122,25 @@ signals:
      */
     void fetchCredentialsFinished(bool);
 
-private slots:
-#ifdef HAVE_QTKEYCHAIN
-void slotKeyChainFinished(QKeyChain::Job* job);
-#endif
+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;
 };
 }
 

src/mirall/csyncfolder.cpp

@@ -1,102 +0,0 @@
-/*
- * Copyright (C) by Duncan Mac-Vicar P. <duncan@kde.org>
- *
- * 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 "mirall/csyncfolder.h"
-#include "mirall/csyncthread.h"
-#include "mirall/mirallconfigfile.h"
-
-#include <csync.h>
-
-#include <QDebug>
-#include <QDir>
-#include <QMutexLocker>
-#include <QThread>
-#include <QStringList>
-#include <QTextStream>
-
-namespace Mirall {
-
-CSyncFolder::CSyncFolder(const QString &alias,
-                         const QString &path,
-                         const QString &secondPath,
-                         QObject *parent)
-      : Folder(alias, path, secondPath, parent)
-      , _csync(0)
-      , _thread(0)
-      , _csyncError(false)
-
-{
-}
-
-CSyncFolder::~CSyncFolder()
-{
-}
-
-bool CSyncFolder::isBusy() const
-{
-    return (_csync && _thread && _thread->isRunning() );
-}
-
-void CSyncFolder::startSync(const QStringList &pathList)
-{
-    if (_thread && _thread->isRunning()) {
-        qCritical() << "* ERROR csync is still running and new sync requested.";
-        return;
-    }
-    delete _csync;
-    delete _thread;
-    _errors.clear();
-    _csyncError = false;
-
-    _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);
-}
-
-void CSyncFolder::slotTerminateSync()
-{
-    if( _thread ) {
-        _thread->terminate();
-    }
-}
-
-void CSyncFolder::slotCSyncStarted()
-{
-    qDebug() << "    * csync thread started";
-    emit syncStarted();
-}
-
-void CSyncFolder::slotCSyncFinished()
-{
-    SyncResult res(SyncResult::Success);
-    if( _csyncError ) {
-        res.setStatus( SyncResult::Error );
-        res.setErrorString( _errors.join(QLatin1String("\\n")));
-    }
-    emit syncFinished( res );
-}
-
-void CSyncFolder::slotCSyncError( const QString& errorStr )
-{
-    _errors.append( errorStr );
-    _csyncError = true;
-}
-
-} // ns
-

src/mirall/csyncfolder.h

@@ -1,57 +0,0 @@
-#ifndef CSYNCFOLDER_H
-#define CSYNCFOLDER_H
-
-/*
- * Copyright (C) by Duncan Mac-Vicar P. <duncan@kde.org>
- * 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; 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 "mirall/csyncthread.h"
-#include "mirall/folder.h"
-
-#include <QMutex>
-#include <QThread>
-#include <QString>
-
-namespace Mirall {
-
-
-class CSyncFolder : public Folder
-{
-    Q_OBJECT
-public:
-    CSyncFolder(const QString &alias,
-                const QString &path,
-                const QString &secondPath, QObject *parent = 0L);
-    virtual ~CSyncFolder();
-    virtual void startSync(const QStringList &pathList);
-    virtual bool isBusy() const;
-
-public slots:
-    void slotTerminateSync();
-
-protected slots:
-    void slotCSyncStarted();
-    void slotCSyncFinished();
-    void slotCSyncError( const QString& );
-private:
-    bool    _csyncError;
-    CSyncThread *_csync;
-    QThread    *_thread;
-    QStringList _errors;
-};
-
-}
-
-#endif

src/mirall/csyncthread.cpp

@@ -16,8 +16,19 @@
 #include "mirall/csyncthread.h"
 #include "mirall/mirallconfigfile.h"
 #include "mirall/theme.h"
+#include "mirall/logger.h"
+#include "mirall/owncloudinfo.h"
+
+#ifdef Q_OS_WIN
+#include <windows.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <assert.h>
 
 #include <QDebug>
+#include <QSslSocket>
 #include <QDir>
 #include <QMutexLocker>
 #include <QThread>
@@ -25,138 +36,20 @@
 #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::_csyncConfigDir;  // to be able to remove the lock file.
 
 QMutex CSyncThread::_mutex;
+QMutex CSyncThread::_syncMutex;
 
-struct proxyInfo_s {
-    char *proxyType;
-    char *proxyHost;
-    char *proxyPort;
-    char *proxyUser;
-    char *proxyPwd;
-};
-typedef proxyInfo_s ProxyInfo;
-
-walkStats_s::walkStats_s() {
-    errorType = 0;
-
-    eval = 0;
-    removed = 0;
-    renamed = 0;
-    newFiles = 0;
-    conflicts = 0;
-    ignores = 0;
-    sync = 0;
-    error = 0;
-
-    dirPermErrors = 0;
-
-    seenFiles = 0;
-
-}
-
-
-int CSyncThread::recordStats( TREE_WALK_FILE* file )
-{
-    if( ! file ) return -1;
-    _mutex.lock();
-
-    _walkStats.seenFiles++;
-
-    switch(file->instruction) {
-    case CSYNC_INSTRUCTION_NONE:
-
-        break;
-    case CSYNC_INSTRUCTION_EVAL:
-        _walkStats.eval++;
-        break;
-    case CSYNC_INSTRUCTION_REMOVE:
-        _walkStats.removed++;
-        break;
-    case CSYNC_INSTRUCTION_RENAME:
-        _walkStats.renamed++;
-        break;
-    case CSYNC_INSTRUCTION_NEW:
-        _walkStats.newFiles++;
-        break;
-    case CSYNC_INSTRUCTION_CONFLICT:
-        _walkStats.conflicts++;
-        break;
-    case CSYNC_INSTRUCTION_IGNORE:
-        _walkStats.ignores++;
-        break;
-    case CSYNC_INSTRUCTION_SYNC:
-        _walkStats.sync++;
-        break;
-    case CSYNC_INSTRUCTION_STAT_ERROR:
-    case CSYNC_INSTRUCTION_ERROR:
-        /* instructions for the propagator */
-    case CSYNC_INSTRUCTION_DELETED:
-    case CSYNC_INSTRUCTION_UPDATED:
-        _walkStats.error++;
-        _walkStats.errorType = WALK_ERROR_INSTRUCTIONS;
-        break;
-    default:
-        _walkStats.error++;
-        _walkStats.errorType = WALK_ERROR_WALK;
-        break;
-    }
-
-    int re = 0;
-    // qDebug() << _walkStats.seenFiles << ". Path: " << file->path << ": uid= " << file->uid << " - type: " << file->type;
-    if( !( _walkStats.errorType == WALK_ERROR_NONE || _walkStats.errorType == WALK_ERROR_DIR_PERMS )) {
-        re = -1;
-    }
-    _mutex.unlock();
-
-    return re;
-}
-
-int CSyncThread::treewalk( TREE_WALK_FILE* file, void *data )
-{
-    int re = static_cast<CSyncThread*>(data)->recordStats( file );
-    if( re > -1 )
-        return static_cast<CSyncThread*>(data)->treewalkFile( file );
-    return -1;
-}
-
-int CSyncThread::treewalkFile( TREE_WALK_FILE *file )
-{
-    if( ! file ) return -1;
-    SyncFileItem item;
-    item.file = QString::fromUtf8( file->path );
-    item.instruction = file->instruction;
-
-    QFileInfo fi( _source, item.file );
-    if( !(fi.isWritable() && fi.isExecutable()) ) {
-        _walkStats.dirPermErrors++;
-    }
-
-    _mutex.lock();
-    _syncedItems.append(item);
-    _mutex.unlock();
-
-    return 0;
-}
-
-CSyncThread::CSyncThread(const QString &source, const QString &target, bool localCheckOnly)
-
-    : _source(source)
-    , _target(target)
-    , _localCheckOnly( localCheckOnly )
-
+CSyncThread::CSyncThread(CSYNC *csync)
 {
     _mutex.lock();
-    if( ! _source.endsWith(QLatin1Char('/'))) _source.append(QLatin1Char('/'));
+    _csync_ctx = csync;
     _mutex.unlock();
 }
 
@@ -165,266 +58,331 @@ CSyncThread::~CSyncThread()
 
 }
 
-static char* proxyTypeToCStr(QNetworkProxy::ProxyType type)
+//Convert an error code from csync to a user readable string.
+// Keep that function thread safe as it can be called from the sync thread or the main thread
+QString CSyncThread::csyncErrorToString( CSYNC_ERROR_CODE err, const char *errString )
 {
-    switch (type) {
-    case QNetworkProxy::NoProxy:
-        return qstrdup("NoProxy");
-    case QNetworkProxy::DefaultProxy:
-        return qstrdup("DefaultProxy");
-    case QNetworkProxy::Socks5Proxy:
-        return qstrdup("Socks5Proxy");
-    case  QNetworkProxy::HttpProxy:
-        return qstrdup("HttpProxy");
-    case  QNetworkProxy::HttpCachingProxy:
-        return qstrdup("HttpCachingProxy");
-    case  QNetworkProxy::FtpCachingProxy:
-        return qstrdup("FtpCachingProxy");
+    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 does not exist.</p><p>Please check the sync setup.</p>");
+        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:
-        return qstrdup("NoProxy");
+        errStr = tr("An internal error number %1 happend.").arg( (int) err );
+    }
+
+    if( errString ) {
+        errStr += tr("<br/>Backend Message: ")+QString::fromUtf8(errString);
+    }
+    return errStr;
+
+}
+
+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;
+
+    if (file->instruction != CSYNC_INSTRUCTION_IGNORE
+        && file->instruction != CSYNC_INSTRUCTION_REMOVE) {
+      _hasFiles = true;
+    }
+
+    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( file &&
+        (file->instruction == CSYNC_INSTRUCTION_STAT_ERROR ||
+        file->instruction == CSYNC_INSTRUCTION_ERROR) ) {
+        _mutex.lock();
+        _syncedItems[indx]._instruction = file->instruction;
+        _mutex.unlock();
+    }
+
+    return 0;
+}
+
+struct CSyncRunScopeHelper {
+    CSyncRunScopeHelper(CSYNC *ctx, CSyncThread *parent)
+        : _ctx(ctx), _parent(parent)
+    {
+        _t.start();
+    }
+    ~CSyncRunScopeHelper() {
+        csync_commit(_ctx);
+
+        qDebug() << "CSync run took " << _t.elapsed() << " Milliseconds";
+        emit(_parent->finished());
+        _parent->_syncMutex.unlock();
+    }
+    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()
 {
+    if (!_syncMutex.tryLock()) {
+        qDebug() << Q_FUNC_INFO << "WARNING: Another sync seems to be running. Not starting a new one.";
+        return;
+    }
+
+    if( ! _csync_ctx ) {
+        qDebug() << "XXXXXXXXXXXXXXXX FAIL: do not have csync_ctx!";
+    }
+    qDebug() << Q_FUNC_INFO << "Sync started";
+
     qDebug() << "starting to sync " << qApp->thread() << QThread::currentThread();
-    CSYNC *csync;
-    QTime walkTime;
-
-    ProxyInfo proxyInfo;
-
-    emit(started());
 
     _mutex.lock();
-
-    proxyInfo.proxyType = proxyTypeToCStr( _proxy.type() );
-    proxyInfo.proxyHost = qstrdup( _proxy.hostName().toAscii().constData() );
-    proxyInfo.proxyPort = qstrdup( QByteArray::number( _proxy.port() ).constData() );
-    proxyInfo.proxyUser = qstrdup( _proxy.user().toAscii().constData() );
-    proxyInfo.proxyPwd  = qstrdup( _proxy.password().toAscii().constData() );
-
-    if( csync_create(&csync,
-                     _source.toUtf8().data(),
-                     _target.toUtf8().data()) < 0 ) {
-        emit csyncError( tr("CSync create failed.") );
-    }
-    _csyncConfigDir = QString::fromUtf8( csync_get_config_dir( csync ));
+    _syncedItems.clear();
+    _needsUpdate = false;
     _mutex.unlock();
 
-    qDebug() << "## CSync Thread local only: " << _localCheckOnly;
-    csync_set_auth_callback( csync, getauth );
-    csync_enable_conflictcopys(csync);
+    // cleans up behind us and emits finished() to ease error handling
+    CSyncRunScopeHelper helper(_csync_ctx, this);
 
+    csync_set_module_property(_csync_ctx, "csync_context", _csync_ctx);
+    csync_set_userdata(_csync_ctx, this);
 
-    MirallConfigFile cfg;
-    QString excludeList = cfg.excludeFile();
-
-    if( !excludeList.isEmpty() ) {
-        qDebug() << "==== added CSync exclude List: " << excludeList.toAscii();
-        csync_add_exclude_list( csync, excludeList.toAscii() );
-    }
-
-    csync_set_config_dir( csync, cfg.configPath().toUtf8() );
-
-    QTime t;
-    t.start();
-
-    _mutex.lock();
-    if( _localCheckOnly ) {
-        csync_set_local_only( csync, true );
-    }
-    csync_set_userdata(csync, (void*) &proxyInfo);
-    _mutex.unlock();
-
-    if( csync_init(csync) < 0 ) {
-        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 %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p>").arg(Theme::instance()->appName());
-            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;
-    }
-
-    emitStateDb(csync);
+    // csync_set_auth_callback( _csync_ctx, getauth );
+    csync_set_progress_callback( _csync_ctx, progress );
 
     qDebug() << "#### Update start #################################################### >>";
-    if( csync_update(csync) < 0 ) {
-        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;
+    if( csync_update(_csync_ctx) < 0 ) {
+        handleSyncError(_csync_ctx, "csync_update");
+        return;
     }
     qDebug() << "<<#### Update end ###########################################################";
 
-    csync_set_userdata(csync, this);
+    if( csync_reconcile(_csync_ctx) < 0 ) {
+        handleSyncError(_csync_ctx, "cysnc_reconcile");
+        return;
+    }
 
-    walkTime.start();
-    if( csync_walk_local_tree(csync, &treewalk, 0) < 0 ) {
-        qDebug() << "Error in treewalk.";
-        if( _walkStats.errorType == WALK_ERROR_WALK ) {
-            emit csyncError(tr("CSync encountered an error while examining the file system.\n"
-                               "Syncing is not possible."));
-        } else if( _walkStats.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( _walkStats.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(_walkStats.dirPermErrors));
+    _hasFiles = false;
+    bool walkOk = true;
+    if( csync_walk_local_tree(_csync_ctx, &treewalkLocal, 0) < 0 ) {
+        qDebug() << "Error in local treewalk.";
+        walkOk = false;
+    }
+    if( walkOk && csync_walk_remote_tree(_csync_ctx, &treewalkRemote, 0) < 0 ) {
+        qDebug() << "Error in remote treewalk.";
+    }
+
+    if (!_hasFiles && !_syncedItems.isEmpty()) {
+        qDebug() << Q_FUNC_INFO << "All the files are going to be removed, asking the user";
+        bool cancel = true;
+        emit aboutToRemoveAllFiles(_syncedItems.first()._dir, &cancel);
+        if (cancel) {
+            qDebug() << Q_FUNC_INFO << "Abort sync";
+            return;
         }
     }
 
-    // emit the treewalk results.
-    emit treeWalkResult(_syncedItems, _walkStats);
+    if (_needsUpdate)
+        emit(started());
 
-    _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("File exchange with ownCloud failed. Sync was stopped."));
-            goto cleanup;
-        }
+    if( csync_propagate(_csync_ctx) < 0 ) {
+        handleSyncError(_csync_ctx, "cysnc_reconcile");
+        return;
     }
-cleanup:
-    csync_destroy(csync);
 
-    if( proxyInfo.proxyType ) delete[] proxyInfo.proxyType;
-    if( proxyInfo.proxyHost ) delete[] proxyInfo.proxyHost;
-    if( proxyInfo.proxyPort ) delete[] proxyInfo.proxyPort;
-    if( proxyInfo.proxyUser ) delete[] proxyInfo.proxyUser;
-    if( proxyInfo.proxyPwd  ) delete[] proxyInfo.proxyPwd ;
-
-    /*
-     * 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";
-    emit(finished());
-}
-
-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 )
-{
-    _mutex.lock();
-    _user = user;
-    _passwd = passwd;
-    _proxy = proxy;
-    _mutex.unlock();
-}
-
-QString CSyncThread::csyncConfigDir()
-{
-    return _csyncConfigDir;
-}
-
-int CSyncThread::getauth(const char *prompt,
-                         char *buf,
-                         size_t len,
-                         int echo,
-                         int verify,
-                         void *userdata
-                         )
-{
-    int re = 0;
-
-    QString qPrompt = QString::fromLocal8Bit( prompt ).trimmed();
-    _mutex.lock();
-
-    if( qPrompt == QLatin1String("Enter your username:") ) {
-        // qDebug() << "OOO Username requested!";
-        qstrncpy( buf, _user.toUtf8().constData(), len );
-    } else if( qPrompt == QLatin1String("Enter your password:") ) {
-        // 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
-            // the answer is simply yes here.
-            qstrcpy( buf, "yes" );
+    if( walkOk ) {
+        if( csync_walk_local_tree(_csync_ctx, &walkFinalize, 0) < 0 ||
+            csync_walk_remote_tree( _csync_ctx, &walkFinalize, 0 ) < 0 ) {
+            qDebug() << "Error in finalize treewalk.";
         } else {
-            qDebug() << "Unknown prompt: <" << prompt << ">";
-            re = -1;
+        // emit the treewalk results.
+            emit treeWalkResult(_syncedItems);
         }
     }
-    _mutex.unlock();
-    return re;
+    qDebug() << Q_FUNC_INFO << "Sync finished";
 }
 
+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,6 +1,3 @@
-#ifndef CSYNCTHREAD_H
-#define CSYNCTHREAD_H
-
 /*
  * Copyright (C) by Duncan Mac-Vicar P. <duncan@kde.org>
  * Copyright (C) by Klaas Freitag <freitag@owncloud.com>
@@ -16,6 +13,9 @@
  * for more details.
  */
 
+#ifndef CSYNCTHREAD_H
+#define CSYNCTHREAD_H
+
 #include <stdint.h>
 
 #include <QMutex>
@@ -25,61 +25,30 @@
 
 #include <csync.h>
 
+#include "mirall/syncfileitem.h"
+
 class QProcess;
 
 namespace Mirall {
 
-enum walkErrorTypes {
-    WALK_ERROR_NONE = 0,
-    WALK_ERROR_WALK,
-    WALK_ERROR_INSTRUCTIONS,
-    WALK_ERROR_DIR_PERMS
-};
-
-struct walkStats_s {
-    walkStats_s();
-
-    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;
-
-struct syncFileItem_s {
-    QString file;
-    csync_instructions_e instruction;
-};
-typedef syncFileItem_s SyncFileItem;
-
-typedef QVector<SyncFileItem> SyncFileItemVector;
-
 class CSyncThread : public QObject
 {
     Q_OBJECT
 public:
-    CSyncThread(const QString &source, const QString &target, bool = false);
+    CSyncThread(CSYNC *);
     ~CSyncThread();
 
-    static void setConnectionDetails( const QString&, const QString&, const QNetworkProxy& );
-    static QString csyncConfigDir();
+    static QString csyncErrorToString( CSYNC_ERROR_CODE, const char * );
 
     Q_INVOKABLE void startSync();
 
 signals:
-    void treeWalkResult(const SyncFileItemVector&, const WalkStats&);
+    void fileReceived( const QString& );
+    void fileRemoved( const QString& );
     void csyncError( const QString& );
+    void csyncWarning( const QString& );
+    void csyncUnavailable();
+    void treeWalkResult(const SyncFileItemVector&);
 
     void csyncStateDbFile( const QString& );
     void wipeDb();
@@ -87,33 +56,34 @@ signals:
     void finished();
     void started();
 
-private:
-    static int treewalk( TREE_WALK_FILE* file, void *data );
-    int recordStats( TREE_WALK_FILE* file);
-    void emitStateDb( CSYNC *csync );
-    int treewalkFile( TREE_WALK_FILE* );
+    void aboutToRemoveAllFiles(SyncFileItem::Direction direction, bool *cancel);
+
+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* );
+
 
-    static int getauth(const char *prompt,
-                char *buf,
-                size_t len,
-                int echo,
-                int verify,
-                void *userdata
-    );
 
     static QMutex _mutex;
-    static QString _user;
-    static QString _passwd;
-    static QNetworkProxy _proxy;
+    static QMutex _syncMutex;
+    SyncFileItemVector _syncedItems;
 
-    static QString _csyncConfigDir;
+    CSYNC *_csync_ctx;
+    bool _needsUpdate;
 
-    QString _source;
-    QString _target;
-    bool    _localCheckOnly;
+    bool _hasFiles; // true if there is at least one file that is not ignored or removed
 
-    QVector <SyncFileItem> _syncedItems;
-    WalkStats _walkStats;
+    friend class CSyncRunScopeHelper;
 };
 }
 

src/mirall/fileitemdialog.cpp

@@ -0,0 +1,304 @@
+/*
+ * 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"
+#include "mirall/logger.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()));
+    connect(this, SIGNAL(guiLog(QString,QString)), Logger::instance(), SIGNAL(guiLog(QString,QString)));
+
+    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::SyncPrepare:
+        folderMessage = tr( "Determining which files to sync." );
+        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);
+
+    if (secs < 60)
+        _timelabel->setText(tr("%1 (last finished %n sec. ago)", "", secs).arg(_folderMessage));
+    else
+        _timelabel->setText(tr("%1 (last finished %n min. ago)", "", secs/60).arg(_folderMessage));
+}
+
+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);
+    emit guiLog(tr("Copied to clipboard"), tr("The sync protocol has been copied to the clipboard."));
+}
+
+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("Uploaded");
+        if( item._dir == SyncFileItem::Down ) dir = tr("Downloaded");
+        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

@@ -0,0 +1,68 @@
+/*
+ * 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();
+
+signals:
+    void guiLog(const QString&, const QString&);
+
+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

@@ -0,0 +1,87 @@
+<?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);
+    dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks);
 
     QFileInfoList list = dir.entryInfoList();
     QStringList dirList;

src/mirall/folder.cpp

@@ -11,6 +11,7 @@
  * 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"
@@ -48,7 +49,6 @@ 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,7 +57,6 @@ 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 &)),
@@ -140,11 +139,6 @@ QString Folder::nativePath() const
     return QDir::toNativeSeparators(_path);
 }
 
-QString Folder::nativeSecondPath() const
-{
-    return secondPath();
-}
-
 bool Folder::syncEnabled() const
 {
   return _enabled;
@@ -153,9 +147,7 @@ bool Folder::syncEnabled() const
 void Folder::setSyncEnabled( bool doit )
 {
   _enabled = doit;
-#ifdef USE_INOTIFY
   _watcher->setEventsEnabled( doit );
-#endif
   if( doit && ! _pollTimer->isActive() ) {
       _pollTimer->start();
   }
@@ -196,6 +188,11 @@ int Folder::pollInterval() const
     return _pollTimer->interval();
 }
 
+void Folder::setSyncState(SyncResult::Status state)
+{
+    _syncResult.setStatus(state);
+}
+
 void Folder::setPollInterval(int milliseconds)
 {
     _pollTimer->setInterval( milliseconds );
@@ -217,12 +214,10 @@ 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,18 +248,10 @@ 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());
 }
 
@@ -283,18 +270,14 @@ 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)
 {
-#ifdef USE_INOTIFY
-    _watcher->setEventsEnabled(true);
-#endif
+    _watcher->setEventsEnabledDelayed(2000);
 
-    qDebug() << "OO folder slotSyncFinished: result: " << int(result.status()) << " local: " << result.localRunOnly();
+    qDebug() << "OO folder slotSyncFinished: result: " << int(result.status());
     emit syncStateChange();
 
     // reenable the poll timer if folder is sync enabled

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,15 +29,12 @@
 #include "mirall/syncresult.h"
 
 class QAction;
-class QTimer;
 class QIcon;
 class QFileSystemWatcher;
 
 namespace Mirall {
 
-#ifdef USE_INOTIFY
 class FolderWatcher;
-#endif
 
 class Folder : public QObject
 {
@@ -48,6 +45,7 @@ public:
     virtual ~Folder();
 
     typedef QHash<QString, Folder*> Map;
+    typedef QHashIterator<QString, Folder*> MapIterator;
 
     /**
      * alias or nickname
@@ -64,7 +62,6 @@ public:
      * local folder path with native separators
      */
     QString nativePath() const;
-    virtual QString nativeSecondPath() const;
     /**
      * switch sync on or off
      * If the sync is switched off, the startSync method is not going to
@@ -151,6 +148,12 @@ 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 &);
 
@@ -164,32 +167,45 @@ public slots:
        */
      virtual void slotTerminateSync() = 0;
 
+     /**
+      * Sets minimum amounts of milliseconds that will separate
+      * poll intervals
+      */
+     void setPollInterval( int );
+
+     /**
+      * If folder is network-based, reimplement to react to proxy changes
+      */
+     virtual void setProxy() {}
+
 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;
 
+protected slots:
+
+    void slotOnlineChanged(bool online);
+
+    void slotPollTimerTimeout();
+
+    /* called when the watcher detect a list of changed
+       paths */
+
+    void slotSyncStarted();
+
+    /**
+     * Triggered by a file system watcher on the local sync dir
+     */
+    virtual void slotLocalPathChanged( const QString& );
+
 private:
 
     /**
@@ -216,22 +232,6 @@ private:
     bool       _enabled;
     QString    _backend;
 
-protected slots:
-
-    void slotOnlineChanged(bool online);
-
-    void slotPollTimerTimeout();
-
-    /* called when the watcher detect a list of changed
-       paths */
-
-    void slotSyncStarted();
-
-    /**
-     * Triggered by a file system watcher on the local sync dir
-     */
-    virtual void slotLocalPathChanged( const QString& );
-
 };
 
 }

src/mirall/folderman.cpp

@@ -14,26 +14,34 @@
 
 #include "mirall/folderman.h"
 #include "mirall/mirallconfigfile.h"
-#include "mirall/unisonfolder.h"
-#include "mirall/csyncfolder.h"
 #include "mirall/owncloudfolder.h"
 #include "mirall/syncresult.h"
 #include "mirall/inotify.h"
 #include "mirall/theme.h"
 
+#ifdef Q_OS_MAC
+#include <CoreServices/CoreServices.h>
+#endif
+#ifdef Q_OS_WIN
+#include <shlobj.h>
+#endif
+
 #include <QDesktopServices>
+#include <QMessageBox>
 #include <QtCore>
 
 namespace Mirall {
 
 FolderMan::FolderMan(QObject *parent) :
-    QObject(parent)
+    QObject(parent),
+    _syncEnabled( true )
 {
     // if QDir::mkpath would not be so stupid, I would not need to have this
     // duplication of folderConfigPath() here
-    QDir storageDir(QDesktopServices::storageLocation(QDesktopServices::DataLocation));
+    MirallConfigFile cfg;
+    QDir storageDir(cfg.configPath());
     storageDir.mkpath(QLatin1String("folders"));
-    _folderConfigPath = QDesktopServices::storageLocation(QDesktopServices::DataLocation) + QLatin1String("/folders");
+    _folderConfigPath = cfg.configPath() + QLatin1String("folders");
 
     _folderChangeSignalMapper = new QSignalMapper(this);
     connect(_folderChangeSignalMapper, SIGNAL(mapped(const QString &)),
@@ -72,12 +80,28 @@ void FolderMan::slotReparseConfiguration()
     setupKnownFolders();
 }
 
+int FolderMan::unloadAllFolders()
+{
+    // first terminate sync jobs.
+    terminateCurrentSync();
+
+    int cnt = 0;
+
+    // clear the list of existing folders.
+    Folder::MapIterator i(_folderMap);
+    while (i.hasNext()) {
+        i.next();
+        delete _folderMap.take( i.key() );
+        cnt++;
+    }
+    return cnt;
+}
 
 int FolderMan::setupKnownFolders()
 {
   qDebug() << "* Setup folders from " << _folderConfigPath;
 
-  _folderMap.clear(); // FIXME: check if delete of folder structure happens
+  unloadAllFolders();
 
   QDir dir( _folderConfigPath );
   dir.setFilter(QDir::Files);
@@ -93,6 +117,42 @@ int FolderMan::setupKnownFolders()
   return _folderMap.size();
 }
 
+void FolderMan::wipeAllJournals()
+{
+    terminateCurrentSync();
+
+    foreach( Folder *f, _folderMap.values() ) {
+        f->wipe();
+    }
+}
+
+bool FolderMan::ensureJournalGone(const QString &localPath)
+{
+
+    // remove old .csync_journal file
+    QString stateDbFile = localPath+QLatin1String("/.csync_journal.db");
+    while (QFile::exists(stateDbFile) && !QFile::remove(stateDbFile)) {
+        int ret = QMessageBox::warning(0, tr("Could not reset folder state"),
+                                       tr("An old sync journal '%1' was found, "
+                                          "but could not be removed. Please make sure "
+                                          "that no application is currently using it.")
+                                       .arg(QDir::fromNativeSeparators(QDir::cleanPath(stateDbFile))),
+                                       QMessageBox::Retry|QMessageBox::Abort);
+        if (ret == QMessageBox::Abort) {
+            return false;
+        }
+    }
+    return true;
+}
+
+void FolderMan::terminateCurrentSync()
+{
+    if( !_currentSyncFolder.isEmpty() ) {
+        qDebug() << "Terminating syncing on folder " << _currentSyncFolder;
+        terminateSyncProcess( _currentSyncFolder );
+    }
+}
+
 #define SLASH_TAG   QLatin1String("__SLASH__")
 #define BSLASH_TAG  QLatin1String("__BSLASH__")
 #define QMARK_TAG   QLatin1String("__QMARK__")
@@ -188,17 +248,7 @@ Folder* FolderMan::setupFolderFromConfigFile(const QString &file) {
 
     if (!backend.isEmpty()) {
 
-        if (backend == QLatin1String("unison")) {
-            folder = new UnisonFolder(alias, path, targetPath, this );
-        } else if (backend == QLatin1String("csync")) {
-#ifdef WITH_CSYNC
-            folder = new CSyncFolder(alias, path, targetPath, this );
-#else
-            qCritical() << "* csync support not enabled!! ignoring:" << file;
-#endif
-        } else if( backend == QLatin1String("owncloud") ) {
-#ifdef WITH_CSYNC
-
+        if( backend == QLatin1String("owncloud") ) {
             MirallConfigFile cfgFile;
 
             // assemble the owncloud url to pass to csync, incl. webdav
@@ -206,18 +256,14 @@ Folder* FolderMan::setupFolderFromConfigFile(const QString &file) {
 
             // cut off the leading slash, oCUrl always has a trailing.
             if( targetPath.startsWith(QLatin1Char('/')) ) {
-
                 targetPath.remove(0,1);
             }
 
             folder = new ownCloudFolder( alias, path, oCUrl + targetPath, this );
             folder->setConfigFile(file);
-#else
-            qCritical() << "* owncloud support not enabled!! ignoring:" << file;
-#endif
         } else {
             qWarning() << "unknown backend" << backend;
-            return NULL;
+            return 0;
         }
     }
 
@@ -240,25 +286,6 @@ Folder* FolderMan::setupFolderFromConfigFile(const QString &file) {
     return folder;
 }
 
-void FolderMan::disableFoldersWithRestore()
-{
-  _folderEnabledMap.clear();
-  foreach( Folder *f, _folderMap ) {
-    // store the enabled state, then make sure it is disabled
-    _folderEnabledMap.insert(f->alias(), f->syncEnabled());
-    f->setSyncEnabled(false);
-  }
-}
-
-void FolderMan::restoreEnabledFolders()
-{
-  foreach( Folder *f, _folderMap ) {
-    if (_folderEnabledMap.contains( f->alias() )) {
-        f->setSyncEnabled( _folderEnabledMap.value( f->alias() ) );
-    }
-  }
-}
-
 void FolderMan::slotEnableFolder( const QString& alias, bool enable )
 {
     if( ! _folderMap.contains( alias ) ) {
@@ -276,9 +303,18 @@ void FolderMan::slotEnableFolder( const QString& alias, bool enable )
 // csync still remains in a stable state, regardless of that.
 void FolderMan::terminateSyncProcess( const QString& alias )
 {
-    Folder *f = _folderMap[alias];
-    if( f ) {
-        f->slotTerminateSync();
+    QString folderAlias = alias;
+    if( alias.isEmpty() ) {
+        folderAlias = _currentSyncFolder;
+    }
+    if( ! folderAlias.isEmpty() ) {
+        Folder *f = _folderMap[folderAlias];
+        if( f ) {
+            f->slotTerminateSync();
+
+            if(_currentSyncFolder == folderAlias )
+                _currentSyncFolder = QString::null;
+        }
     }
 }
 
@@ -303,6 +339,13 @@ SyncResult FolderMan::syncResult( const QString& alias )
     return res;
 }
 
+void FolderMan::slotScheduleAllFolders()
+{
+    foreach( Folder *f, _folderMap.values() ) {
+        slotScheduleSync( f->alias() );
+    }
+}
+
 /*
   * if a folder wants to be synced, it calls this slot and is added
   * to the queue. The slot to actually start a sync is called afterwards.
@@ -314,15 +357,22 @@ void FolderMan::slotScheduleSync( const QString& alias )
     qDebug() << "Schedule folder " << alias << " to sync!";
     if( _currentSyncFolder == alias ) {
         // the current folder is currently syncing.
+        return;
     }
 
-    if( _scheduleQueue.contains( alias ) ) {
-        qDebug() << " II> Sync for folder " << alias << " already scheduled, do not enqueue!";
+    if( ! _scheduleQueue.contains(alias )) {
+        _scheduleQueue.append(alias);
     } else {
-        _scheduleQueue.append( alias );
-
-        slotScheduleFolderSync();
+        qDebug() << " II> Sync for folder " << alias << " already scheduled, do not enqueue!";
     }
+
+    slotScheduleFolderSync();
+
+}
+
+void FolderMan::setSyncEnabled( bool enabled )
+{
+    _syncEnabled = enabled;
 }
 
 /*
@@ -337,6 +387,11 @@ void FolderMan::slotScheduleFolderSync()
         return;
     }
 
+    if( ! _syncEnabled ) {
+        qDebug() << "FolderMan: Syncing is disabled, no scheduling.";
+        return;
+    }
+
     qDebug() << "XX slotScheduleFolderSync: folderQueue size: " << _scheduleQueue.count();
     if( ! _scheduleQueue.isEmpty() ) {
         const QString alias = _scheduleQueue.takeFirst();
@@ -388,7 +443,6 @@ void FolderMan::addFolderDefinition( const QString& backend, const QString& alia
     settings.setValue(QString::fromLatin1("%1/connection").arg(escapedAlias),  Theme::instance()->appName());
     settings.setValue(QString::fromLatin1("%1/onlyThisLAN").arg(escapedAlias), onlyThisLAN );
     settings.sync();
-
 }
 
 void FolderMan::removeAllFolderDefinitions()
@@ -417,6 +471,8 @@ void FolderMan::removeFolder( const QString& alias )
 {
     Folder *f = 0;
 
+    _scheduleQueue.removeAll(alias);
+
     if( _folderMap.contains( alias )) {
         qDebug() << "Removing " << alias;
         f = _folderMap.take( alias );
@@ -435,4 +491,53 @@ void FolderMan::removeFolder( const QString& alias )
     }
 }
 
+QString FolderMan::getBackupName( const QString& fullPathName ) const
+{
+    if( fullPathName.isEmpty() ) return QString::null;
+
+     QString newName = fullPathName + QLatin1String(".oC_bak");
+     QFileInfo fi( newName );
+     int cnt = 1;
+     do {
+         if( fi.exists() ) {
+             newName = fullPathName + QString( ".oC_bak_%1").arg(cnt++);
+             fi.setFile(newName);
+         }
+     } while( fi.exists() );
+
+     return newName;
+}
+
+bool FolderMan::startFromScratch( const QString& localFolder )
+{
+    if( localFolder.isEmpty() ) return false;
+
+    QFileInfo fi( localFolder );
+    if( fi.exists() && fi.isDir() ) {
+        QDir file = fi.dir();
+
+        // check if there are files in the directory.
+        if( file.count() == 0 ) {
+            // directory is existing, but its empty. Use it.
+            qDebug() << "startFromScratch: Directory is empty!";
+            return true;
+        }
+        QString newName = getBackupName( fi.absoluteFilePath() );
+
+        if( file.rename( fi.absoluteFilePath(), newName )) {
+            if( file.mkdir( fi.absoluteFilePath() ) ) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+void FolderMan::setProxy()
+{
+    foreach( Folder *f, _folderMap.values() ) {
+        f->setProxy();
+    }
+}
+
 }

src/mirall/folderman.h

@@ -21,6 +21,7 @@
 
 #include "mirall/folder.h"
 #include "mirall/folderwatcher.h"
+#include "mirall/syncfileitem.h"
 
 class QSignalMapper;
 
@@ -36,8 +37,6 @@ public:
     ~FolderMan();
 
     int setupFolders();
-    void disableFoldersWithRestore();
-    void restoreEnabledFolders();
 
     Mirall::Folder::Map map();
 
@@ -72,6 +71,28 @@ public:
      */
     void removeAllFolderDefinitions();
 
+    /**
+     * Removes csync journals from all folders.
+     */
+    void wipeAllJournals();
+
+    /**
+     * Ensures that a given directory does not contain a .csync_journal.
+     *
+     * @returns false if the journal could not be removed, false otherwise.
+     */
+    static bool ensureJournalGone(const QString &path);
+
+    /**
+     * Creates a new and empty local directory.
+     */
+    bool startFromScratch( const QString& );
+
+    /**
+     *  called whenever proxy configuration changes
+     */
+    void setProxy();
+
 signals:
     /**
       * signal to indicate a folder named by alias has changed its sync state.
@@ -88,7 +109,16 @@ public slots:
 
     void slotReparseConfiguration();
 
-    void terminateSyncProcess( const QString& );
+    void terminateSyncProcess( const QString& alias = QString::null );
+
+    /* delete all folder objects */
+    int unloadAllFolders();
+
+    // if enabled is set to false, no new folders will start to sync.
+    // the current one will finish.
+    void setSyncEnabled( bool );
+
+    void slotScheduleAllFolders();
 
 private slots:
     // slot to add a folder to the syncing queue
@@ -101,6 +131,8 @@ private:
     // finds all folder configuration files
     // and create the folders
     int setupKnownFolders();
+    void terminateCurrentSync();
+    QString getBackupName( const QString& ) const;
 
     // Escaping of the alias which is used in QSettings AND the file
     // system, thus need to be escaped.
@@ -111,11 +143,11 @@ private:
 
     FolderWatcher *_configFolderWatcher;
     Folder::Map    _folderMap;
-    QHash<QString, bool> _folderEnabledMap;
     QString        _folderConfigPath;
     QSignalMapper *_folderChangeSignalMapper;
     QString        _currentSyncFolder;
     QStringList    _scheduleQueue;
+    bool           _syncEnabled;
 };
 
 }

src/mirall/folderwatcher.cpp

@@ -28,20 +28,18 @@
 #include <QStringList>
 #include <QTimer>
 
-#ifdef USE_INOTIFY
-#include <sys/inotify.h>
-#endif
-
-static const uint32_t standard_event_mask =
-#ifdef USE_INOTIFY
-    IN_CLOSE_WRITE | IN_ATTRIB | IN_MOVE | IN_CREATE | IN_DELETE | IN_DELETE_SELF | IN_MOVE_SELF | IN_UNMOUNT | IN_ONLYDIR | IN_DONT_FOLLOW;
-#else
-    0;
-#endif
 /* minimum amount of seconds between two
    events  to consider it a new event */
 #define DEFAULT_EVENT_INTERVAL_MSEC 1000
 
+#if defined(Q_OS_WIN)
+#include "mirall/folderwatcher_win.h"
+#elif defined(Q_OS_MAC)
+#include "mirall/folderwatcher_mac.h"
+#elif defined(USE_INOTIFY)
+#include "mirall/folderwatcher_inotify.h"
+#endif
+
 namespace Mirall {
 
 FolderWatcher::FolderWatcher(const QString &root, QObject *parent)
@@ -49,19 +47,13 @@ FolderWatcher::FolderWatcher(const QString &root, QObject *parent)
       _eventsEnabled(true),
       _eventInterval(DEFAULT_EVENT_INTERVAL_MSEC),
       _root(root),
-      _processTimer(new QTimer(this)),
-      _lastMask(0),
-      _initialSyncDone(false)
+      _processTimer(new QTimer(this))
 {
-#ifdef USE_INOTIFY
+    _d = new FolderWatcherPrivate(this);
+
     _processTimer->setSingleShot(true);
     QObject::connect(_processTimer, SIGNAL(timeout()), this, SLOT(slotProcessTimerTimeout()));
 
-    _inotify = new INotify(standard_event_mask);
-    slotAddFolderRecursive(root);
-    QObject::connect(_inotify, SIGNAL(notifyEvent(int, int, const QString &)),
-                     this, SLOT(slotINotifyEvent(int, int, const QString &)));
-#endif
     // do a first synchronization to get changes while
     // the application was not running
     setProcessTimer();
@@ -69,7 +61,7 @@ FolderWatcher::FolderWatcher(const QString &root, QObject *parent)
 
 FolderWatcher::~FolderWatcher()
 {
-
+    delete _d;
 }
 
 QString FolderWatcher::root() const
@@ -99,11 +91,22 @@ void FolderWatcher::addIgnore(const QString &pattern)
     _ignores.append(pattern);
 }
 
+QStringList FolderWatcher::ignores() const
+{
+    return _ignores;
+}
+
 bool FolderWatcher::eventsEnabled() const
 {
     return _eventsEnabled;
 }
 
+void FolderWatcher::setEventsEnabledDelayed( int delay_msec )
+{
+    qDebug() << "Starting Event logging again in " << delay_msec << " milliseconds";
+    QTimer::singleShot( delay_msec, this, SLOT(setEventsEnabled()));
+}
+
 void FolderWatcher::setEventsEnabled(bool enabled)
 {
     qDebug() << "    * event notification " << (enabled ? "enabled" : "disabled");
@@ -139,142 +142,16 @@ void FolderWatcher::setEventInterval(int seconds)
     _eventInterval = seconds;
 }
 
-QStringList FolderWatcher::folders() const
-{
-#ifdef USE_INOTIFY
-    return _inotify->directories();
-#else
-    return QStringList();
-#endif
-}
-
-void FolderWatcher::slotAddFolderRecursive(const QString &path)
-{
-    int subdirs = 0;
-    qDebug() << "(+) Watcher:" << path;
-#ifdef USE_INOTIFY
-
-    _inotify->addPath(path);
-    QStringList watchedFolders(_inotify->directories());
-    // qDebug() << "currently watching " << watchedFolders;
-    QStringListIterator subfoldersIt(FileUtils::subFoldersList(path, FileUtils::SubFolderRecursive));
-    while (subfoldersIt.hasNext()) {
-        QString subfolder = subfoldersIt.next();
-        // qDebug() << "  (**) subfolder: " << subfolder;
-        QDir folder (subfolder);
-        if (folder.exists() && !watchedFolders.contains(folder.path())) {
-            subdirs++;
-            // check that it does not match the ignore list
-            foreach ( const QString& pattern, _ignores) {
-                QRegExp regexp(pattern);
-                regexp.setPatternSyntax(QRegExp::Wildcard);
-                if ( regexp.exactMatch(folder.path()) ) {
-                    qDebug() << "* Not adding" << folder.path();
-                    continue;
-                }
-
-            }
-            _inotify->addPath(folder.path());
-        }
-        else
-            qDebug() << "    `-> discarded:" << folder.path();
-    }
-    if (subdirs >0)
-        qDebug() << "    `-> and" << subdirs << "subdirectories";
-#else
-    qDebug() << "** Watcher is not compiled in!";
-#endif
-}
-
-void FolderWatcher::slotINotifyEvent(int mask, int cookie, const QString &path)
-{
-    int lastMask = _lastMask;
-    QString lastPath = _lastPath;
-
-    _lastMask = mask;
-    _lastPath = path;
-
-    if( ! eventsEnabled() ) return;
-#ifdef USE_INOTIFY
-    qDebug() << "** Inotify Event " << mask << " on " << path;
-    // cancel close write events that come after create
-    if (lastMask == IN_CREATE && mask == IN_CLOSE_WRITE
-        && lastPath == path ) {
-        return;
-    }
-
-    if (IN_IGNORED & mask) {
-        //qDebug() << "IGNORE event";
-        return;
-    }
-
-    if (IN_Q_OVERFLOW & mask) {
-        //qDebug() << "OVERFLOW";
-    }
-
-    if (mask & IN_CREATE) {
-        //qDebug() << cookie << " CREATE: " << path;
-        if (QFileInfo(path).isDir()) {
-            //setEventsEnabled(false);
-            slotAddFolderRecursive(path);
-            //setEventsEnabled(true);
-        }
-    }
-    else if (mask & IN_DELETE) {
-        //qDebug() << cookie << " DELETE: " << path;
-        if ( QFileInfo(path).isDir() && _inotify->directories().contains(path) ) {
-            qDebug() << "(-) Watcher:" << path;
-            _inotify->removePath(path);
-        }
-    }
-    else if (mask & IN_CLOSE_WRITE) {
-        //qDebug() << cookie << " WRITABLE CLOSED: " << path;
-    }
-    else if (mask & IN_MOVE) {
-        //qDebug() << cookie << " MOVE: " << path;
-    }
-    else {
-        //qDebug() << cookie << " OTHER " << mask << " :" << path;
-    }
-
-    foreach (const QString& pattern, _ignores) {
-        QRegExp regexp(pattern);
-        regexp.setPatternSyntax(QRegExp::Wildcard);
-
-        if (regexp.exactMatch(path)) {
-            qDebug() << "* Discarded by ignore pattern: " << path;
-            return;
-        }
-        QFileInfo fInfo(path);
-        if( regexp.exactMatch(fInfo.fileName())) {
-            qDebug() << "* Discarded by ignore pattern:" << path;
-            return;
-        }
-        if( fInfo.isHidden() ) {
-            qDebug() << "* Discarded as is hidden!";
-            return;
-        }
-    }
-
-    if( !_pendingPathes.contains( path )) {
-        _pendingPathes[path] = 0;
-    }
-    _pendingPathes[path] = _pendingPathes[path]+mask;
-#endif
-    setProcessTimer();
-}
-
 void FolderWatcher::slotProcessTimerTimeout()
 {
     qDebug() << "* Processing of event queue for" << root();
 
-    if (!_pendingPathes.empty() || !_initialSyncDone) {
+    if (!_pendingPathes.empty() ) {
         QStringList notifyPaths = _pendingPathes.keys();
         _pendingPathes.clear();
         //qDebug() << lastEventTime << eventTime;
-        qDebug() << "  * Notify" << notifyPaths.size() << "changed items for" << root();
+        qDebug() << "  * Notify" << notifyPaths.size() << "change items for" << root();
         emit folderChanged(notifyPaths);
-        _initialSyncDone = true;
     }
 }
 
@@ -283,12 +160,23 @@ void FolderWatcher::setProcessTimer()
     if (!_processTimer->isActive()) {
         qDebug() << "* Pending events for" << root()
                  << "will be processed after events stop for"
-                 << eventInterval() << "seconds ("
+                 << eventInterval() << "milliseconds ("
                  << QTime::currentTime().addSecs(eventInterval()).toString(QLatin1String("HH:mm:ss"))
                  << ")." << _pendingPathes.size() << "events until now )";
     }
     _processTimer->start(eventInterval());
 }
 
+void FolderWatcher::changeDetected(const QString& f)
+{
+    if( ! eventsEnabled() ) {
+        // qDebug() << "FolderWatcher::changeDetected when eventsEnabled() -> ignore";
+        return;
+    }
+
+    _pendingPathes[f] = 1; //_pendingPathes[path]+mask;
+    setProcessTimer();
 }
 
+} // namespace Mirall
+

src/mirall/folderwatcher.h

@@ -30,9 +30,7 @@ class QTimer;
 
 namespace Mirall {
 
-#ifdef USE_INOTIFY
-class INotify;
-#endif
+class FolderWatcherPrivate;
 
 /**
  * Watches a folder and sub folders for changes
@@ -53,11 +51,6 @@ public:
     FolderWatcher(const QString &root, QObject *parent = 0L);
     ~FolderWatcher();
 
-    /**
-     * All watched folders and subfolders
-     */
-    QStringList folders() const;
-
     /**
      * Root path being monitored
      */
@@ -82,13 +75,6 @@ public:
      */
     bool eventsEnabled() const;
 
-    /**
-     * Enabled or disables folderChanged() events.
-     * If disabled, events are accumulated and emptied
-     * the next time a folderChanged() event happens.
-     */
-    void setEventsEnabled(bool enabled);
-
     /**
      * Clear all pending events
      */
@@ -106,6 +92,22 @@ public:
      */
     void setEventInterval(int seconds);
 
+    QStringList ignores() const;
+public slots:
+    /**
+     * Enabled or disables folderChanged() events.
+     * If disabled, events are accumulated and emptied
+     * the next time a folderChanged() event happens.
+     */
+    void setEventsEnabled(bool enabled=true);
+
+    /**
+     * @brief setEventsEnabledDelayed - start event logging after a while
+     * @param delay     - delay time in milliseconds
+     * @param enabled   - enable the events.
+     */
+    void setEventsEnabledDelayed( int );
+
 signals:
     /**
      * Emitted when one of the paths is changed
@@ -116,32 +118,24 @@ protected:
     void setProcessTimer();
 
 protected slots:
-    void slotINotifyEvent(int mask, int cookie, const QString &path);
-    void slotAddFolderRecursive(const QString &path);
     // called when the manually process timer triggers
     void slotProcessTimerTimeout();
+    void changeDetected(const QString &f);
+
+protected:
+    QHash<QString, int> _pendingPathes;
 
 private:
     bool _eventsEnabled;
     int _eventInterval;
-#ifdef USE_INOTIFY
-    INotify *_inotify;
-#endif
+    FolderWatcherPrivate *_d;
     QString _root;
     // paths pending to notified
     // QStringList _pendingPaths;
-    QHash<QString, int> _pendingPathes;
-
     QTimer *_processTimer;
-
-    // to cancel events that belong to the same action
-    int _lastMask;
-    QString _lastPath;
     QStringList _ignores;
 
-    // for the initial synchronization, without
-    // any file changed
-    bool _initialSyncDone;
+    friend class FolderWatcherPrivate;
 };
 
 }

src/mirall/folderwatcher_inotify.cpp

@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) by Duncan Mac-Vicar P. <duncan@kde.org>
+ * Copyright (C) by Daniel Molkentin <danimo@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 <sys/inotify.h>
+
+#include "mirall/inotify.h"
+#include "mirall/folderwatcher.h"
+#include "mirall/fileutils.h"
+
+#include "mirall/folderwatcher_inotify.h"
+
+#include <QDir>
+#include <QFileInfo>
+#include <QDebug>
+
+namespace Mirall {
+
+static const uint32_t standard_event_mask =
+    IN_CLOSE_WRITE | IN_ATTRIB | IN_MOVE |
+    IN_CREATE |IN_DELETE | IN_DELETE_SELF |
+    IN_MOVE_SELF |IN_UNMOUNT |IN_ONLYDIR |
+    IN_DONT_FOLLOW;
+
+FolderWatcherPrivate::FolderWatcherPrivate(FolderWatcher *p)
+    : QObject(), _parent(p), _lastMask(0)
+
+{
+    _inotify = new INotify(this, standard_event_mask);
+    slotAddFolderRecursive(_parent->root());
+    QObject::connect(_inotify, SIGNAL(notifyEvent(int, int, const QString &)),
+                     this, SLOT(slotINotifyEvent(int, int, const QString &)));
+
+}
+
+void FolderWatcherPrivate::slotAddFolderRecursive(const QString &path)
+{
+    int subdirs = 0;
+    qDebug() << "(+) Watcher:" << path;
+
+    _inotify->addPath(path);
+    QStringList watchedFolders(_inotify->directories());
+    // qDebug() << "currently watching " << watchedFolders;
+    QStringListIterator subfoldersIt(FileUtils::subFoldersList(path, FileUtils::SubFolderRecursive));
+    while (subfoldersIt.hasNext()) {
+        QString subfolder = subfoldersIt.next();
+        // qDebug() << "  (**) subfolder: " << subfolder;
+        QDir folder (subfolder);
+        if (folder.exists() && !watchedFolders.contains(folder.path())) {
+            subdirs++;
+            // check that it does not match the ignore list
+            foreach ( const QString& pattern, _parent->ignores()) {
+                QRegExp regexp(pattern);
+                regexp.setPatternSyntax(QRegExp::Wildcard);
+                if ( regexp.exactMatch(folder.path()) ) {
+                    qDebug() << "* Not adding" << folder.path();
+                    continue;
+                }
+
+            }
+            _inotify->addPath(folder.path());
+        }
+        else
+            qDebug() << "    `-> discarded:" << folder.path();
+    }
+    if (subdirs >0)
+        qDebug() << "    `-> and" << subdirs << "subdirectories";
+}
+
+void FolderWatcherPrivate::slotINotifyEvent(int mask, int cookie, const QString &path)
+{
+    int lastMask = _lastMask;
+    QString lastPath = _lastPath;
+
+    _lastMask = mask;
+    _lastPath = path;
+
+    // TODO: Unify behaviour acress backends!
+    if( ! _parent->eventsEnabled() ) return;
+    qDebug() << "** Inotify Event " << mask << " on " << path;
+    // cancel close write events that come after create
+    if (lastMask == IN_CREATE && mask == IN_CLOSE_WRITE
+        && lastPath == path ) {
+        return;
+    }
+
+    if (IN_IGNORED & mask) {
+        //qDebug() << "IGNORE event";
+        return;
+    }
+
+    if (IN_Q_OVERFLOW & mask) {
+        //qDebug() << "OVERFLOW";
+    }
+
+    if (mask & IN_CREATE) {
+        //qDebug() << cookie << " CREATE: " << path;
+        if (QFileInfo(path).isDir()) {
+            //setEventsEnabled(false);
+            slotAddFolderRecursive(path);
+            //setEventsEnabled(true);
+        }
+    }
+    else if (mask & IN_DELETE) {
+        //qDebug() << cookie << " DELETE: " << path;
+        if ( QFileInfo(path).isDir() && _inotify->directories().contains(path) ) {
+            qDebug() << "(-) Watcher:" << path;
+            _inotify->removePath(path);
+        }
+    }
+    else if (mask & IN_CLOSE_WRITE) {
+        //qDebug() << cookie << " WRITABLE CLOSED: " << path;
+    }
+    else if (mask & IN_MOVE) {
+        //qDebug() << cookie << " MOVE: " << path;
+    }
+    else {
+        //qDebug() << cookie << " OTHER " << mask << " :" << path;
+    }
+
+    foreach (const QString& pattern, _parent->ignores()) {
+        QRegExp regexp(pattern);
+        regexp.setPatternSyntax(QRegExp::Wildcard);
+
+        if (regexp.exactMatch(path)) {
+            qDebug() << "* Discarded by ignore pattern: " << path;
+            return;
+        }
+        QFileInfo fInfo(path);
+        if( regexp.exactMatch(fInfo.fileName())) {
+            qDebug() << "* Discarded by ignore pattern:" << path;
+            return;
+        }
+        if( fInfo.isHidden() ) {
+            qDebug() << "* Discarded as is hidden!";
+            return;
+        }
+    }
+
+    if( !_parent->_pendingPathes.contains( path )) {
+        _parent->_pendingPathes[path] = 0;
+    }
+    _parent->_pendingPathes[path] = _parent->_pendingPathes[path]+mask;
+    _parent->setProcessTimer();
+}
+
+} // namespace Mirall

src/mirall/folderwatcher_inotify.h

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) by Daniel Molkentin <danimo@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.
+ */
+
+#ifndef MIRALL_FOLDERWATCHER_INOTIFY_H
+#define MIRALL_FOLDERWATCHER_INOTIFY_H
+
+#include <QObject>
+
+namespace Mirall {
+
+class INotify;
+class FolderWatcher;
+
+class FolderWatcherPrivate : public QObject {
+    Q_OBJECT
+public:
+    FolderWatcherPrivate(FolderWatcher *p);
+private slots:
+    void slotAddFolderRecursive(const QString &path);
+    void slotINotifyEvent(int mask, int cookie, const QString &path);
+private:
+    INotify *_inotify;
+    FolderWatcher *_parent;
+    // to cancel events that belong to the same action
+    int _lastMask;
+    QString _lastPath;
+};
+
+}
+
+#endif // MIRALL_FOLDERWATCHER_INOTIFY_H

src/mirall/folderwatcher_mac.cpp

@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) by Markus Goetz <markus@woboq.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 "config.h"
+
+#include "mirall/folder.h"
+#include "mirall/folderwatcher.h"
+#include "mirall/folderwatcher_mac.h"
+
+
+#include <cerrno>
+#include <QDebug>
+#include <QStringList>
+
+
+
+namespace Mirall {
+
+FolderWatcherPrivate::FolderWatcherPrivate(FolderWatcher *p)
+    : parent(p)
+{
+    folder = parent->root();
+    this->startWatching();
+}
+
+FolderWatcherPrivate::~FolderWatcherPrivate()
+{
+    FSEventStreamStop(stream);
+    FSEventStreamInvalidate(stream);
+}
+
+static void callback(
+        ConstFSEventStreamRef streamRef,
+        void *clientCallBackInfo,
+        size_t numEvents,
+        void *eventPaths,
+        const FSEventStreamEventFlags eventFlags[],
+        const FSEventStreamEventId eventIds[])
+{
+    qDebug() << "FolderWatcherPrivate::callback by OS X";
+    reinterpret_cast<FolderWatcherPrivate*>(clientCallBackInfo)->doNotifyParent();
+}
+
+void FolderWatcherPrivate::startWatching()
+{
+    qDebug() << "FolderWatcherPrivate::startWatching()" << folder;
+    CFStringRef folderCF = CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(folder.unicode()),
+                                                        folder.length());
+    CFArrayRef pathsToWatch = CFStringCreateArrayBySeparatingStrings (NULL, folderCF, CFSTR(":"));
+
+            //CFStringCreateArrayBySeparatingStrings (NULL, folderCF, CFSTR(":"));
+
+    FSEventStreamContext ctx =  {0, this, NULL, NULL, NULL};
+
+    // TODO: Add kFSEventStreamCreateFlagFileEvents ?
+
+    stream = FSEventStreamCreate(NULL,
+                                 &callback,
+                                 &ctx,
+                                 pathsToWatch,
+                                 kFSEventStreamEventIdSinceNow,
+                                 0, // latency
+                                 kFSEventStreamCreateFlagNone
+                                 );
+
+    FSEventStreamScheduleWithRunLoop(stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+    FSEventStreamStart(stream);
+}
+
+void FolderWatcherPrivate::doNotifyParent() {
+    parent->changeDetected(folder);
+}
+
+
+
+} // ns mirall

src/mirall/folderwatcher_mac.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) by Klaas Freitag <freitag@owncloud.com>
+ * Copyright (C) by Markus Goetz <markus@woboq.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
@@ -12,31 +12,36 @@
  * for more details.
  */
 
-#ifndef MIRALL_THEME_H
-#define MIRALL_THEME_H
+#ifndef MIRALL_FOLDERWATCHER_MAC_H
+#define MIRALL_FOLDERWATCHER_MAC_H
 
-#include "theme.h"
+#include <QObject>
+#include <QString>
 
-namespace Mirall {
+#include <CoreServices/CoreServices.h>
 
-class mirallTheme : public Theme
+
+namespace Mirall
+{
+
+class FolderWatcherPrivate
 {
 public:
-    mirallTheme();
 
-    virtual QString appName() const;
-    virtual QString configFileName() const;
-    QPixmap splashScreen() const;
+    FolderWatcherPrivate(FolderWatcher *p);
+    ~FolderWatcherPrivate();
 
-    QIcon   folderIcon( const QString& ) const;
-    QIcon   syncStateIcon(SyncResult::Status) const;
-    QIcon   folderDisabledIcon() const;
-    QIcon   applicationIcon() const;
+    void startWatching();
+    void doNotifyParent();
 
 private:
+    FolderWatcher *parent;
 
+    QString folder;
 
+    FSEventStreamRef stream;
 };
 
 }
-#endif // MIRALL_THEME_H
+
+#endif

src/mirall/folderwatcher_win.cpp

@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) by Daniel Molkentin <danimo@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 <QThread>
+#include <QDebug>
+
+#include "mirall/folderwatcher.h"
+#include "mirall/folderwatcher_win.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <tchar.h>
+
+namespace Mirall {
+
+void WatcherThread::run()
+{
+    _handle = FindFirstChangeNotification((wchar_t*)_path.utf16(),
+                                         true, // recursive watch
+                                         FILE_NOTIFY_CHANGE_FILE_NAME |
+                                         FILE_NOTIFY_CHANGE_DIR_NAME |
+                                         FILE_NOTIFY_CHANGE_LAST_WRITE);
+
+    if (_handle == INVALID_HANDLE_VALUE)
+    {
+        qDebug() << Q_FUNC_INFO << "FindFirstChangeNotification function failed, stopping watcher!";
+        FindCloseChangeNotification(_handle);
+        _handle = 0;
+        return;
+    }
+
+    if (_handle == NULL)
+    {
+        qDebug() << Q_FUNC_INFO << "FindFirstChangeNotification returned null, stopping watcher!";
+        FindCloseChangeNotification(_handle);
+        _handle = 0;
+        return;
+    }
+
+    while(true) {
+        switch(WaitForSingleObject(_handle, /*wait*/ INFINITE)) {
+        case WAIT_OBJECT_0:
+            if (FindNextChangeNotification(_handle) == false) {
+                qDebug() << Q_FUNC_INFO << "FindFirstChangeNotification returned FALSE, stopping watcher!";
+                FindCloseChangeNotification(_handle);
+                _handle = 0;
+                return;
+            }
+            // qDebug() << Q_FUNC_INFO << "Change detected in" << _path << "from" << QThread::currentThread    ();
+            emit changed(_path);
+            break;
+        default:
+            qDebug()  << Q_FUNC_INFO << "Error while watching";
+        }
+    }
+}
+
+WatcherThread::~WatcherThread()
+{
+    if (_handle)
+        FindCloseChangeNotification(_handle);
+}
+
+FolderWatcherPrivate::FolderWatcherPrivate(FolderWatcher *p)
+    : _parent(p)
+{
+    _thread = new WatcherThread(p->root());
+    connect(_thread, SIGNAL(changed(const QString&)),
+            _parent,SLOT(changeDetected(const QString&)));
+    _thread->start();
+}
+
+FolderWatcherPrivate::~FolderWatcherPrivate()
+{
+    _thread->terminate();
+    _thread->wait();
+    delete _thread;
+}
+
+} // namespace Mirall

src/mirall/folderwatcher_win.h

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) by Daniel Molkentin <danimo@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.
+ */
+
+#ifndef MIRALL_FOLDERWATCHER_WIN_H
+#define MIRALL_FOLDERWATCHER_WIN_H
+
+#include <QThread>
+#include <windows.h>
+
+namespace Mirall {
+
+class FolderWatcher;
+
+// watcher thread
+
+class WatcherThread : public QThread {
+    Q_OBJECT
+public:
+    WatcherThread(const QString &path) :
+        QThread(), _path(path), _handle(0) {}
+
+    ~WatcherThread();
+
+protected:
+    void run();
+
+signals:
+    void changed(const QString &path);
+
+private:
+    QString _path;
+    HANDLE _handle;
+};
+
+class FolderWatcherPrivate : public QObject {
+    Q_OBJECT
+public:
+    FolderWatcherPrivate(FolderWatcher *p);
+    ~FolderWatcherPrivate();
+private:
+    FolderWatcher *_parent;
+    WatcherThread *_thread;
+};
+
+}
+
+#endif // MIRALL_FOLDERWATCHER_WIN_H