Rather count the blacklist items in the database.

Use database functions to count the entries rather than trying to
compute it from the progress items the widget got.

.gitignore

@@ -1,3 +1,4 @@
+.gitmodules
 *build*/
 *flymake*
 CMakeLists.txt.user*
@@ -5,3 +6,7 @@ CMakeLists.txt.user*
 *~
 *.autosave
 doc/_build/*
+*~
+*.kate-swp
+*.kdev4
+win/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "doc/ocdoc"]
+	path = doc/ocdoc
+	url = https://github.com/owncloud/documentation

CMakeLists.txt

@@ -4,17 +4,36 @@ project(mirall)
 set(PACKAGE "mirall")
 set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 
-if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
+include(Warnings)
+
+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()
 
+if (NOT DEFINED APPLICATION_SHORTNAME)
+     set ( APPLICATION_SHORTNAME ${APPLICATION_NAME} )
+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/")
+
+#####
+## handle DBUS for Fdo notifications
+if( UNIX AND NOT APPLE )
+    add_definitions( -DUSE_FDO_NOTIFICATIONS)
+    set(WITH_DBUS ON)
+endif()
+####
 
 include(GNUInstallDirs)
+include(DefineInstallationPaths)
+include(QtVersionAbstraction)
+
+setup_qt()
 
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
@@ -31,10 +50,8 @@ if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
     endif()
 endif()
 
-## stupid, we should upstream this
-if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" AND NOT CMAKE_INSTALL_SYSCONFDIR)
-    set(CMAKE_INSTALL_SYSCONFDIR "/etc")
-endif()
+set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
+set(DATADIR ${DATA_INSTALL_DIR})
 
 #####
 ## handle BUILD_OWNCLOUD_OSX_BUNDLE
@@ -54,8 +71,13 @@ endif()
 #####
 
 #### find libs
-find_package(Qt4 4.6.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest REQUIRED )
-find_package(Csync)
+#find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest QtWebkit REQUIRED )
+#if( UNIX AND NOT APPLE ) # Fdo notifications
+#    find_package(Qt4 4.7.0 COMPONENTS QtDBus REQUIRED )
+#endif()
+find_package(Neon REQUIRED)
+find_package(Csync REQUIRED)
+find_package(QtKeychain REQUIRED)
 if(UNIX)
 find_package(INotify REQUIRED)
 else()
@@ -63,41 +85,14 @@ 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)
 
-set(CPACK_SOURCE_IGNORE_FILES
-  # hidden files
-  "/\\\\..+$"
-  # temporary files
-  "\\\\.swp$"
-  # backup files
-  "~$"
-  # others
-  "\\\\.#"
-  "/#"
-  "/build/"
-  "/_build/"
-  # used before
-  "\\\\.o$"
-  "\\\\.lo$"
-  "\\\\.la$"
-  "Makefile\\\\.in$"
-)
-
 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)
 
@@ -117,5 +112,5 @@ endif(UNIT_TESTING)
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
     configure_file(sync-exclude.lst ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
 else()
-    install( FILES sync-exclude.lst DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} )
+    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
 endif()

CONTRIBUTING.md

@@ -4,8 +4,8 @@ If you have questions about how to use the ownCloud Desktop Client, please
 direct these to the [mailing list][mailinglist] or our [forum][forum].
 We are also available on [IRC][irc].
 
-### Guidelines
-* Report the issue using our [template][template], it includes all the
+### 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: 

CPackOptions.cmake.in

@@ -21,11 +21,9 @@ set( CSYNC_BINARY_DIR  @CSYNC_BINARY_DIR@ )
 set( MINGW_ROOT @CMAKE_FIND_ROOT_PATH@ )
 if(CSYNC_BINARY_DIR)
     set( CSYNC_LIBRARY_DIR "${CSYNC_BINARY_DIR}/src" )
-    set( CSYNC_PLUGIN_DIR  "${CSYNC_BINARY_DIR}/modules" )
     set( CSYNC_CONFIG_DIR  "${CSYNC_BINARY_DIR}/config" )
 else()
     set( CSYNC_LIBRARY_DIR "${MINGW_ROOT}/bin" )
-    set( CSYNC_PLUGIN_DIR  "${MINGW_ROOT}/plugins-0" ) #FIXME: whatever it is
     set( CSYNC_CONFIG_DIR  "${MINGW_ROOT}/etc/ocsync" )
 endif()
 set( BUILD_OWNCLOUD_OSX_BUNDLE @BUILD_OWNCLOUD_OSX_BUNDLE@)

ChangeLog

@@ -1,11 +1,108 @@
 ChangeLog
 =========
-version 1.2.3 (release 2013-04-02 ), csync 0.70.5 required
+version 1.4.1 (release 2013-09-24 ), csync 0.90.1 required
 
+  * Translation and documentation fixes.
+  * Fixed error display in settings/status dialog, displays multi 
+    line error messages now correctly.
+  * Wait up to 30 secs before complaining about missing systray
+    Fixes bug #949
+  * Fixed utf8 issues with basic auth authentication, fixes bug #941
+  * Fixed remote folder selector, avoid recursive syncing, fixes bug #962
+  * Handle and display network problems at startup correctly.
+  * Enable and disable the folder watcher during syncs correctly.
+  * Fix setting of thread priority.
+  * Fixed file size display.
+  * Fixed various folder wizard issues, bug #992
+  * Made "Sync started" message optional, fixes bug #934
+  * Fixed shutdown, avoid crashed config on win32, fixes bug #945
+  * Pop up config wizard if no server url is configured, fixes bug #1018
+  * Settings: calculate sidebar width dynamically, fixes bug #1020
+  * Fixed a crash if sync folders were removed, fixes bug #713
+  * Do proper resync after network disconnect, fixes bug #1007
+  * Various minor code fixes
+
+version 1.4.0 (release 2013-09-04 ), csync 0.90.0 required
+
+  * New Scheduler: Only sync when there are actual changes in the server
+  * Add a Settings Dialog, move Proxy Settings there
+  * Transform folder Status Dialog into Account Settings, provide feedback via context menu
+  * Add Bandwidth Control
+  * Add a visual storage/quota indicator (context menu and account settings)
+  * Add progress indication (context menu and account settings)
+  * Introduce a sync history, persisting results across syncs
+  * Move ability to switch to mono icons from a switch to a Settings option
+  * Add "Launch on System Startup" GUI option
+  * Add "Show Desktop Nofications"GUI option (enabled by default)
+    top optionally disable sync notifications
+  * Add Help item, pointing to online reference
+  * Implement graphical selection of remote folders in FolderWizard
+  * Allow custom ignore patterns
+  * Add an editor for ingore patterns
+  * ALlow to flag certain ignore patterns as discardable
+  * Ensure to ship with all valid translations
+  * Progress Dialog now preserves the last syncned items across sync runs
+  * Split Setup Wizard into multiple pages again
+  * Implement "--logfile -" to log to stdout
+  * Add preliminary support for Shibboleth authentication
+  * Linux: Provide more icon sizes
+  * Linux: Do not trigger notifier on ignored files
+  * Windows: Reduce priority of CSync thread
+  * Documentation: Prem. updates to reflect UI changes
+  * Significant code refactorings
+  * Require Qt 4.7
+  * Known issue: Under certain conditions, a file will only get uploaded after up to five minutes
+
+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
@@ -180,8 +277,3 @@ version 1.0.1 (release 2012-04-18), csync 0.50.5 required
   * [Platform] MacOSX Bundle creation added
   * [Platform] Enabled ranslations on Windows.
 
-
-ChangeLog
-=========
-
-version 1.2.1 (release 2013-02-26 ), csync 0.70.4 required

OWNCLOUD.cmake

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

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,6 +1,6 @@
 set( VERSION_MAJOR 1 )
-set( VERSION_MINOR 2 )
-set( VERSION_PATCH 3 )
-set( VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
+set( VERSION_MINOR 5 )
+set( VERSION_PATCH 0 )
+set( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}beta2")
 set( SOVERSION 0 )
 

admin/osx/sign_dmg.sh

@@ -10,8 +10,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 12s
+hdiutil attach $tmp_dmg
 pushd $mount
 codesign -s "$identity" $mount/*.app
 popd

admin/win/nsi/nsis_uac/UAC_RealWorldFullyLoadedDualModeExample.nsi

@@ -5,7 +5,6 @@ This sample uses the registry plugin, so you need to download that if you don't
 
 !define APPNAME "UAC_RealWorldFullyLoadedDualMode"
 !define ELEVATIONTITLE "${APPNAME}: Elevate" ;displayed during elevation on our custom page
-!define SMSUBDIR $StartMenuFolder ;"${APPNAME}"
 !define UNINSTALLER_NAME "Uninstall ${APPNAME}.exe"
 !define UNINSTALLER_REGSECTION "${APPNAME}"
 !define RegPath.MSUninstall "Software\Microsoft\Windows\CurrentVersion\Uninstall"
@@ -200,10 +199,7 @@ UAC::Exec "" "Notepad.exe" "$Windir\Win.INI" "$InstDir"
 FunctionEnd
 
 Function CreateSMShortcuts
-StrCpy ${SMSUBDIR} $9 ;stupid sync
-CreateDirectory "$SMPrograms\${SMSUBDIR}"
-CreateShortcut "$SMPrograms\${SMSUBDIR}\${APPNAME}.lnk" "$Windir\Notepad.exe"
-CreateShortcut "$SMPrograms\${SMSUBDIR}\Uninstall ${APPNAME}.lnk" "$InstDir\${UNINSTALLER_NAME}"
+CreateShortcut "$SMPrograms\${APPNAME}.lnk" "$Windir\Notepad.exe"
 FunctionEnd
 Function CreateDeskShortcuts
 CreateShortcut "$Desktop\${APPNAME}.lnk" "$Windir\Notepad.exe"
@@ -222,7 +218,6 @@ ${registry::Unload}
 SectionEnd
 
 Section "Startmenu Shortcuts"
-StrCpy $9 ${SMSUBDIR} ;this is stupid as hell, we need correct ${SMSUBDIR} in the outer process, this is the only way (plugins cannot enum "custom" var's AFAIK)
 ${UAC.CallFunctionAsUser} CreateSMShortcuts
 SectionEnd
 Section "Desktop Shortcut"
@@ -231,9 +226,7 @@ SectionEnd
 
 Section Uninstall
 Delete "$InstDir\${UNINSTALLER_NAME}"
-Delete "$SMPrograms\${SMSUBDIR}\${APPNAME}.lnk"
-Delete "$SMPrograms\${SMSUBDIR}\Uninstall ${APPNAME}.lnk"
-RMDir "$SMPrograms\${SMSUBDIR}"
+Delete "$SMPrograms\${APPNAME}.lnk"
 Delete "$Desktop\${APPNAME}.lnk"
 
 RMDir "$InstDir"

cmake/modules/DefineInstallationPaths.cmake

@@ -0,0 +1,108 @@
+if (UNIX)
+  # Suffix for Linux
+  SET(LIB_SUFFIX
+    CACHE STRING "Define suffix of directory name (32/64)"
+  )
+
+  SET(EXEC_INSTALL_PREFIX
+    "${CMAKE_INSTALL_PREFIX}"
+    CACHE PATH  "Base directory for executables and libraries"
+  )
+  SET(SHARE_INSTALL_PREFIX
+    "${CMAKE_INSTALL_PREFIX}/share"
+    CACHE PATH "Base directory for files which go to share/"
+  )
+  SET(DATA_INSTALL_PREFIX
+    "${SHARE_INSTALL_PREFIX}/${APPLICATION_SHORT_NAME}"
+    CACHE PATH "The parent directory where applications can install their data")
+
+  # The following are directories where stuff will be installed to
+  SET(BIN_INSTALL_DIR
+    "${EXEC_INSTALL_PREFIX}/bin"
+    CACHE PATH "The ${APPLICATION_SHORT_NAME} binary install dir (default prefix/bin)"
+  )
+  SET(SBIN_INSTALL_DIR
+    "${EXEC_INSTALL_PREFIX}/sbin"
+    CACHE PATH "The ${APPLICATION_SHORT_NAME} sbin install dir (default prefix/sbin)"
+  )
+  SET(LIB_INSTALL_DIR
+    "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
+    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/lib)"
+  )
+  SET(LIBEXEC_INSTALL_DIR
+    "${EXEC_INSTALL_PREFIX}/libexec"
+    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/libexec)"
+  )
+  SET(PLUGIN_INSTALL_DIR
+    "${LIB_INSTALL_DIR}/${APPLICATION_SHORT_NAME}"
+    CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is prefix/lib/${APPLICATION_SHORT_NAME})"
+  )
+  SET(INCLUDE_INSTALL_DIR
+    "${CMAKE_INSTALL_PREFIX}/include"
+    CACHE PATH "The subdirectory to the header prefix (default prefix/include)"
+  )
+
+  SET(DATA_INSTALL_DIR
+    "${DATA_INSTALL_PREFIX}"
+    CACHE PATH "The parent directory where applications can install their data (default prefix/share/${APPLICATION_SHORT_NAME})"
+  )
+  SET(HTML_INSTALL_DIR
+    "${DATA_INSTALL_PREFIX}/doc/HTML"
+    CACHE PATH "The HTML install dir for documentation (default data/doc/html)"
+  )
+  SET(ICON_INSTALL_DIR
+    "${DATA_INSTALL_PREFIX}/icons"
+    CACHE PATH "The icon install dir (default data/icons/)"
+  )
+  SET(SOUND_INSTALL_DIR
+    "${DATA_INSTALL_PREFIX}/sounds"
+    CACHE PATH "The install dir for sound files (default data/sounds)"
+  )
+
+  SET(LOCALE_INSTALL_DIR
+    "${SHARE_INSTALL_PREFIX}/locale"
+    CACHE PATH "The install dir for translations (default prefix/share/locale)"
+  )
+
+  SET(XDG_APPS_DIR
+    "${SHARE_INSTALL_PREFIX}/applications/"
+    CACHE PATH "The XDG apps dir"
+  )
+  SET(XDG_DIRECTORY_DIR
+    "${SHARE_INSTALL_PREFIX}/desktop-directories"
+    CACHE PATH "The XDG directory"
+  )
+
+  IF(NOT "${EXEC_INSTALL_PREFIX}" STREQUAL "/usr")
+    SET(SYSCONFDIR_INSTALL_PREFIX "${EXEC_INSTALL_PREFIX}")
+  endif()
+
+  SET(SYSCONF_INSTALL_DIR
+    "${SYSCONFDIR_INSTALL_PREFIX}/etc"
+    CACHE PATH "The ${APPLICATION_SHORT_NAME} sysconfig install dir (default prefix/etc)"
+  )
+  SET(MAN_INSTALL_DIR
+    "${SHARE_INSTALL_PREFIX}/man"
+    CACHE PATH "The ${APPLICATION_SHORT_NAME} man install dir (default prefix/man)"
+  )
+  SET(INFO_INSTALL_DIR
+    "${SHARE_INSTALL_PREFIX}/info"
+    CACHE PATH "The ${APPLICATION_SHORT_NAME} info install dir (default prefix/info)"
+  )
+endif (UNIX)
+
+if (WIN32)
+  # Same same
+  set(SHARE_INSTALL_PREFIX "share" CACHE PATH "-")
+  set(BIN_INSTALL_DIR "." CACHE PATH "-")
+  set(SBIN_INSTALL_DIR "." CACHE PATH "-")
+  set(LIB_INSTALL_DIR "lib" CACHE PATH "-")
+  set(INCLUDE_INSTALL_DIR "include" CACHE PATH "-")
+  set(PLUGIN_INSTALL_DIR "plugins" CACHE PATH "-")
+  set(HTML_INSTALL_DIR "doc/HTML" CACHE PATH "-")
+  set(ICON_INSTALL_DIR "." CACHE PATH "-")
+  set(SOUND_INSTALL_DIR "." CACHE PATH "-")
+  set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-")
+  set(SYSCONF_INSTALL_DIR "config" CACHE PATH "-")
+  set(MAN_INSTALL_DIR "man" CACHE PATH "-")
+endif (WIN32)

cmake/modules/FindNeon.cmake

@@ -0,0 +1,73 @@
+# - Try to find Neon
+# Once done this will define
+#
+#  NEON_FOUND - system has Neon
+#  NEON_INCLUDE_DIRS - the Neon include directory
+#  NEON_LIBRARIES - Link these to use Neon
+#  NEON_DEFINITIONS - Compiler switches required for using Neon
+#
+#  Copyright (c) 2011 Andreas Schneider <asn@cryptomilk.org>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+    pkg_check_modules(_NEON neon)
+endif (PKG_CONFIG_FOUND)
+
+include(GNUInstallDirs)
+
+find_path(NEON_INCLUDE_DIRS
+NAMES
+    neon/ne_basic.h
+HINTS
+    ${_NEON_INCLUDEDIR}
+    ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
+find_library(NEON_LIBRARIES
+NAMES
+    neon
+HINTS
+    ${_NEON_LIBDIR}
+    ${CMAKE_INSTALL_LIBDIR}
+    ${CMAKE_INSTALL_PREFIX}/lib
+    ${CMAKE_INSTALL_PREFIX}/lib64
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Neon DEFAULT_MSG NEON_LIBRARIES NEON_INCLUDE_DIRS)
+
+# show the NEON_INCLUDE_DIRS and NEON_LIBRARIES variables only in the advanced view
+mark_as_advanced(NEON_INCLUDE_DIRS NEON_LIBRARIES)
+
+# Check if neon was compiled with LFS support, if so, the NE_LFS variable has to
+# be defined in the owncloud module.
+# If neon was not compiled with LFS its also ok since the underlying system
+# than probably supports large files anyway.
+IF( CMAKE_FIND_ROOT_PATH )
+	FIND_PROGRAM( NEON_CONFIG_EXECUTABLE NAMES neon-config HINTS ${CMAKE_FIND_ROOT_PATH}/bin )
+ELSE( CMAKE_FIND_ROOT_PATH )
+	FIND_PROGRAM( NEON_CONFIG_EXECUTABLE NAMES neon-config )
+ENDIF( CMAKE_FIND_ROOT_PATH )
+
+IF ( NEON_CONFIG_EXECUTABLE )
+	MESSAGE(STATUS "neon-config executable: ${NEON_CONFIG_EXECUTABLE}")
+	# neon-config --support lfs
+	EXECUTE_PROCESS( COMMAND ${NEON_CONFIG_EXECUTABLE} "--support" "lfs"
+			    RESULT_VARIABLE LFS
+			    OUTPUT_STRIP_TRAILING_WHITESPACE )
+
+	IF (LFS EQUAL 0)
+		MESSAGE(STATUS "libneon has been compiled with LFS support")
+		SET(NEON_WITH_LFS 1 PARENT_SCOPE)
+	ELSE (LFS EQUAL 0)
+		MESSAGE(STATUS "libneon has not been compiled with LFS support, rely on OS")
+	ENDIF (LFS EQUAL 0)
+ELSE  ( NEON_CONFIG_EXECUTABLE )
+    MESSAGE(STATUS, "neon-config could not be found.")
+ENDIF ( NEON_CONFIG_EXECUTABLE )

cmake/modules/MacroLogFeature.cmake

@@ -0,0 +1,157 @@
+# This file defines the Feature Logging macros.
+#
+# MACRO_LOG_FEATURE(VAR FEATURE DESCRIPTION URL [REQUIRED [MIN_VERSION [COMMENTS]]])
+#   Logs the information so that it can be displayed at the end
+#   of the configure run
+#   VAR : TRUE or FALSE, indicating whether the feature is supported
+#   FEATURE: name of the feature, e.g. "libjpeg"
+#   DESCRIPTION: description what this feature provides
+#   URL: home page
+#   REQUIRED: TRUE or FALSE, indicating whether the featue is required
+#   MIN_VERSION: minimum version number. empty string if unneeded
+#   COMMENTS: More info you may want to provide.  empty string if unnecessary
+#
+# MACRO_DISPLAY_FEATURE_LOG()
+#   Call this to display the collected results.
+#   Exits CMake with a FATAL error message if a required feature is missing
+#
+# Example:
+#
+# INCLUDE(MacroLogFeature)
+#
+# FIND_PACKAGE(JPEG)
+# MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "Support JPEG images" "http://www.ijg.org" TRUE "3.2a" "")
+# ...
+# MACRO_DISPLAY_FEATURE_LOG()
+
+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
+# Copyright (c) 2006, Allen Winter, <winter@kde.org>
+# Copyright (c) 2009, Sebastian Trueg, <trueg@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+IF (NOT _macroLogFeatureAlreadyIncluded)
+   SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
+   IF (EXISTS ${_file})
+      FILE(REMOVE ${_file})
+   ENDIF (EXISTS ${_file})
+
+   SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
+   IF (EXISTS ${_file})
+      FILE(REMOVE ${_file})
+   ENDIF (EXISTS ${_file})
+
+   SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
+   IF (EXISTS ${_file})
+      FILE(REMOVE ${_file})
+  ENDIF (EXISTS ${_file})
+
+  SET(_macroLogFeatureAlreadyIncluded TRUE)
+
+  INCLUDE(FeatureSummary)
+
+ENDIF (NOT _macroLogFeatureAlreadyIncluded)
+
+
+MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _comments)
+
+   STRING(TOUPPER "${ARGV4}" _required)
+   SET(_minvers "${ARGV5}")
+   SET(_comments "${ARGV6}")
+
+   IF (${_var})
+     SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
+   ELSE (${_var})
+     IF ("${_required}" STREQUAL "TRUE")
+       SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
+     ELSE ("${_required}" STREQUAL "TRUE")
+       SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
+     ENDIF ("${_required}" STREQUAL "TRUE")
+   ENDIF (${_var})
+
+   SET(_logtext "   * ${_package}")
+
+   IF (NOT ${_var})
+      IF (${_minvers} MATCHES ".*")
+        SET(_logtext "${_logtext} (${_minvers} or higher)")
+      ENDIF (${_minvers} MATCHES ".*")
+      SET(_logtext "${_logtext}  <${_url}>\n     ")
+   ELSE (NOT ${_var})
+     SET(_logtext "${_logtext} - ")
+   ENDIF (NOT ${_var})
+
+   SET(_logtext "${_logtext}${_description}")
+
+   IF (NOT ${_var})
+      IF (${_comments} MATCHES ".*")
+        SET(_logtext "${_logtext}\n     ${_comments}")
+      ENDIF (${_comments} MATCHES ".*")
+#      SET(_logtext "${_logtext}\n") #double-space missing features?
+   ENDIF (NOT ${_var})
+
+   FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n")
+
+   IF(COMMAND SET_PACKAGE_INFO)  # in FeatureSummary.cmake since CMake 2.8.3
+     SET_PACKAGE_INFO("${_package}" "\"${_description}\"" "${_url}" "\"${_comments}\"")
+   ENDIF(COMMAND SET_PACKAGE_INFO)
+
+ENDMACRO(MACRO_LOG_FEATURE)
+
+
+MACRO(MACRO_DISPLAY_FEATURE_LOG)
+   IF(COMMAND FEATURE_SUMMARY) # in FeatureSummary.cmake since CMake 2.8.3
+      FEATURE_SUMMARY(FILENAME ${CMAKE_CURRENT_BINARY_DIR}/FindPackageLog.txt
+                      WHAT ALL)
+   ENDIF(COMMAND FEATURE_SUMMARY)
+
+   SET(_missingFile ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
+   SET(_enabledFile ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
+   SET(_disabledFile ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
+
+   IF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile})
+     SET(_printSummary TRUE)
+   ENDIF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile})
+
+   IF(_printSummary)
+     SET(_missingDeps 0)
+     IF (EXISTS ${_enabledFile})
+       FILE(READ ${_enabledFile} _enabled)
+       FILE(REMOVE ${_enabledFile})
+       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n-----------------------------------------------------------------------------\n${_enabled}")
+     ENDIF (EXISTS ${_enabledFile})
+
+
+     IF (EXISTS ${_disabledFile})
+       SET(_missingDeps 1)
+       FILE(READ ${_disabledFile} _disabled)
+       FILE(REMOVE ${_disabledFile})
+       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n-----------------------------------------------------------------------------\n${_disabled}")
+     ENDIF (EXISTS ${_disabledFile})
+
+
+     IF (EXISTS ${_missingFile})
+       SET(_missingDeps 1)
+       FILE(READ ${_missingFile} _requirements)
+       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- You must install these packages before continuing.\n-----------------------------------------------------------------------------\n${_requirements}")
+       FILE(REMOVE ${_missingFile})
+       SET(_haveMissingReq 1)
+     ENDIF (EXISTS ${_missingFile})
+
+
+     IF (NOT ${_missingDeps})
+       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- Congratulations! All external packages have been found.")
+     ENDIF (NOT ${_missingDeps})
+
+
+     MESSAGE(${_summary})
+     MESSAGE("-----------------------------------------------------------------------------\n")
+
+
+     IF(_haveMissingReq)
+       MESSAGE(FATAL_ERROR "Exiting: Missing Requirements")
+     ENDIF(_haveMissingReq)
+
+   ENDIF(_printSummary)
+
+ENDMACRO(MACRO_DISPLAY_FEATURE_LOG)

cmake/modules/MacroOptionalFindPackage.cmake

@@ -0,0 +1,47 @@
+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
+# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
+# This macro is a combination of OPTION() and FIND_PACKAGE(), it
+# works like FIND_PACKAGE(), but additionally it automatically creates
+# an option name WITH_<name>, which can be disabled via the cmake GUI.
+# or via -DWITH_<name>=OFF
+# The standard <name>_FOUND variables can be used in the same way
+# as when using the normal FIND_PACKAGE()
+
+# Copyright (c) 2006-2010 Alexander Neundorf, <neundorf@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+# This is just a helper macro to set a bunch of variables empty.
+# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both:
+macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var)
+   if(DEFINED ${_name}_${_var})
+      set(${_name}_${_var} "")
+   endif(DEFINED ${_name}_${_var})
+
+   string(TOUPPER ${_name} _nameUpper)
+   if(DEFINED ${_nameUpper}_${_var})
+      set(${_nameUpper}_${_var}  "")
+   endif(DEFINED ${_nameUpper}_${_var})
+endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var)
+
+
+macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
+   option(WITH_${_name} "Search for ${_name} package" ON)
+   if (WITH_${_name})
+      find_package(${_name} ${ARGN})
+   else (WITH_${_name})
+      string(TOUPPER ${_name} _nameUpper)
+      set(${_name}_FOUND FALSE)
+      set(${_nameUpper}_FOUND FALSE)
+
+      _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS)
+      _mofp_set_empty_if_defined(${_name} INCLUDE_DIR)
+      _mofp_set_empty_if_defined(${_name} INCLUDES)
+      _mofp_set_empty_if_defined(${_name} LIBRARY)
+      _mofp_set_empty_if_defined(${_name} LIBRARIES)
+      _mofp_set_empty_if_defined(${_name} LIBS)
+      _mofp_set_empty_if_defined(${_name} FLAGS)
+      _mofp_set_empty_if_defined(${_name} DEFINITIONS)
+   endif (WITH_${_name})
+endmacro (MACRO_OPTIONAL_FIND_PACKAGE)

cmake/modules/NSIS.template.in

@@ -1,6 +1,6 @@
 ;ownCloud installer script.
 
-!define APPLICATION_SHORTNAME "@APPLICATION_SHORTNAME@"
+!define APPLICATION_SHORTNAME "@APPLICATION_EXECUTABLE@"
 !define APPLICATION_NAME "@APPLICATION_NAME@"
 !define APPLICATION_VENDOR "@APPLICATION_VENDOR@"
 !define APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@.exe"
@@ -18,7 +18,6 @@
 !define OPTION_SECTION_SC_START_MENU
 !define OPTION_SECTION_SC_DESKTOP
 !define OPTION_SECTION_SC_QUICK_LAUNCH
-!define OPTION_SECTION_SC_AUTOSTART
 !define OPTION_FINISHPAGE
 !define OPTION_FINISHPAGE_LAUNCHER
 ; !define OPTION_FINISHPAGE_RELEASE_NOTES
@@ -40,7 +39,6 @@
 !define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
 
 !define CSYNC_LIBRARY_DIR "@CSYNC_LIBRARY_DIR@"
-!define CSYNC_PLUGIN_DIR "@CSYNC_PLUGIN_DIR@"
 !define CSYNC_CONFIG_DIR "@CSYNC_CONFIG_DIR@"
 
 !define NSI_PATH "${source_path}/admin/win/nsi"
@@ -267,7 +265,7 @@ FunctionEnd
 #   INSTALLER SECTIONS                                                       #
 #                                                                            #
 ##############################################################################
-Section "${APPLICATION_NAME}" SEC_OWNCLOUD
+Section "${APPLICATION_NAME}" SEC_APPLICATION
    SectionIn 1 2 3 RO
    SetDetailsPrint listonly
 
@@ -283,90 +281,24 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD
    !ifndef INSTALL_PATH
         ;Main executable.
         File "${BUILD_PATH}\bin\${APPLICATION_EXECUTABLE}"
-        File "${BUILD_PATH}\src\libowncloudsync.dll"
+        File "${BUILD_PATH}\src\lib${APPLICATION_SHORTNAME}sync.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"
+        File "${BUILD_PATH}\src\mirall_*.qm"
+        ; Make sure only to copy qt, not qt_help, etc
+        File "${MING_SHARE}\qt4\translations\qt_??.qm"
+        File "${MING_SHARE}\qt4\translations\qt_??_??.qm"
+        File "${MING_SHARE}\qt4\translations\qtkeychain_*.qm"
 
         SetOutPath "$INSTDIR\accessible"
         File "${ACCESSIBLE_DLL_PATH}\qtaccessiblewidgets4.dll"
+        SetOutPath "$INSTDIR\imageformats"
+        File "${IMAGEFORMATS_DLL_PATH}\qgif4.dll"
+        File "${IMAGEFORMATS_DLL_PATH}\qjpeg4.dll"
+        File "${IMAGEFORMATS_DLL_PATH}\qico4.dll"
 
-        SetOutPath "$INSTDIR\modules"
-        ; FIXME: fix installation dir of module, currently needs manual copying to
-        ; /usr/i686-w64-mingw32/sys-root/mingw/bin/csync_modules/
+        SetOutPath "$INSTDIR\sqldrivers"
+        File "${SQLITE_DLL_PATH}\qsqlite4.dll"
 
-        File "${CSYNC_PLUGIN_DIR}/ocsync_owncloud.dll"
         SetOutPath "$INSTDIR"
    !endif
 
@@ -374,21 +306,21 @@ 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"
    File "${QT_DLL_PATH}\QtGui4.dll"
    File "${QT_DLL_PATH}\QtNetwork4.dll"
+   File "${QT_DLL_PATH}\QtSql4.dll"
    File "${QT_DLL_PATH}\QtXml4.dll"
+   File "${QT_DLL_PATH}\QtWebKit4.dll"
 
    ;QtKeyChain stuff
    File "${MING_BIN}\libqtkeychain.dll"
 
-   File "${CSYNC_LIBRARY_DIR}/libocsync.dll"
+   File "${CSYNC_LIBRARY_DIR}\libocsync.dll"
    File "${MING_BIN}\libsqlite3-0.dll"
-   File "${MING_BIN}\libiniparser.dll"
-   File "${MING_BIN}\libdl.dll"
    File "${MING_BIN}\libpng15-15.dll"
 
    ; ownCloud plugin
@@ -404,7 +336,7 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD
 
    ; Other
    ;File "${MING_BIN}\libpng15-15.dll"
-   ;File "${MING_BIN}\libjpeg-8.dll"
+   File "${MING_BIN}\libjpeg-8.dll"
    File "${MING_BIN}\zlib1.dll"
    File "${MING_BIN}\libcrypto-10.dll"
    File "${MING_BIN}\libssl-10.dll"
@@ -417,18 +349,13 @@ SectionEnd
 SectionGroup "Shortcuts"
 
 !ifdef OPTION_SECTION_SC_START_MENU
-   ${MementoSection} "Start Menu Program Group" SEC_START_MENU
+   ${MementoSection} "Start Menu Program Shortcut" SEC_START_MENU
       SectionIn 1 2 3
       SetDetailsPrint textonly
-      DetailPrint "Adding shortcuts for the ${APPLICATION_NAME} program group to the Start Menu."
+      DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
       SetDetailsPrint listonly
       SetShellVarContext all
-      RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}"
-      CreateDirectory "$SMPROGRAMS\${APPLICATION_NAME}"
-      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}\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}"
       SetShellVarContext current
    ${MementoSectionEnd}
 !endif
@@ -455,27 +382,15 @@ SectionGroup "Shortcuts"
 
 SectionGroupEnd
 
-!ifdef OPTION_SECTION_SC_AUTOSTART
-   ${MementoSection} "Autostart" SEC_AUTOSTART
-      SectionIn 1 2
-      SetDetailsPrint textonly
-      DetailPrint "Creating Windows Start Entry"
-      SetDetailsPrint listonly
-      WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Run" \
-               "${APPLICATION_NAME}" "$INSTDIR\${APPLICATION_EXECUTABLE}" 
-  ${MementoSectionEnd}
-!endif
-
 ${MementoSectionDone}
 
 ; Installer section descriptions
 ;--------------------------------
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APPLICATION} "${APPLICATION_NAME} essentials."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "${APPLICATION_NAME} program group."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "${APPLICATION_NAME} shortcut."
 !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_FUNCTION_DESCRIPTION_END
 
 Section -post
@@ -578,15 +493,10 @@ Section Uninstall
 
    DeleteRegKey HKCR "${APPLICATION_NAME}"
 
-   ;Windows Start entry
-   !ifdef OPTION_SECTION_SC_AUTOSTART
-      DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "${APPLICATION_NAME}"
-   !endif
-
    ;Start menu shortcuts.
    !ifdef OPTION_SECTION_SC_START_MENU
       SetShellVarContext all
-      RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}"
+      Delete "$SMPROGRAMS\${APPLICATION_NAME}.lnk"
       SetShellVarContext current
    !endif
 

cmake/modules/QtVersionAbstraction.cmake

@@ -0,0 +1,131 @@
+include (MacroOptionalFindPackage)
+include (MacroLogFeature)
+
+
+option(BUILD_WITH_QT4 "Build with Qt4 no matter if Qt5 was found" ON)
+
+if( NOT BUILD_WITH_QT4 )
+    find_package(Qt5Core QUIET)
+    if( Qt5Core_DIR )
+        find_package(Qt5Widgets QUIET)
+        find_package(Qt5Quick QUIET)
+        find_package(Qt5PrintSupport QUIET)
+        find_package(Qt5WebKit QUIET)
+        find_package(Qt5Location QUIET)
+        find_package(Qt5Network QUIET)
+        find_package(Qt5Sensors QUIET)
+        find_package(Qt5Xml QUIET)
+#        find_package(Qt5WebKitWidgets QUIET)
+
+        message(STATUS "Using Qt 5!")
+
+       # We need this to find the paths to qdbusxml2cpp and co
+        if (WITH_DBUS)
+            find_package(Qt5DBus REQUIRED)
+            include_directories(${Qt5DBus_INCLUDES})
+            add_definitions(${Qt5DBus_DEFINITIONS})
+        endif (WITH_DBUS)
+
+        include_directories(${Qt5Widgets_INCLUDES})
+        add_definitions(${Qt5Widgets_DEFINITIONS})
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+#        set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+
+
+        macro(qt_wrap_ui)
+            qt5_wrap_ui(${ARGN})
+        endmacro()
+
+        macro(qt_add_resources)
+            qt5_add_resources(${ARGN})
+        endmacro()
+
+#        find_package(Qt5LinguistTools REQUIRED)
+        macro(qt_add_translation)
+#            qt5_add_translation(${ARGN})
+        endmacro()
+
+        macro(qt_add_dbus_interface)
+            qt5_add_dbus_interface(${ARGN})
+        endmacro()
+
+        macro(qt_add_dbus_adaptor)
+            qt5_add_dbus_adaptor(${ARGN})
+        endmacro()
+
+        macro(qt_wrap_cpp)
+            qt5_wrap_cpp(${ARGN})
+        endmacro()
+
+        macro(install_qt_executable)
+            install_qt5_executable(${ARGN})
+        endmacro()
+
+        macro(setup_qt)
+        endmacro()
+
+        set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
+
+        #Enable deprecated symbols
+        add_definitions("-DQT_DISABLE_DEPRECATED_BEFORE=0")
+    endif()
+endif()
+if( NOT Qt5Core_DIR )
+    message(STATUS "Could not find Qt5, searching for Qt4 instead...")
+
+    set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork" "QtGui" "QtWebkit")
+    if( BUILD_TESTS )
+        list(APPEND NEEDED_QT4_COMPONENTS "QtTest")
+    endif()
+
+    macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
+    macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n     qtwebkit-devel package and whatever contains QtUiTools is installed too")
+
+    macro(qt5_use_modules)
+    endmacro()
+
+    macro(qt_wrap_ui)
+        qt4_wrap_ui(${ARGN})
+    endmacro()
+
+    macro(qt_add_resources)
+        qt4_add_resources(${ARGN})
+    endmacro()
+
+    macro(qt_add_translation)
+        qt4_add_translation(${ARGN})
+    endmacro()
+
+    macro(qt_add_dbus_interface)
+      qt4_add_dbus_interface(${ARGN})
+    endmacro()
+
+    macro(qt_add_dbus_adaptor)
+        qt4_add_dbus_adaptor(${ARGN})
+    endmacro()
+
+    macro(qt_wrap_cpp)
+        qt4_wrap_cpp(${ARGN})
+    endmacro()
+
+    macro(install_qt_executable)
+        install_qt4_executable(${ARGN})
+    endmacro()
+
+    macro(setup_qt)
+        set(QT_USE_QTGUI TRUE)
+        set(QT_USE_QTSQL TRUE)
+        set(QT_USE_QTNETWORK TRUE)
+        set(QT_USE_QTXML TRUE)
+        set(QT_USE_QTWEBKIT TRUE)
+        set(QT_USE_QTDBUS TRUE)
+
+        include( ${QT_USE_FILE} )
+    endmacro()
+endif()
+
+if( Qt5Core_DIR )
+    set( HAVE_QT5 TRUE )
+else( Qt5Core_DIR )
+    set( HAVE_QT5 FALSE )
+endif( Qt5Core_DIR )

cmake/modules/Warnings.cmake

@@ -0,0 +1,20 @@
+if(CMAKE_COMPILER_IS_GNUCXX)
+    execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                    OUTPUT_VARIABLE GCC_VERSION)
+    if(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
+        set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wpedantic -Wno-long-long")
+    else(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
+        set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Wno-long-long")
+    endif(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
+endif(CMAKE_COMPILER_IS_GNUCXX)
+if(CMAKE_CXX_COMPILER MATCHES "clang")
+    set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Wno-long-long")
+endif(CMAKE_CXX_COMPILER MATCHES "clang")
+# TODO: handle msvc compilers warnings?
+
+if(DEFINED MIRALL_FATAL_WARNINGS)
+    if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER MATCHES "clang")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+    endif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER MATCHES "clang")
+    # TODO: handle msvc compilers warnings?
+endif(DEFINED MIRALL_FATAL_WARNINGS)

config.h.in

@@ -2,11 +2,17 @@
 #define CONFIG_H
 
 #cmakedefine USE_INOTIFY 1
-#cmakedefine WITH_CSYNC 1
 #cmakedefine WITH_QTKEYCHAIN 1
 
 #cmakedefine GIT_SHA1 "@GIT_SHA1@"
 #cmakedefine APPLICATION_DOMAIN @APPLICATION_DOMAIN@
 #cmakedefine THEME_CLASS @THEME_CLASS@
 #cmakedefine THEME_INCLUDE @THEME_INCLUDE@
+
+#cmakedefine APPLICATION_NAME "@APPLICATION_NAME@"
+#cmakedefine APPLICATION_SHORTNAME "@APPLICATION_SHORTNAME@"
+#cmakedefine APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@"
+
+#cmakedefine SYSCONFDIR "@SYSCONFDIR@"
+#cmakedefine DATADIR "@DATADIR@"
 #endif

doc/CMakeLists.txt

@@ -22,16 +22,21 @@ if(SPHINX_FOUND)
        add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
     endif(WITH_DOC)
 
+    if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ocdoc/_shared_assets")
+       add_dependencies(doc doc-html-org)
+       add_dependencies(doc doc-html-com)
+    endif()
+
     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 ${SPHINX_CACHE_DIR}/latex
 				     -D latex_logo=${LATEX_LOGO}
 				     ${CMAKE_CURRENT_SOURCE_DIR}
 				     ${SPHINX_PDF_DIR} )
-        add_custom_target(doc-pdf make -C ${SPHINX_PDF_DIR} all-pdf
+        add_custom_target(doc-pdf $(MAKE) -C ${SPHINX_PDF_DIR} all-pdf
 		                  DEPENDS doc-latex )
         add_dependencies(doc doc-pdf)
         if (WITH_DOC)
@@ -41,7 +46,7 @@ if(SPHINX_FOUND)
     if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE})
         add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE}
 		                          -q -c . -b qthelp
-				          -d ${SPHINX_CACHE_DIR}
+				          -d ${SPHINX_CACHE_DIR}/qthelp
 					  ${CMAKE_CURRENT_SOURCE_DIR}
 					  ${SPHINX_QCH_DIR} )
         add_custom_target( doc-qch ${QT_QCOLLECTIONGENERATOR_EXECUTABLE}
@@ -54,12 +59,24 @@ if(SPHINX_FOUND)
     endif()
     add_custom_target( doc-html ${SPHINX_EXECUTABLE}
 	                        -q -c . -b html
-				-d ${SPHINX_CACHE_DIR}
+				-d ${SPHINX_CACHE_DIR}/html
 				${CMAKE_CURRENT_SOURCE_DIR}
-				${SPHINX_HTML_DIR} )
+				${SPHINX_HTML_DIR}/unthemed )
+    add_custom_target( doc-html-org ${SPHINX_EXECUTABLE}
+	                        -q -c . -b html
+				-d ${SPHINX_CACHE_DIR}/html
+                                -D html_theme=owncloud_org
+				${CMAKE_CURRENT_SOURCE_DIR}
+				${SPHINX_HTML_DIR}/org )
+    add_custom_target( doc-html-com ${SPHINX_EXECUTABLE}
+	                        -q -c . -b html
+				-d ${SPHINX_CACHE_DIR}/html
+                                -D html_theme=owncloud_com
+				${CMAKE_CURRENT_SOURCE_DIR}
+				${SPHINX_HTML_DIR}/com )
     add_custom_target( doc-man  ${SPHINX_EXECUTABLE}
 	                        -q -c . -b man
-				-d ${SPHINX_CACHE_DIR}
+				-d ${SPHINX_CACHE_DIR}/man
 				${CMAKE_CURRENT_SOURCE_DIR}
 				${SPHINX_MAN_DIR} )
 
@@ -71,7 +88,7 @@ if(SPHINX_FOUND)
     add_custom_target( doc-chm-sphinx  ${SPHINX_EXECUTABLE}
 	                               -q -c . -b htmlhelp
 	                               -D html_theme=basic
-                                       -d ${SPHINX_CACHE_DIR}
+                                       -d ${SPHINX_CACHE_DIR}/htmlhelp
                                        ${CMAKE_CURRENT_SOURCE_DIR}
                                        ${SPHINX_HTMLHELP_DIR} )
     add_custom_target( doc-chm pushd ${SPHINX_HTMLHELP_DIR}; ${MSHTML_COMPILER} *.hhp; popd

doc/Makefile

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

doc/accountsetup.rst

@@ -0,0 +1,37 @@
+Setting up an Account
+=====================
+
+If no account has been configured, ownCloud Client will automatically assist
+you in connecting to your ownCloud Server after the application has been
+started.
+
+As a first step, specify the URL to your Server, just
+like you would when you open your ownCloud instance inside a browser.
+
+.. image:: images/wizard_url.png
+   :scale: 50 %
+
+.. note:: Make sure to use ``https://`` if the server supports it. Otherwise,
+   your password and all data will be transferred to the server unencrypted.
+   This makes it easy for third parties to intercept your communication, and
+   getting hold of your password!
+
+Next, you are prompted for your username and password. Again, use the same
+credentials that you would use to log on via the web interface.
+
+.. image:: images/wizard_user.png
+   :scale: 50 %
+
+Finally, choose the folder that ownCloud Client is supposed to sync the
+contents of your ownCloud account with. By default, this is a folder
+called `ownCloud`, which will reside in your home directory.
+
+.. image:: images/wizard_targetfolder.png
+   :scale: 50 %
+
+After pressing `Connect`, ownCloud Client will commence with the syncing
+process. The next screen will give you the opportunity to review your
+settings:
+
+.. image:: images/wizard_overview.png
+   :scale: 50 %

doc/advancedusage.rst

@@ -0,0 +1,14 @@
+Advanced Usage
+==============
+
+.. index:: Advanced Usage
+
+Options
+-------
+.. index:: command line switches, command line, options, parameters
+.. include:: options.rst
+
+Config File
+-----------
+.. index:: config file
+.. include:: conffile.rst

doc/architecture.rst

@@ -1,5 +1,6 @@
-Architecture
-============
+Appendix B: Architecture
+========================
+
 .. index:: architecture 
 
 The ownCloud project provides desktop sync clients to synchronize the
@@ -11,11 +12,10 @@ csync was written to synchronize with ownCloud’s built-in WebDAV server.
 
 The ownCloud sync client is based on a tool called mirall initially written by
 Duncan Mac Vicar. Later Klaas Freitag joined the project and enhanced it to work
-with ownCloud server. Both mirall and ownCloud Client (oCC) build from the same
-source, currently hosted in the ownCloud source repo on gitorious.
+with ownCloud server.
 
-oCC is written in C++ using the `Qt Framework`_. As a result oCC runs on the
-three important platforms Linux, Windows and MacOS.
+ownCloud Client is written in C++ using the `Qt Framework`_. As a result, the
+ownCloud Client runs on the three important platforms Linux, Windows and MacOS.
 
 .. _csync: http://www.csync.org
 .. _`Qt Framework`: http://www.qt-project.org
@@ -23,8 +23,8 @@ three important platforms Linux, Windows and MacOS.
 The Sync Process
 ----------------
 
-First it is important to recall what syncing is. Syncing tries to keep the files
-on both repositories the same. That means if a file is added to one repository
+First it is important to recall what syncing is: It tries to keep the files
+on two repositories the same. That means if a file is added to one repository
 it is going to be copied to the other repository. If a file is changed on one
 repository, the change is propagated to the other repository. Also, if a file
 is deleted on one side, it is deleted on the other. As a matter of fact, in
@@ -34,8 +34,13 @@ server is always master.
 This is the major difference to other systems like a file backup where just
 changes and new files are propagated but files never get deleted.
 
-Sync Direction and Strategies
------------------------------
+The ownCloud Client checks both repositories for changes frequently after a
+certain time span. That is refered to as a sync run. In between the local
+repository is monitored by a file system monitor system that starts a sync run
+immediately if something was edited, added or removed.
+
+Sync by Time versus ETag
+------------------------
 .. index:: time stamps, file times, etag, unique id 
 
 Until the release of ownCloud 4.5 and ownCloud Client 1.1, ownCloud employed
@@ -44,7 +49,7 @@ synced to the other repository: the files modification time.
 
 The *modification timestamp* is part of the files metadata. It is available on
 every relevant filesystem and is the natural indicator for a file change.
-modification timestamps do not require special action to create and have
+Modification timestamps do not require special action to create and have
 a general meaning. One design goal of csync is to not require a special server
 component, that’s why it was chosen as the backend component.
 
@@ -57,29 +62,24 @@ machines.
 Since this strategy is rather fragile without NTP, ownCloud 4.5 introduced a
 unique number, which changes whenever the file changes. Although it is a unique
 value, it is not a hash of the file, but a randomly chosen number, which it will
-transmit in the Etag_ field. The client will store this number in a
-per-directory database, located in the application directory (version 1.1) or
-as a hidden file right in the directory to be synced (later versions).
-Since the file number is guaranteed to change if the file changes, it can now be
-used to determine if one of the files has changed.
+transmit in the Etag_ field. Since the file number is guaranteed to change if
+the file changes, it can now be used to determine if one of the files has
+changed.
 
-.. todo:: describe what happens if both sides change
+.. note:: ownCloud Client 1.1 and newer require file ID capabilities on the
+   ownCloud server, hence using them with a server earlier than 4.5.0 is
+   not supported.
+
+Before the 1.3.0 release of the client the sync process might create faux
+conflict files if time deviates. The original and the conflict files only
+differed in the timestamp, but not in content. This behaviour was changed
+towards a binary check if the files are different.
 
-If the per-directory database gets removed, oCC's CSync backend will fall back
-to a time-stamp based sync process to rebuild the database. Thus it should be
-made sure that both server and client synchronized to NTP time before
-restarting the client after a database removal. If time deviates, the sync
-process might create faux conflict files, which only differ in their time.
-Those need to be cleaned up manually later on and will not be synced back
-to the server. However, no files will get deleted in this process.
-  
 Just like files, directories also hold a unique id, which changes whenever
 one of the contained files or directories gets modified. Since this is a
 recursive process, it significantly reduces the effort required for a sync
 cycle, because the client will only walk directories with a modified unique id.
 
-.. note:: oCC 1.1 and newer require file ID capabilities on the ownCloud server,
-  hence using them with a server earlier than 4.5.0 is not supported.
 
 This table outlines the different sync methods attempted depending
 on server/client combination:
@@ -106,3 +106,56 @@ are involved and one of them is not in sync with NTP time.
 .. _`NTP time synchronisation`: http://en.wikipedia.org/wiki/Network_Time_Protocol
 .. _Etag: http://en.wikipedia.org/wiki/HTTP_ETag
 
+Comparison and Conflict Cases
+-----------------------------
+
+In a sync run the client first has to detect if one of the two repositories have
+changed files. On the local repository, the client traverses the file
+tree and compares the modification time of each file with the value it was 
+before. The previous value is stored in the client's database. If it is not, it
+means that the file has been added to the local repository. Note that on 
+the local side, the modificaton time a good attribute to detect changes because
+it does not depend on time shifts and such.
+
+For the remote (ie. ownCloud) repository, the client compares the ETag of each
+file with it's previous value. Again the previous value is queried from the
+database. If the ETag is still the same, the file has not changed.
+
+In case a file has changed on both, the local and the remote repository since
+the last sync run, it can not easily be decided which version of the file is
+ the one that should be used. However, changes to any side must not be lost.
+
+That is called a **conflict case**. The client solves it by creating a conflict
+file of the older of the two files and save the newer one under the original
+file name. Conflict files are always created on the client and never on the
+server. The conflict file has the same name as the original file appended with
+the timestamp of the conflict detection.
+
+
+.. _ignored-files-label:
+
+Ignored Files
+-------------
+
+ownCloud Client will refuse to sync the following files:
+
+* Files matched by one of the pattern in :ref:`ignoredFilesEditor-label`
+* Files containing characters that do not work on certain file systems.
+  Currently, these characters are: `\, :, ?, *, ", >, <, |`
+* Files starting in ``.csync_journal.db`` (reserved for journalling)
+
+The Sync Journal
+----------------
+
+The client stores the ETag number in a per-directory database,
+called the journal.  It is a hidden file right in the directory
+to be synced.
+
+If the journal database gets removed, ownCloud Client's CSync backend will
+rebuild the database by comparing the files and their modification times. Thus
+it should be made sure that both server and client synchronized with NTP time
+before restarting the client after a database removal.
+
+Pressing ``F5`` in the Account Settings Dialog that allows to "reset" the
+journal. That can be used to recreate the journal database. Use this only
+if advised to do so by the developer or support staff.

doc/building.rst

@@ -1,10 +1,17 @@
-Building the Client
-===================
+.. _building-label:
+
+Appendix A: Building the Client
+===============================
 
 This section explains how to build the ownCloud Client from source
 for all major platforms. You should read this section if you want
 to development on the desktop client.
 
+Note that the building instruction are subject to change as development 
+proceeds. It is important to check the version which is to built.
+
+This instructions were updated to work with ownCloud Client 1.5.
+
 Linux
 -----
 
@@ -20,20 +27,25 @@ Linux
 Mac OS X
 --------
 
-Follow the `generic build instructions`_.
+Next to XCode (and the command line tools!), you will need some
+extra dependencies.
 
-You can install the missing dependencies via MacPorts_ or Homebrew_.
+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 csync, follow the `generic build instructions`_.
 
 .. note::
   You should not call ``make install`` at any time, since the product of the
@@ -45,24 +57,29 @@ Windows (cross-compile)
 
 Due to the amount of dependencies that csync entails, building the client
 for Windows is **currently only supported on openSUSE**, by using the MinGW
-cross compiler. You can set up openSUSE 12.1 or 12.2 in a virtual machine
+cross compiler. You can set up openSUSE 12.1, 12.2 or 13.1 in a virtual machine
 if you do not have it installed already.
 
 In order to cross-compile, the following repositories need to be added
-via YaST or ``zypper ar`` (adjust when using openSUSE 12.2)::
+via YaST or ``zypper ar`` (adjust when using openSUSE 12.2 or 13.1)::
 
-  http://download.opensuse.org/repositories/isv:/ownCloud:/devel:/mingw:/win32/openSUSE_12.1/
-  http://download.opensuse.org/repositories/windows:/mingw/openSUSE_12.1/
-  http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_12.1/
+  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-libneon \
+  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-libqt4-sql \
+                 mingw32-libqt4-sql-sqlite mingw32-libsqlite-devel \
+                 mingw32-dlfcn-devel mingw32-libssh2-devel kdewin-png2ico \
+                 mingw32-libqt4 mingw32-libqt4-devel mingw32-libgcrypt \
+                 mingw32-libgnutls mingw32-libneon-openssl mingw32-libneon-devel \
                  mingw32-libbeecrypt mingw32-libopenssl mingw32-openssl \
                  mingw32-libpng-devel mingw32-libsqlite mingw32-qtkeychain \
-                 mingw32-qtkeychain-devel mingw32-iniparser mingw32-dlfcn
+                 mingw32-qtkeychain-devel 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 package is also required::
 
@@ -74,20 +91,20 @@ For the installer, the NSIS installer package is also required::
     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 -ivh <package>`` (They will also work with openSUSE 12.2 and newer)::
 
-http://pmbs.links2linux.org/download/mingw:/32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-processes-0-1.1.x86_64.rpm
-http://pmbs.links2linux.org/download/mingw:/32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-uac-0-3.1.x86_64.rpm
+  rpm -ihv http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-processes-0-1.1.x86_64.rpm
+  rpm -ihv http://download.tomahawk-player.org/packman/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``
 
@@ -107,7 +124,7 @@ CMake and Mirall can be downloaded at ownCloud's `Client Download Page`_.
 If you want to build the leading edge version of the client, you should
 use the latest versions of Mirall and CSync via Git_, like so::
 
-  git clone git://git.csync.org/users/freitag/csync.git ocsync
+  git clone git://git.csync.org/users/owncloud/csync.git ocsync
   git clone git://github.com/owncloud/mirall.git
 
 Next, create build directories::
@@ -116,11 +133,11 @@ Next, create build directories::
   mkdir mirall-build
 
 This guide assumes that all directories are residing next to each other.
-Next, make sure to check out the 'dav' branch in the newly checked out
+Next, make sure to check out the branch called 'ocsync' in the newly checked out
 `ocsync` directory::
 
   cd ocsync
-  git checkout dav
+  git checkout ocsync
 
 The first package to build is CSync::
 
@@ -129,9 +146,10 @@ The first package to build is CSync::
   make
 
 You probably have to satisfy some dependencies. Make sure to install all the
-needed development packages. You will need ``iniparser``, ``sqlite3`` as well as
-``neon`` for the ownCloud module. Take special care about ``neon``. If that is
-missing, the cmake run will succeed but silently not build the ownCloud module.
+needed development packages. You will need ``sqlite3`` as well as ``neon`` for 
+the ownCloud module. Take special care about ``neon``. If that is missing, the 
+cmake run will succeed but silently not build the ownCloud module.
+
 ``libssh`` and ``libsmbclient`` are optional and not required for the client
 to work. If you want to install the client, run ``make install`` as a final step.
 
@@ -147,7 +165,7 @@ 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
 
@@ -161,4 +179,3 @@ Known cmake parameters:
 .. _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

@@ -28,7 +28,7 @@ import sys, os
 extensions = ['sphinx.ext.todo']
 
 # Add any paths that contain templates here, relative to this directory.
-#templates_path = ['templates']
+templates_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -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
@@ -64,7 +64,7 @@ release = '@VERSION@'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = ['_build','scripts/*']
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
@@ -95,7 +95,7 @@ pygments_style = 'sphinx'
 #html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = ['themes']
+html_theme_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/themes']
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
@@ -120,7 +120,7 @@ html_short_title = "Client Manual"
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['static']
+html_static_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -215,8 +215,6 @@ latex_documents = [
 man_pages = [
     ('owncloud.1', 'owncloud', u'File synchronisation desktop utility.',
      [u'The ownCloud developers'], 1),
-    ('mirall.1', 'mirall', u'File synchronisation desktop utility.',
-     [u'The ownCloud developers'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -250,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

@@ -16,8 +16,6 @@ It contains settings in the ini file format known from Windows.
 
 .. note:: Changes may be overwritten by using ownCloud's configuration dialog.
 
-.. note:: The new version is less precise in this regard.
-
 These are config settings that may be changed:
 
 ``remotePollinterval`` (default: ``30000``)
@@ -26,6 +24,3 @@ These are config settings that may be changed:
 ``maxLogLines`` (default:  ``20000``)
         Maximum count of log lines shown in the log window
 
-``remotePollinterval``
-        The frequency used for polling for remote changes on the ownCloud Server.
-

doc/glossary.rst

@@ -4,8 +4,8 @@ Glossary
 .. glossary::
    :sorted:
 
+   ownCloud Sync Client
    ownCloud Client
-   oCC
      Name of the official ownCloud syncing client for desktop, which runs on
      Windows, Mac OS X and Linux. It is based Mirall, and uses the CSync
      sync engine for synchronization with the ownCloud server.
@@ -23,6 +23,7 @@ Glossary
      exist in the client directory.
 
    unique id
+   ETag
      ID assigned to every file starting with ownCloud server 4.5 and submitted
      via the HTTP ``Etag``. Used to check if files on client and server have
      changed.

doc/index.rst

@@ -6,8 +6,11 @@ Contents
 .. toctree::
    :maxdepth: 2
 
-   install
-   usage 
+   introduction
+   accountsetup
+   visualtour
+   advancedusage
+
    building 
    architecture
    troubleshooting

doc/install.rst

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

doc/introduction.rst

@@ -0,0 +1,37 @@
+Introduction
+============
+
+This is the documentation for the ownCloud Sync Client, also referred to as
+the ownCloud Client.
+
+The ownCloud Sync Client is a desktop program you install on your computer.
+Specify one ore more directories on the local machine to sync your ownCloud
+server, and always have your latest files wherever you are. Make a change to the
+files on one computer, it will flow across the others using these desktop sync
+clients.
+
+ownCloud Client is available for Windows, Mac OS X and various Linux
+distributions. See below for details on how to obtain the Client.
+
+Obtaining the Client
+--------------------
+
+The latest version of the ownCloud Client can be obtained at
+http://owncloud.org/sync-clients/.
+
+ownCloud client for **Windows** is provided as a NSIS-based setup file for
+machine-wide install. Installing the ownCloud client on **Mac OS** follows
+the normal app bundle installation pattern:
+
+1. Download the installation file: Click ``ownCloud-x.y.z.dmg``, a window with
+   the ownCloud icon opens.
+2. In that window, drag the ownCloud application into the ``Applications``
+   folder.
+3. On the right hand side From ``Applications``, choose ``ownCloud``.
+
+The ownCloud Client is also provided as in a convenient repository for a wide
+range of popular **Linux distributions**. If you want to build the sources
+instead.
+
+Supported distributions are Fedora, openSUSE, Ubuntu and Debian.
+To support other distributions, a is required, see :ref:`building-label`

doc/mirall.1.rst

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

doc/options.rst

@@ -1,15 +1,20 @@
 ownCloud Client supports the following command line switches:
 
 ``--logwindow``
-        open a window to show log output at startup.
+        open a window to show log output.
 
 ``--logfile`` `<filename>`
-        write log output to file.
+        write log output to file <filename>.
 
-``--flushlog``
+``--logdir`` `<name>`
+        write each sync log output in a new file in directory <name>
+
+``--logexpire`` `<hours>`
+        removes logs older than <hours> hours. (to be used with --logdir)
+
+``--logflush``
         flush the log file after every write.
 
-``--monoicons``
-        Use black/white pictograms for systray.
-
+``--confdir`` `<dirname>`
+        Use the given configuration directory.
 

doc/owncloud.1.rst

@@ -9,7 +9,7 @@ SYNOPSIS
 
 DESCRIPTION
 ===========
-owncloud is a file synchronisation desktop utility it is based on mirall.
+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.
@@ -33,5 +33,5 @@ Please report bugs at https://github.com/owncloud/core/issues.
 
 SEE ALSO
 ========
- `csync(1)`, `mirall(1)`
+ `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,42 +1,136 @@
-Troubleshooting
-===============
+Appendix C: 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.
-
   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. I can be used to further verify that the WebDAV server is running
-  properly, for example by performing PROPFIND calls:
+  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:
 
   ``propget .`` called within cadaver will return some properties of the current
   directory and thus be a successful WebDAV connect.
 
-:The desktop client fails for an unknown reason:
-  Start the client with ``--logwindow``. You can also open a log window for an
-  already running session, by simply starting the client again with this
-  parameter. Syntax:
+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 some files do not get take a look at the sync protocol. Some files are
+automatically automatically being ignored because they are system files,
+others get ignored because their file name contains characters that cannot
+be represented on certain file systems. See :ref:`_ignored-files-label` for
+details.
+
+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. To limit the amount of data that accumulates over time, there is another
+useful parameter: ``--logexpire <hours>```. If that is combined with ```--logdir```
+the client automatically erases log data in that directory that is older than the
+given expiry period.
+
+For example, for a long running test where you intend to keep the log data of the
+last two days, this would be the command line:
+
+```
+owncloud --logdir /tmp/owncloud_logs --logexpire 48
+```
+
+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``.
 
-  Also, please take a look at your webservers error log file to check if there
-  are problems. For apache on linux, the error logs usually can be found at
-  ``/var/log/apache2``. A file called ``error_log`` shows errors like PHP code
-  problems. A file called ``access_log`` usually records all requests handled
-  by the server. More information about the apache logging can be found at
-  ``http://httpd.apache.org/docs/current/logs.html``.

doc/usage.rst

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

doc/visualtour.rst

@@ -0,0 +1,189 @@
+Visual Tour
+===========
+
+.. index:: visual tour, usage
+
+ownCloud Client stays in the background, and is visible as an
+icon in your system tray (Windows, KDE), status bar (Mac OS X)
+or notification area (Ubuntu), like so:
+
+.. image:: images/icon.png
+
+If a setup is still required, it will open the setup. Otherwise, the
+main menu is opened, which provides several options and displays
+progress information:
+
+.. image:: images/menu.png
+
+Here is an explanation of the individual items in the menu:
+
+* ``Open ownCloud in browser``: Opens the ownCloud web interface
+* ``Open folder 'ownCloud'``: Opens the local folder. If you have
+  defined multiple sync targets, you should see multiple entries
+  here.
+* **Disk space indicator**: Shows how much space is used up on the server.
+* Operation indicator: Shows the status of the current sync process, or
+  ``Up to date`` if server and client are in sync.
+* **Recent Changes**: shows the last six files modified by sync operations,
+  and provides access to the Sync status, which lists all changes
+  since the last restart of ownCloud Client.
+* ``Settings...``: provides access to the settings menu.
+* ``Help``: Opens a browser to display this help.
+* ``Quit ownCloud``: Quits ownCloud, ending a currently running sync run.
+
+The settings dialog is split up in three categories: ``Account Settings``,
+``General Settings`` and ``Network Settings``:
+
+Account Settings
+~~~~~~~~~~~~~~~~
+
+.. index:: account settings, user, password, Server URL
+
+The ``Account Settings`` tab provides an executive summary about the synced
+folders in your account and allows to modify them. It also provides a more
+detailed report about the storage usage. Finally, it allows to change
+the files that ownCloud Client should ignore (for details, see the
+``Ignored Files Editor`` section below), and to modify various aspects
+of the current account settings, such as user name, password and server URL.
+
+.. image:: images/settings_account.png
+   :scale: 50 %
+
+General Settings
+~~~~~~~~~~~~~~~~
+
+.. index:: general settings, auto start, startup, desktop notifications
+
+The tab provides several useful options:
+
+.. image:: images/settings_general.png
+   :scale: 50 %
+
+* **Launch on System Startup**: This option is automatically activated
+  once a user has conimaged his account. Unchecking the box will cause
+  ownCloud client to not launch on startup for a particular user.
+* **Show Desktop Nofications**: Do not show bubble notifications whenever
+  a set of sync operations has been performed.
+* **Use Monochrome Icons**: Use less obstrusive icons. Especially useful
+  on Mac OS.
+
+The acout menu provides information about authors as well as detailed
+information about the build conditions. Those are particularly valuable
+when filing a bug report.
+
+Network Settings
+~~~~~~~~~~~~~~~~
+
+.. index:: proxy settings, SOCKS, bandwith, throttling, limiting
+
+This tab consollidates ``Proxy Settings`` and ``Bandwith Limiting``:
+
+.. image:: images/settings_network.png
+   :scale: 50 %
+
+Proxy Settings
+^^^^^^^^^^^^^^
+
+* ``No Proxy``: Check this if ownCloud Client should circumvent the default
+  proxy conimaged on the system.
+* ``Use system proxy``: Default, will follow the systems proxy settings.
+  On Linux, this will only pick up the value of the variable ``http_proxy``.
+* ``Specify proxy manually as``: Allows to specify custom proxy settings.
+  If you require to go through a HTTP(S) proxy server such as Squid or Microsoft
+  Forefront TMG, pick ``HTTP(S)``. ``SOCKSv5`` on the other hand is particulary
+  useful in special company LAN setups, or in combination with the OpenSSH
+  dynamic application level forwarding feature (see ``ssh -D``).
+* ``Host``: Enter the host name or IP address of your proxy server, followed
+  by the port number. HTTP proxies usually listen on Ports 8080 (default) or
+  3128. SOCKS server usually listen on port 1080.
+* ``Proxy Server requires authentication``: Should be checked if the proxy
+  server does not allow anonymous usage. If you check this option, you must
+  provide username and password in the fields below, or ownless Cloud will no
+  longer be able to connect successfully.
+
+Bandwidth Limiting
+^^^^^^^^^^^^^^^^^^
+
+The ``Download Bandwidth`` (i.e. the bandwidth available for data flowing
+from the ownCloud Server to the client) can be either ``Unlimited``
+(the default), or limited to a custom value, specified in bytes
+
+The ``Upload Bandwith`` (i.e. the bandwith available for data flowing
+from the ownCloud Client to the server) additionally has the option
+to ``Limit automatically``: When this option is checked, the ownCloud
+Client will surrender available upstream bandwith to other applications.
+Use this option if you expirience problems with real time communication,
+such as Skype or other VoIP software, in conjunction with ownCloud Client.
+This is commonly the case with asymmetric internet connection, such as
+certain DSL lines with very limited upstream capacity.
+
+ownCloud Client will pick up changes immediately, but ongoing operations
+will finish using the old settings.
+
+The Sync Status Display
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. index:: sync status
+
+The ``Sync Status`` window, which can be invoked from either from the main
+menu (``Recent Changes`` -> ``Details...``) or the ``Account Settings``
+(``Info`` button), will provide you with an in-depth summary of the recent
+sync activity. It will also show files that have not been synched (ignored
+files). Those are ignored either because they are listed in the ignored
+files list (see ``Ignored Files Editor`` section below), or because they
+cannot be synced in a cross-platform manner because they contain special
+characters that cannot be stored on certain file systems.
+
+.. image:: images/sync_protocol.png
+   :scale: 50 %
+
+.. _ignoredFilesEditor-label:
+
+The Ignored Files Editor
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. index:: ignored files, exclude files, pattern
+
+The ignored files editor allows adding patterns for files or directories
+that should be excluded from the sync process. Next to normal characters,
+wildcards can be used to match an arbitrary number of characters, designated
+by an asterisk (``*``) or a single character, designated by a question mark
+(``?``).
+
+Global defaults cannot be directly modified within the editor. Hovering
+with the mouse will reveal the location of the global exclude definition
+file.
+
+In addition to this list, ownCloud Client always excludes files with
+characters that cannot be synched down to other file systems,
+see :ref:`ignored-files-label`.
+
+.. note:: Modifying the global exclude definition file might render the
+   client unusable or cause undesired behavior.
+
+.. note:: Custom entries are currently not validated for syntactical
+   correctness by the editor, but might fail to load correctly.
+
+.. image:: images/ignored_files_editor.png
+   :scale: 50%
+
+Pattern Matching
+^^^^^^^^^^^^^^^^
+
+To match file names against the exclude patterns, the unix standard C
+library function fnmatch is used. It checks the filename against the pattern
+using standard shell wildcard pattern matching. Check `The opengroup website
+<http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_13_01>`
+for the gory details.
+
+The path that is checked is the relative path unter the sync root directory.
+
+Examples:
+^^^^^^^^^
++-----------+------------------------------+
+| Pattern   | Matches                      |
++===========+==============================+
+| ``~$*``   | ``~$foo``, ``~$example.doc`` |
++-----------+------------------------------+
+| ``fl?p``  | ``flip``, ``flap``           |
++-----------+------------------------------+

issue_template.md

@@ -20,6 +20,8 @@ PHP version:
 
 ownCloud version:
 
+Storage backend:
+
 ### Client configuration
 Client version:
 
@@ -31,18 +33,14 @@ Installation path of client:
 
 ### Logs
 
-#### output of `owncloud --logwindow` or `owncloud --logfile log.txt`
-```
-Insert your log output here
-```
+Please use Gist (https://gist.github.com/) or a similar code paster for longer
+logs.
 
-#### Web server error log
-```
-Insert your webserver log here
-```
+```Template for output < 10 lines```
 
-#### ownCloud log (data/owncloud.log)
-```
-Insert your ownCloud log here
-```
+1. Output of `owncloud --logwindow` or `owncloud --logfile log.txt`
+
+2. Web server error log:
+
+3. ownCloud log (data/owncloud.log):
 

mirall.desktop.in

@@ -4,4 +4,5 @@ Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
 GenericName=Folder Sync
-Icon=@APPLICATION_SHORTNAME@
+Icon=@APPLICATION_EXECUTABLE@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;

mirall.qrc

@@ -7,10 +7,12 @@
         <file>resources/folder-remote.png</file>
         <file>resources/folder-sync.png</file>
         <file>resources/folder-grey.png</file>
-        <file>resources/mirall-32.png</file>
-        <file>resources/mirall-128.png</file>
-        <file>resources/mirall-48.png</file>
         <file>resources/task-ongoing.png</file>
         <file>resources/view-refresh.png</file>
+        <file>resources/warning-16.png</file>
+        <file>resources/settings.png</file>
+        <file>resources/activity.png</file>
+        <file>resources/network.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/csync/c_jhash.h

@@ -0,0 +1,245 @@
+/*
+ * c_jhash.c Jenkins Hash
+ *
+ * Copyright (c) 1997 Bob Jenkins <bob_jenkins@burtleburtle.net>
+ *
+ * lookup8.c, by Bob Jenkins, January 4 1997, Public Domain.
+ * hash(), hash2(), hash3, and _c_mix() are externally useful functions.
+ * Routines to test the hash are included if SELF_TEST is defined.
+ * You can use this free for any purpose.  It has no warranty.
+ *
+ * See http://burtleburtle.net/bob/hash/evahash.html
+ */
+
+/**
+ * @file c_jhash.h
+ *
+ * @brief Interface of the cynapses jhash implementation
+ *
+ * @defgroup cynJHashInternals cynapses libc jhash function
+ * @ingroup cynLibraryAPI
+ *
+ * @{
+ */
+#ifndef _C_JHASH_H
+#define _C_JHASH_H
+
+#include <stdint.h>
+
+#define c_hashsize(n) ((uint8_t) 1 << (n))
+#define c_hashmask(n) (xhashsize(n) - 1)
+
+/**
+ * _c_mix -- Mix 3 32-bit values reversibly.
+ *
+ * For every delta with one or two bit set, and the deltas of all three
+ * high bits or all three low bits, whether the original value of a,b,c
+ * is almost all zero or is uniformly distributed,
+ * If _c_mix() is run forward or backward, at least 32 bits in a,b,c
+ * have at least 1/4 probability of changing.
+ * If _c_mix() is run forward, every bit of c will change between 1/3 and
+ * 2/3 of the time.  (Well, 22/100 and 78/100 for some 2-bit deltas.)
+ * _c_mix() was built out of 36 single-cycle latency instructions in a 
+ * structure that could supported 2x parallelism, like so:
+ *     a -= b;
+ *     a -= c; x = (c>>13);
+ *     b -= c; a ^= x;
+ *     b -= a; x = (a<<8);
+ *     c -= a; b ^= x;
+ *     c -= b; x = (b>>13);
+ *     ...
+ *
+ * Unfortunately, superscalar Pentiums and Sparcs can't take advantage
+ * of that parallelism.  They've also turned some of those single-cycle
+ * latency instructions into multi-cycle latency instructions.  Still,
+ * this is the fastest good hash I could find.  There were about 2^^68
+ * to choose from.  I only looked at a billion or so.
+ */
+#define _c_mix(a,b,c) \
+{ \
+  a -= b; a -= c; a ^= (c>>13); \
+  b -= c; b -= a; b ^= (a<<8); \
+  c -= a; c -= b; c ^= (b>>13); \
+  a -= b; a -= c; a ^= (c>>12);  \
+  b -= c; b -= a; b ^= (a<<16); \
+  c -= a; c -= b; c ^= (b>>5); \
+  a -= b; a -= c; a ^= (c>>3);  \
+  b -= c; b -= a; b ^= (a<<10); \
+  c -= a; c -= b; c ^= (b>>15); \
+}
+
+/**
+ * _c_mix64 -- Mix 3 64-bit values reversibly.
+ *
+ * _c_mix64() takes 48 machine instructions, but only 24 cycles on a superscalar
+ * machine (like Intel's new MMX architecture).  It requires 4 64-bit
+ * registers for 4::2 parallelism.
+ * All 1-bit deltas, all 2-bit deltas, all deltas composed of top bits of
+ * (a,b,c), and all deltas of bottom bits were tested.  All deltas were
+ * tested both on random keys and on keys that were nearly all zero.
+ * These deltas all cause every bit of c to change between 1/3 and 2/3
+ * of the time (well, only 113/400 to 287/400 of the time for some
+ * 2-bit delta).  These deltas all cause at least 80 bits to change
+ * among (a,b,c) when the _c_mix is run either forward or backward (yes it
+ * is reversible).
+ * This implies that a hash using _c_mix64 has no funnels.  There may be
+ * characteristics with 3-bit deltas or bigger, I didn't test for
+ * those.
+ */
+#define _c_mix64(a,b,c) \
+{ \
+  a -= b; a -= c; a ^= (c>>43); \
+  b -= c; b -= a; b ^= (a<<9); \
+  c -= a; c -= b; c ^= (b>>8); \
+  a -= b; a -= c; a ^= (c>>38); \
+  b -= c; b -= a; b ^= (a<<23); \
+  c -= a; c -= b; c ^= (b>>5); \
+  a -= b; a -= c; a ^= (c>>35); \
+  b -= c; b -= a; b ^= (a<<49); \
+  c -= a; c -= b; c ^= (b>>11); \
+  a -= b; a -= c; a ^= (c>>12); \
+  b -= c; b -= a; b ^= (a<<18); \
+  c -= a; c -= b; c ^= (b>>22); \
+}
+
+/**
+ * @brief hash a variable-length key into a 32-bit value
+ *
+ * The best hash table sizes are powers of 2.  There is no need to do
+ * mod a prime (mod is sooo slow!).  If you need less than 32 bits,
+ * use a bitmask.  For example, if you need only 10 bits, do
+ *   h = (h & hashmask(10));
+ * In which case, the hash table should have hashsize(10) elements.
+ *
+ * Use for hash table lookup, or anything where one collision in 2^32 is
+ * acceptable.  Do NOT use for cryptographic purposes.
+ *
+ * @param k        The key (the unaligned variable-length array of bytes).
+ *
+ * @param length   The length of the key, counting by bytes.
+ *
+ * @param initval  Initial value, can be any 4-byte value.
+ *
+ * @return    Returns a 32-bit value.  Every bit of the key affects every bit
+ *            of the return value.  Every 1-bit and 2-bit delta achieves
+ *            avalanche. About 36+6len instructions.
+ */
+static inline uint32_t c_jhash(const uint8_t *k, uint32_t length, uint32_t initval) {
+   uint32_t a,b,c,len;
+
+   /* Set up the internal state */
+   len = length;
+   a = b = 0x9e3779b9; /* the golden ratio; an arbitrary value */
+   c = initval; /* the previous hash value */
+
+   while (len >= 12) {
+      a += (k[0] +((uint32_t)k[1]<<8) +((uint32_t)k[2]<<16) +((uint32_t)k[3]<<24));
+      b += (k[4] +((uint32_t)k[5]<<8) +((uint32_t)k[6]<<16) +((uint32_t)k[7]<<24));
+      c += (k[8] +((uint32_t)k[9]<<8) +((uint32_t)k[10]<<16)+((uint32_t)k[11]<<24));
+      _c_mix(a,b,c);
+      k += 12; len -= 12;
+   }
+
+   /* handle the last 11 bytes */
+   c += length;
+   /* all the case statements fall through */
+   switch(len) {
+     case 11: c+=((uint32_t)k[10]<<24);
+     case 10: c+=((uint32_t)k[9]<<16);
+     case 9 : c+=((uint32_t)k[8]<<8);
+     /* the first byte of c is reserved for the length */
+     case 8 : b+=((uint32_t)k[7]<<24);
+     case 7 : b+=((uint32_t)k[6]<<16);
+     case 6 : b+=((uint32_t)k[5]<<8);
+     case 5 : b+=k[4];
+     case 4 : a+=((uint32_t)k[3]<<24);
+     case 3 : a+=((uint32_t)k[2]<<16);
+     case 2 : a+=((uint32_t)k[1]<<8);
+     case 1 : a+=k[0];
+     /* case 0: nothing left to add */
+   }
+   _c_mix(a,b,c);
+
+   return c;
+}
+
+/**
+ * @brief hash a variable-length key into a 64-bit value
+ *
+ * The best hash table sizes are powers of 2.  There is no need to do
+ * mod a prime (mod is sooo slow!).  If you need less than 64 bits,
+ * use a bitmask.  For example, if you need only 10 bits, do
+ *   h = (h & hashmask(10));
+ * In which case, the hash table should have hashsize(10) elements.
+ *
+ * Use for hash table lookup, or anything where one collision in 2^^64
+ * is acceptable.  Do NOT use for cryptographic purposes.
+ *
+ * @param k       The key (the unaligned variable-length array of bytes).
+ * @param length  The length of the key, counting by bytes.
+ * @param intval  Initial value, can be any 8-byte value.
+ *
+ * @return    A 64-bit value. Every bit of the key affects every bit of
+ *            the return value.  No funnels.  Every 1-bit and 2-bit delta
+ *            achieves avalanche. About 41+5len instructions.
+ */
+static inline uint64_t c_jhash64(const uint8_t *k, uint64_t length, uint64_t intval) {
+  uint64_t a,b,c,len;
+
+  /* Set up the internal state */
+  len = length;
+  a = b = intval; /* the previous hash value */
+  c = 0x9e3779b97f4a7c13LL; /* the golden ratio; an arbitrary value */
+
+  /* handle most of the key */
+  while (len >= 24)
+  {
+    a += (k[0]        +((uint64_t)k[ 1]<< 8)+((uint64_t)k[ 2]<<16)+((uint64_t)k[ 3]<<24)
+     +((uint64_t)k[4 ]<<32)+((uint64_t)k[ 5]<<40)+((uint64_t)k[ 6]<<48)+((uint64_t)k[ 7]<<56));
+    b += (k[8]        +((uint64_t)k[ 9]<< 8)+((uint64_t)k[10]<<16)+((uint64_t)k[11]<<24)
+     +((uint64_t)k[12]<<32)+((uint64_t)k[13]<<40)+((uint64_t)k[14]<<48)+((uint64_t)k[15]<<56));
+    c += (k[16]       +((uint64_t)k[17]<< 8)+((uint64_t)k[18]<<16)+((uint64_t)k[19]<<24)
+     +((uint64_t)k[20]<<32)+((uint64_t)k[21]<<40)+((uint64_t)k[22]<<48)+((uint64_t)k[23]<<56));
+    _c_mix64(a,b,c);
+    k += 24; len -= 24;
+  }
+
+  /* handle the last 23 bytes */
+  c += length;
+  switch(len) {
+    case 23: c+=((uint64_t)k[22]<<56);
+    case 22: c+=((uint64_t)k[21]<<48);
+    case 21: c+=((uint64_t)k[20]<<40);
+    case 20: c+=((uint64_t)k[19]<<32);
+    case 19: c+=((uint64_t)k[18]<<24);
+    case 18: c+=((uint64_t)k[17]<<16);
+    case 17: c+=((uint64_t)k[16]<<8);
+    /* the first byte of c is reserved for the length */
+    case 16: b+=((uint64_t)k[15]<<56);
+    case 15: b+=((uint64_t)k[14]<<48);
+    case 14: b+=((uint64_t)k[13]<<40);
+    case 13: b+=((uint64_t)k[12]<<32);
+    case 12: b+=((uint64_t)k[11]<<24);
+    case 11: b+=((uint64_t)k[10]<<16);
+    case 10: b+=((uint64_t)k[ 9]<<8);
+    case  9: b+=((uint64_t)k[ 8]);
+    case  8: a+=((uint64_t)k[ 7]<<56);
+    case  7: a+=((uint64_t)k[ 6]<<48);
+    case  6: a+=((uint64_t)k[ 5]<<40);
+    case  5: a+=((uint64_t)k[ 4]<<32);
+    case  4: a+=((uint64_t)k[ 3]<<24);
+    case  3: a+=((uint64_t)k[ 2]<<16);
+    case  2: a+=((uint64_t)k[ 1]<<8);
+    case  1: a+=((uint64_t)k[ 0]);
+    /* case 0: nothing left to add */
+  }
+  _c_mix64(a,b,c);
+
+  return c;
+}
+
+/**
+ * }@
+ */
+#endif /* _C_JHASH_H */
+

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/3rdparty/qjson/AUTHORS

@@ -0,0 +1,3 @@
+Eeli Reilin <eeli@emicode.fi>
+Luis Gustavo S. Barreto <gustavosbarreto@gmail.com>
+Stephen Kockentiedt <Stephen@Kockentiedt.name>

src/3rdparty/qjson/LICENSE

@@ -0,0 +1,26 @@
+Copyright 2011 Eeli Reilin. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, 
+      this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation 
+      and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY EXPRESS OR 
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 
+EVENT SHALL EELI REILIN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation 
+are those of the authors and should not be interpreted as representing 
+official policies, either expressed or implied, of Eeli Reilin.

src/3rdparty/qjson/README

@@ -0,0 +1,96 @@
+########################################################################
+1. INTRODUCTION
+
+The Json class is a simple class for parsing JSON data into a QVariant 
+hierarchies. Now, we can also reverse the process and serialize
+QVariant hierarchies into valid JSON data.
+
+
+########################################################################
+2. HOW TO USE
+
+The parser is really easy to use. Let's say we have the following 
+QString of JSON data:
+
+------------------------------------------------------------------------
+{
+   "encoding" : "UTF-8",
+   "plug-ins" : [
+      "python",
+      "c++",
+      "ruby"
+   ],
+   "indent" : {
+      "length" : 3,
+      "use_space" : true
+   }
+}
+------------------------------------------------------------------------
+
+We would first call the parse-method:
+
+------------------------------------------------------------------------
+//Say that we're using the QtJson namespace
+using namespace QtJson;
+bool ok;
+//json is a QString containing the JSON data
+QVariantMap result = Json::parse(json, ok).toMap();
+
+if(!ok) {
+    qFatal("An error occurred during parsing");
+    exit(1);
+}
+------------------------------------------------------------------------
+
+Assuming the parsing process completed without errors, we would then
+go through the hierarchy:
+
+------------------------------------------------------------------------
+qDebug() << "encoding:" << result["encoding"].toString();
+qDebug() << "plugins:";
+
+foreach(QVariant plugin, result["plug-ins"].toList()) {
+    qDebug() << "\t-" << plugin.toString();
+}
+
+QVariantMap nestedMap = result["indent"].toMap();
+qDebug() << "length:" << nestedMap["length"].toInt();
+qDebug() << "use_space:" << nestedMap["use_space"].toBool();
+------------------------------------------------------------------------
+
+The previous code would print out the following:
+
+------------------------------------------------------------------------
+encoding: "UTF-8"
+plugins:
+  - "python"
+  - "c++"
+  - "ruby"
+length: 3
+use_space: true
+------------------------------------------------------------------------
+
+To write JSON data from Qt object is as simple as parsing:
+
+------------------------------------------------------------------------
+QVariantMap map;
+map["name"] = "Name";
+map["age"] = 22;
+
+QByteArray data = Json::serialize(map);
+------------------------------------------------------------------------
+
+The byte array 'data' contains valid JSON data:
+
+------------------------------------------------------------------------
+{
+        name: "Luis Gustavo",
+        age: 22,
+}
+------------------------------------------------------------------------
+
+
+########################################################################
+4. CONTRIBUTING
+
+The code is available to download at GitHub. Contribute if you dare!

src/3rdparty/qjson/json.cpp

@@ -0,0 +1,653 @@
+/* Copyright 2011 Eeli Reilin. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, 
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation 
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY EXPRESS OR 
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 
+ * EVENT SHALL EELI REILIN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation 
+ * are those of the authors and should not be interpreted as representing 
+ * official policies, either expressed or implied, of Eeli Reilin.
+ */
+
+/**
+ * \file json.cpp
+ */
+
+#include "json.h"
+
+namespace QtJson
+{
+
+
+static QString sanitizeString(QString str);
+static QByteArray join(const QList<QByteArray> &list, const QByteArray &sep);
+static QVariant parseValue(const QString &json, int &index, bool &success);
+static QVariant parseObject(const QString &json, int &index, bool &success);
+static QVariant parseArray(const QString &json, int &index, bool &success);
+static QVariant parseString(const QString &json, int &index, bool &success);
+static QVariant parseNumber(const QString &json, int &index);
+static int lastIndexOfNumber(const QString &json, int index);
+static void eatWhitespace(const QString &json, int &index);
+static int lookAhead(const QString &json, int index);
+static int nextToken(const QString &json, int &index);
+
+
+
+
+/***** public *****/
+
+
+/**
+ * parse
+ */
+QVariant parse(const QString &json)
+{
+        bool success = true;
+        return parse(json, success);
+}
+
+/**
+ * parse
+ */
+QVariant parse(const QString &json, bool &success)
+{
+        success = true;
+
+        //Return an empty QVariant if the JSON data is either null or empty
+        if(!json.isNull() || !json.isEmpty())
+        {
+                QString data = json;
+                //We'll start from index 0
+                int index = 0;
+
+                //Parse the first value
+                QVariant value = parseValue(data, index, success);
+
+                //Return the parsed value
+                return value;
+        }
+        else
+        {
+                //Return the empty QVariant
+                return QVariant();
+        }
+}
+
+QByteArray serialize(const QVariant &data)
+{
+        bool success = true;
+        return serialize(data, success);
+}
+
+QByteArray serialize(const QVariant &data, bool &success)
+{
+        QByteArray str;
+        success = true;
+
+        if(!data.isValid()) // invalid or null?
+        {
+                str = "null";
+        }
+        else if((data.type() == QVariant::List) || (data.type() == QVariant::StringList)) // variant is a list?
+        {
+                QList<QByteArray> values;
+                const QVariantList list = data.toList();
+                Q_FOREACH(const QVariant& v, list)
+                {
+                        QByteArray serializedValue = serialize(v);
+                        if(serializedValue.isNull())
+                        {
+                                success = false;
+                                break;
+                        }
+                        values << serializedValue;
+                }
+
+                str = "[ " + join( values, ", " ) + " ]";
+        }
+		else if(data.type() == QVariant::Hash) // variant is a hash?
+		{
+			const QVariantHash vhash = data.toHash();
+			QHashIterator<QString, QVariant> it( vhash );
+			str = "{ ";
+			QList<QByteArray> pairs;
+
+			while(it.hasNext())
+			{
+				it.next();
+				QByteArray serializedValue = serialize(it.value());
+
+				if(serializedValue.isNull())
+				{
+					success = false;
+					break;
+				}
+
+				pairs << sanitizeString(it.key()).toUtf8() + " : " + serializedValue;
+			}
+
+			str += join(pairs, ", ");
+			str += " }";
+		}
+        else if(data.type() == QVariant::Map) // variant is a map?
+        {
+                const QVariantMap vmap = data.toMap();
+                QMapIterator<QString, QVariant> it( vmap );
+                str = "{ ";
+                QList<QByteArray> pairs;
+                while(it.hasNext())
+                {
+                        it.next();
+                        QByteArray serializedValue = serialize(it.value());
+                        if(serializedValue.isNull())
+                        {
+                                success = false;
+                                break;
+                        }
+                        pairs << sanitizeString(it.key()).toUtf8() + " : " + serializedValue;
+                }
+                str += join(pairs, ", ");
+                str += " }";
+        }
+        else if((data.type() == QVariant::String) || (data.type() == QVariant::ByteArray)) // a string or a byte array?
+        {
+                str = sanitizeString(data.toString()).toUtf8();
+        }
+        else if(data.type() == QVariant::Double) // double?
+        {
+                str = QByteArray::number(data.toDouble(), 'g', 20);
+                if(!str.contains(".") && ! str.contains("e"))
+                {
+                        str += ".0";
+                }
+        }
+        else if (data.type() == QVariant::Bool) // boolean value?
+        {
+                str = data.toBool() ? "true" : "false";
+        }
+        else if (data.type() == QVariant::ULongLong) // large unsigned number?
+        {
+                str = QByteArray::number(data.value<qulonglong>());
+        }
+        else if ( data.canConvert<qlonglong>() ) // any signed number?
+        {
+                str = QByteArray::number(data.value<qlonglong>());
+        }
+        else if (data.canConvert<long>())
+        {
+                str = QString::number(data.value<long>()).toUtf8();
+        }
+        else if (data.canConvert<QString>()) // can value be converted to string?
+        {
+                // this will catch QDate, QDateTime, QUrl, ...
+                str = sanitizeString(data.toString()).toUtf8();
+        }
+        else
+        {
+                success = false;
+        }
+        if (success)
+        {
+                return str;
+        }
+        else
+        {
+                return QByteArray();
+        }
+}
+
+
+
+/***** private *****/
+
+
+/**
+ * \enum JsonToken
+ */
+enum JsonToken
+{
+        JsonTokenNone = 0,
+        JsonTokenCurlyOpen = 1,
+        JsonTokenCurlyClose = 2,
+        JsonTokenSquaredOpen = 3,
+        JsonTokenSquaredClose = 4,
+        JsonTokenColon = 5,
+        JsonTokenComma = 6,
+        JsonTokenString = 7,
+        JsonTokenNumber = 8,
+        JsonTokenTrue = 9,
+        JsonTokenFalse = 10,
+        JsonTokenNull = 11
+};
+
+static QString sanitizeString(QString str)
+{
+        str.replace(QLatin1String("\\"), QLatin1String("\\\\"));
+        str.replace(QLatin1String("\""), QLatin1String("\\\""));
+        str.replace(QLatin1String("\b"), QLatin1String("\\b"));
+        str.replace(QLatin1String("\f"), QLatin1String("\\f"));
+        str.replace(QLatin1String("\n"), QLatin1String("\\n"));
+        str.replace(QLatin1String("\r"), QLatin1String("\\r"));
+        str.replace(QLatin1String("\t"), QLatin1String("\\t"));
+        return QString(QLatin1String("\"%1\"")).arg(str);
+}
+
+static QByteArray join(const QList<QByteArray> &list, const QByteArray &sep)
+{
+        QByteArray res;
+        Q_FOREACH(const QByteArray &i, list)
+        {
+                if(!res.isEmpty())
+                {
+                        res += sep;
+                }
+                res += i;
+        }
+        return res;
+}
+
+/**
+ * parseValue
+ */
+static QVariant parseValue(const QString &json, int &index, bool &success)
+{
+        //Determine what kind of data we should parse by
+        //checking out the upcoming token
+        switch(lookAhead(json, index))
+        {
+                case JsonTokenString:
+                        return parseString(json, index, success);
+                case JsonTokenNumber:
+                        return parseNumber(json, index);
+                case JsonTokenCurlyOpen:
+                        return parseObject(json, index, success);
+                case JsonTokenSquaredOpen:
+                        return parseArray(json, index, success);
+                case JsonTokenTrue:
+                        nextToken(json, index);
+                        return QVariant(true);
+                case JsonTokenFalse:
+                        nextToken(json, index);
+                        return QVariant(false);
+                case JsonTokenNull:
+                        nextToken(json, index);
+                        return QVariant();
+                case JsonTokenNone:
+                        break;
+        }
+
+        //If there were no tokens, flag the failure and return an empty QVariant
+        success = false;
+        return QVariant();
+}
+
+/**
+ * parseObject
+ */
+static QVariant parseObject(const QString &json, int &index, bool &success)
+{
+        QVariantMap map;
+        int token;
+
+        //Get rid of the whitespace and increment index
+        nextToken(json, index);
+
+        //Loop through all of the key/value pairs of the object
+        bool done = false;
+        while(!done)
+        {
+                //Get the upcoming token
+                token = lookAhead(json, index);
+
+                if(token == JsonTokenNone)
+                {
+                         success = false;
+                         return QVariantMap();
+                }
+                else if(token == JsonTokenComma)
+                {
+                        nextToken(json, index);
+                }
+                else if(token == JsonTokenCurlyClose)
+                {
+                        nextToken(json, index);
+                        return map;
+                }
+                else
+                {
+                        //Parse the key/value pair's name
+                        QString name = parseString(json, index, success).toString();
+
+                        if(!success)
+                        {
+                                return QVariantMap();
+                        }
+
+                        //Get the next token
+                        token = nextToken(json, index);
+
+                        //If the next token is not a colon, flag the failure
+                        //return an empty QVariant
+                        if(token != JsonTokenColon)
+                        {
+                                success = false;
+                                return QVariant(QVariantMap());
+                        }
+
+                        //Parse the key/value pair's value
+                        QVariant value = parseValue(json, index, success);
+
+                        if(!success)
+                        {
+                                return QVariantMap();
+                        }
+
+                        //Assign the value to the key in the map
+                        map[name] = value;
+                }
+        }
+
+        //Return the map successfully
+        return QVariant(map);
+}
+
+/**
+ * parseArray
+ */
+static QVariant parseArray(const QString &json, int &index, bool &success)
+{
+        QVariantList list;
+
+        nextToken(json, index);
+
+        bool done = false;
+        while(!done)
+        {
+                int token = lookAhead(json, index);
+
+                if(token == JsonTokenNone)
+                {
+                        success = false;
+                        return QVariantList();
+                }
+                else if(token == JsonTokenComma)
+                {
+                        nextToken(json, index);
+                }
+                else if(token == JsonTokenSquaredClose)
+                {
+                        nextToken(json, index);
+                        break;
+                }
+                else
+                {
+                        QVariant value = parseValue(json, index, success);
+
+                        if(!success)
+                        {
+                                return QVariantList();
+                        }
+
+                        list.push_back(value);
+                }
+        }
+
+        return QVariant(list);
+}
+
+/**
+ * parseString
+ */
+static QVariant parseString(const QString &json, int &index, bool &success)
+{
+        QString s;
+        QChar c;
+
+        eatWhitespace(json, index);
+
+        c = json[index++];
+
+        bool complete = false;
+        while(!complete)
+        {
+                if(index == json.size())
+                {
+                        break;
+                }
+
+                c = json[index++];
+
+                if(c == '\"')
+                {
+                        complete = true;
+                        break;
+                }
+                else if(c == '\\')
+                {
+                        if(index == json.size())
+                        {
+                                break;
+                        }
+
+                        c = json[index++];
+
+                        if(c == '\"')
+                        {
+                                s.append('\"');
+                        }
+                        else if(c == '\\')
+                        {
+                                s.append('\\');
+                        }
+                        else if(c == '/')
+                        {
+                                s.append('/');
+                        }
+                        else if(c == 'b')
+                        {
+                                s.append('\b');
+                        }
+                        else if(c == 'f')
+                        {
+                                s.append('\f');
+                        }
+                        else if(c == 'n')
+                        {
+                                s.append('\n');
+                        }
+                        else if(c == 'r')
+                        {
+                                s.append('\r');
+                        }
+                        else if(c == 't')
+                        {
+                                s.append('\t');
+                        }
+                        else if(c == 'u')
+                        {
+                                int remainingLength = json.size() - index;
+
+                                if(remainingLength >= 4)
+                                {
+                                        QString unicodeStr = json.mid(index, 4);
+
+                                        int symbol = unicodeStr.toInt(0, 16);
+
+                                        s.append(QChar(symbol));
+
+                                        index += 4;
+                                }
+                                else
+                                {
+                                        break;
+                                }
+                        }
+                }
+                else
+                {
+                        s.append(c);
+                }
+        }
+
+        if(!complete)
+        {
+                success = false;
+                return QVariant();
+        }
+
+        return QVariant(s);
+}
+
+/**
+ * parseNumber
+ */
+static QVariant parseNumber(const QString &json, int &index)
+{
+        eatWhitespace(json, index);
+
+        int lastIndex = lastIndexOfNumber(json, index);
+        int charLength = (lastIndex - index) + 1;
+        QString numberStr;
+
+        numberStr = json.mid(index, charLength);
+
+        index = lastIndex + 1;
+
+        if (numberStr.contains('.')) {
+                return QVariant(numberStr.toDouble(NULL));
+        } else if (numberStr.startsWith('-')) {
+                return QVariant(numberStr.toLongLong(NULL));
+        } else {
+                return QVariant(numberStr.toULongLong(NULL));
+        }
+}
+
+/**
+ * lastIndexOfNumber
+ */
+static int lastIndexOfNumber(const QString &json, int index)
+{
+        int lastIndex;
+
+        for(lastIndex = index; lastIndex < json.size(); lastIndex++)
+        {
+                if(QString("0123456789+-.eE").indexOf(json[lastIndex]) == -1)
+                {
+                        break;
+                }
+        }
+
+        return lastIndex -1;
+}
+
+/**
+ * eatWhitespace
+ */
+static void eatWhitespace(const QString &json, int &index)
+{
+        for(; index < json.size(); index++)
+        {
+                if(QString(" \t\n\r").indexOf(json[index]) == -1)
+                {
+                        break;
+                }
+        }
+}
+
+/**
+ * lookAhead
+ */
+static int lookAhead(const QString &json, int index)
+{
+        int saveIndex = index;
+        return nextToken(json, saveIndex);
+}
+
+/**
+ * nextToken
+ */
+static int nextToken(const QString &json, int &index)
+{
+        eatWhitespace(json, index);
+
+        if(index == json.size())
+        {
+                return JsonTokenNone;
+        }
+
+        QChar c = json[index];
+        index++;
+        switch(c.toLatin1())
+        {
+                case '{': return JsonTokenCurlyOpen;
+                case '}': return JsonTokenCurlyClose;
+                case '[': return JsonTokenSquaredOpen;
+                case ']': return JsonTokenSquaredClose;
+                case ',': return JsonTokenComma;
+                case '"': return JsonTokenString;
+                case '0': case '1': case '2': case '3': case '4':
+                case '5': case '6': case '7': case '8': case '9':
+                case '-': return JsonTokenNumber;
+                case ':': return JsonTokenColon;
+        }
+
+        index--;
+
+        int remainingLength = json.size() - index;
+
+        //True
+        if(remainingLength >= 4)
+        {
+                if (json[index] == 't' && json[index + 1] == 'r' &&
+                        json[index + 2] == 'u' && json[index + 3] == 'e')
+                {
+                        index += 4;
+                        return JsonTokenTrue;
+                }
+        }
+
+        //False
+        if (remainingLength >= 5)
+        {
+                if (json[index] == 'f' && json[index + 1] == 'a' &&
+                        json[index + 2] == 'l' && json[index + 3] == 's' &&
+                        json[index + 4] == 'e')
+                {
+                        index += 5;
+                        return JsonTokenFalse;
+                }
+        }
+
+        //Null
+        if (remainingLength >= 4)
+        {
+                if (json[index] == 'n' && json[index + 1] == 'u' &&
+                        json[index + 2] == 'l' && json[index + 3] == 'l')
+                {
+                        index += 4;
+                        return JsonTokenNull;
+                }
+        }
+
+        return JsonTokenNone;
+}
+
+
+} //end namespace

src/3rdparty/qjson/json.h

@@ -0,0 +1,85 @@
+/* Copyright 2011 Eeli Reilin. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, 
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation 
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY EXPRESS OR 
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 
+ * EVENT SHALL EELI REILIN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation 
+ * are those of the authors and should not be interpreted as representing 
+ * official policies, either expressed or implied, of Eeli Reilin.
+ */
+
+/**
+ * \file json.h
+ */
+
+#ifndef JSON_H
+#define JSON_H
+
+#include <QVariant>
+#include <QString>
+
+
+/**
+ * \namespace QtJson
+ * \brief A JSON data parser
+ *
+ * Json parses a JSON data into a QVariant hierarchy.
+ */
+namespace QtJson
+{
+
+    /**
+     * Parse a JSON string
+     *
+     * \param json The JSON data
+     */
+    QVariant parse(const QString &json);
+    
+    /**
+     * Parse a JSON string
+     *
+     * \param json The JSON data
+     * \param success The success of the parsing
+     */
+    QVariant parse(const QString &json, bool &success);
+    
+    /**
+    * This method generates a textual JSON representation
+    *
+    * \param data The JSON data generated by the parser.
+    *
+    * \return QByteArray Textual JSON representation
+    */
+    QByteArray serialize(const QVariant &data);
+    
+    /**
+    * This method generates a textual JSON representation
+    *
+    * \param data The JSON data generated by the parser.
+    * \param success The success of the serialization
+    *
+    * \return QByteArray Textual JSON representation
+    */
+    QByteArray serialize(const QVariant &data, bool &success);
+
+} //end namespace
+
+#endif //JSON_H

src/3rdparty/qtsingleapplication/qtsingleapplication.cpp

@@ -61,11 +61,13 @@ QtSingleApplication::QtSingleApplication(const QString &appId, int &argc, char *
 }
 
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 QtSingleApplication::QtSingleApplication(int &argc, char **argv, Type type)
     : QApplication(argc, argv, type)
 {
     sysInit();
 }
+#endif
 
 
 #if defined(Q_WS_X11)

src/3rdparty/qtsingleapplication/qtsingleapplication.h

@@ -28,6 +28,9 @@
 **
 **************************************************************************/
 
+#ifndef _SHAREDTOOLS_SINGLEAPPLICATION
+#define _SHAREDTOOLS_SINGLEAPPLICATION
+
 #include <QApplication>
 
 namespace SharedTools {
@@ -41,7 +44,9 @@ class QtSingleApplication : public QApplication
 public:
     QtSingleApplication(int &argc, char **argv, bool GUIenabled = true);
     QtSingleApplication(const QString &id, int &argc, char **argv);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QtSingleApplication(int &argc, char **argv, Type type);
+#endif
 #if defined(Q_WS_X11)
     explicit QtSingleApplication(Display *dpy, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
     QtSingleApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0);
@@ -83,3 +88,4 @@ private:
 };
 
 } // namespace SharedTools
+#endif // _SHAREDTOOLS_SINGLEAPPLICATION

src/CMakeLists.txt

@@ -1,53 +1,38 @@
-include(${QT_USE_FILE})
+#add_subdirectory(integration)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-QT4_ADD_RESOURCES ( MIRALL_RC_SRC ../mirall.qrc)
-if ( DEFINED OEM_THEME_DIR)
-    QT4_ADD_RESOURCES ( MIRALL_RC_SRC ${OEM_THEME_DIR}/theme.qrc)
+qt_add_resources(MIRALL_RC_SRC ../mirall.qrc)
+if ( IS_DIRECTORY ${OEM_THEME_DIR} )
+    qt_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)
+    qt_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/owncloudwizardresultpage.ui
-mirall/owncloudcredentialspage.ui
-mirall/sslerrordialog.ui
-mirall/proxydialog.ui
-mirall/fileitemdialog.ui
-)
+set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
 
 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})
 
-if(NOT WIN32) 
+qt_wrap_cpp(3rdparty_MOC ${3rdparty_HEADER})
+
+if(NOT WIN32)
 	list(APPEND 3rdparty_SRC 3rdparty/qtlockedfile/qtlockedfile_unix.cpp)
 else()
 	list(APPEND 3rdparty_SRC 3rdparty/qtlockedfile/qtlockedfile_win.cpp )
@@ -56,41 +41,76 @@ 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
+    ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/csync
+    ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qjson
     )
 
-qt4_wrap_ui(mirall_UI_SRCS ${mirall_UI})
-
 set(libsync_SRCS
     mirall/folderman.cpp
     mirall/folder.cpp
     mirall/folderwatcher.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/owncloudpropagator.cpp
+    mirall/syncjournalfilerecord.cpp
+    mirall/syncjournaldb.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
+    mirall/progressdispatcher.cpp
+    mirall/mirallaccessmanager.cpp
+    mirall/networkjobs.cpp
+    mirall/account.cpp
+    mirall/quotainfo.cpp
+    creds/dummycredentials.cpp
+    creds/httpcredentials.cpp
+    creds/credentialsfactory.cpp
+    creds/http/httpconfigfile.cpp
+    creds/shibbolethcredentials.cpp
+    creds/shibboleth/shibbolethaccessmanager.cpp
+    creds/shibboleth/shibbolethcookiejar.cpp
+    creds/shibboleth/shibbolethwebview.cpp
+    creds/shibboleth/shibbolethrefresher.cpp
+    creds/shibboleth/shibbolethconfigfile.cpp
+    creds/credentialscommon.cpp
+    3rdparty/qjson/json.cpp
 )
-set(libsync_HEADERS 
+
+set(libsync_HEADERS
     mirall/folderman.h
     mirall/folder.h
     mirall/folderwatcher.h
-    mirall/unisonfolder.h
-    mirall/csyncfolder.h
-    mirall/owncloudfolder.h
     mirall/csyncthread.h
-    mirall/owncloudinfo.h
-    mirall/credentialstore.h
+    mirall/owncloudpropagator.h
+    mirall/syncjournaldb.h
+    mirall/theme.h
+    mirall/owncloudtheme.h
     mirall/logger.h
+    mirall/connectionvalidator.h
+    mirall/progressdispatcher.h
+    mirall/mirallaccessmanager.h
+    mirall/networkjobs.h
+    mirall/account.h
+    mirall/quotainfo.h
+    creds/abstractcredentials.h
+    creds/dummycredentials.h
+    creds/httpcredentials.h
+    creds/credentialsfactory.h
+    creds/http/httpconfigfile.h
+    creds/shibbolethcredentials.h
+    creds/shibboleth/shibbolethaccessmanager.h
+    creds/shibboleth/shibbolethcookiejar.h
+    creds/shibboleth/shibbolethwebview.h
+    creds/shibboleth/shibbolethrefresher.h
+    creds/shibboleth/shibbolethconfigfile.h
+    creds/credentialscommon.h
+    3rdparty/qjson/json.h
 )
 
 IF( INOTIFY_FOUND )
@@ -99,7 +119,7 @@ IF( INOTIFY_FOUND )
     set(libsync_HEADERS ${libsync_HEADERS} mirall/inotify.h)
     set(libsync_HEADERS ${libsync_HEADERS} mirall/folderwatcher_inotify.h)
 ENDIF()
-IF( WIN32 ) 
+IF( WIN32 )
     set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_win.cpp)
     set(libsync_HEADERS ${libsync_HEADERS} mirall/folderwatcher_win.h)
 ENDIF()
@@ -108,72 +128,137 @@ IF( APPLE )
 ENDIF()
 
 
-qt4_wrap_cpp(syncMoc ${libsync_HEADERS})
+qt_wrap_cpp(syncMoc ${libsync_HEADERS})
+
+
+IF( DEFINED CSYNC_BUILD_PATH )
+SET(HTTPBF_LIBRARY ${CSYNC_BUILD_PATH}/src/httpbf/libhttpbf.a)
+ELSE()
+FIND_LIBRARY(HTTPBF_LIBRARY NAMES httpbf HINTS $ENV{CSYNC_DIR})
+ENDIF()
+
 
 list(APPEND libsync_LINK_TARGETS
     ${QT_LIBRARIES}
     ${CSYNC_LIBRARY}
-    dl
+    ${HTTPBF_LIBRARY}
 )
 
+IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+   list(APPEND libsync_LINK_TARGETS
+      inotify
+   )
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+
 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)
-set_target_properties( owncloudsync  PROPERTIES
+if(NEON_FOUND)
+    list(APPEND libsync_LINK_TARGETS ${NEON_LIBRARIES})
+    include_directories(${NEON_INCLUDE_DIRS})
+endif()
+
+add_library(${synclib_NAME} SHARED ${libsync_SRCS} ${syncMoc})
+
+qt5_use_modules(${synclib_NAME} Widgets Network Xml WebKitWidgets Sql)
+
+set_target_properties( ${synclib_NAME}  PROPERTIES
 	VERSION ${VERSION}
 	SOVERSION ${SOVERSION}
 )
 
-target_link_libraries(owncloudsync ${libsync_LINK_TARGETS} )
+target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} )
 
 if ( APPLE )
-    target_link_libraries(owncloudsync /System/Library/Frameworks/CoreServices.framework)
+    target_link_libraries(${synclib_NAME} /System/Library/Frameworks/CoreServices.framework)
 endif()
 
 if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
-    install(TARGETS owncloudsync
+    install(TARGETS ${synclib_NAME}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     )
     if(NOT WIN32)
         configure_file(${CMAKE_SOURCE_DIR}/mirall.desktop.in
-                       ${APPLICATION_SHORTNAME}.desktop)
-        install(FILES  ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_SHORTNAME}.desktop DESTINATION share/applications )
+		${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}.desktop)
+        install(FILES  ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}.desktop DESTINATION share/applications )
     endif()
 else()
-    install(TARGETS owncloudsync DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS)
+    install(TARGETS ${synclib_NAME} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS)
 endif()
 
+set(mirall_UI
+mirall/folderwizardsourcepage.ui
+mirall/folderwizardtargetpage.ui
+mirall/sslerrordialog.ui
+mirall/settingsdialog.ui
+mirall/generalsettings.ui
+mirall/networksettings.ui
+mirall/accountsettings.ui
+mirall/ignorelisteditor.ui
+mirall/protocolwidget.ui
+wizard/owncloudsetupnocredspage.ui
+wizard/owncloudhttpcredspage.ui
+wizard/owncloudwizardresultpage.ui
+wizard/owncloudadvancedsetuppage.ui
+)
+
+qt_wrap_ui(mirall_UI_SRCS ${mirall_UI})
+
 set(mirall_SRCS
     mirall/application.cpp
+    mirall/systray.cpp
     mirall/folderwizard.cpp
-    mirall/statusdialog.cpp
-    mirall/owncloudwizard.cpp
+    mirall/folderstatusmodel.cpp
+    mirall/protocolwidget.cpp
+    wizard/owncloudwizard.cpp
+    wizard/owncloudsetuppage.cpp
+    wizard/owncloudhttpcredspage.cpp
+    wizard/owncloudwizardresultpage.cpp
+    wizard/owncloudwizardcommon.cpp
+    wizard/owncloudshibbolethcredspage.cpp
+    wizard/owncloudadvancedsetuppage.cpp
     mirall/owncloudsetupwizard.cpp
     mirall/updatedetector.cpp
     mirall/occinfo.cpp
     mirall/sslerrordialog.cpp
     mirall/logbrowser.cpp
-    mirall/proxydialog.cpp
-    mirall/fileitemdialog.cpp
+    mirall/settingsdialog.cpp
+    mirall/generalsettings.cpp
+    mirall/networksettings.cpp
+    mirall/accountsettings.cpp
+    mirall/ignorelisteditor.cpp
+    mirall/owncloudgui.cpp
+    mirall/socketapi.cpp
 )
 
 set(mirall_HEADERS
     mirall/application.h
+    mirall/systray.h
     mirall/folderwizard.h
     mirall/owncloudsetupwizard.h
-    mirall/owncloudwizard.h
-    mirall/statusdialog.h
+    wizard/owncloudwizard.h
+    wizard/owncloudsetuppage.h
+    wizard/owncloudhttpcredspage.h
+    wizard/owncloudwizardresultpage.h
+    wizard/owncloudwizardcommon.h
+    wizard/owncloudshibbolethcredspage.h
+    wizard/owncloudadvancedsetuppage.h
+    mirall/folderstatusmodel.h
     mirall/updatedetector.h
     mirall/sslerrordialog.h
     mirall/logbrowser.h
-    mirall/proxydialog.h
-    mirall/fileitemdialog.h
+    mirall/settingsdialog.h
+    mirall/generalsettings.h
+    mirall/networksettings.h
+    mirall/accountsettings.h
+    mirall/ignorelisteditor.h
+    mirall/protocolwidget.h
+    mirall/owncloudgui.h
+    mirall/socketapi.h
 )
 
 if( UNIX AND NOT APPLE)
@@ -183,12 +268,12 @@ 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_INCLUDE_DIR}/httpbf/src ${CSYNC_BUILD_PATH}/src)
 include_directories(${3rdparty_INC})
 
-qt4_wrap_cpp(mirallMoc ${mirall_HEADERS})
+qt_wrap_cpp(mirallMoc ${mirall_HEADERS})
 
-qt4_add_translation(mirall_I18N ${TRANSLATIONS})
+qt_add_translation(mirall_I18N ${TRANSLATIONS})
 
 set( final_src
     ${mirall_HEADERS}
@@ -206,43 +291,41 @@ set( final_src
 include( AddAppIconMacro )
 set(ownCloud_old ${ownCloud})
 
-kde4_add_app_icon( ownCloud "${theme_dir}/colored/${APPLICATION_SHORTNAME}-icon*.png")
+# set an icon_app_name. For historical reasons we can not use the 
+# application_shortname for ownCloud but must rather set it manually.
+if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
+    set(ICON_APP_NAME ${APPLICATION_SHORTNAME})
+else()
+    set(ICON_APP_NAME "owncloud")
+endif()
+
+kde4_add_app_icon( ownCloud "${theme_dir}/colored/${ICON_APP_NAME}-icon*.png")
 list(APPEND final_src ${ownCloud})
 set(ownCloud ${ownCloud_old})
 
+if (WITH_DBUS)
+    set(ADDITIONAL_APP_MODULES DBus)
+endif(WITH_DBUS)
+
 if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
     set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 if(NOT WIN32)
-    install(FILES ${CMAKE_SOURCE_DIR}/resources/mirall-48.png 
-        DESTINATION share/icons/hicolor/48x48/apps/ RENAME mirall.png)
-    install(FILES
-        ${theme_dir}/colored/${APPLICATION_SHORTNAME}-icon-48.png 
-        DESTINATION share/icons/hicolor/48x48/apps/ RENAME ${APPLICATION_SHORTNAME}.png)
+	file( GLOB _icons "${theme_dir}/colored/${ICON_APP_NAME}-icon-*.png" )
+    foreach( _file ${_icons} )
+	    string( REPLACE "${theme_dir}/colored/${ICON_APP_NAME}-icon-" "" _res ${_file} )
+        string( REPLACE ".png" "" _res ${_res} )
+	install( FILES ${_file} RENAME ${ICON_APP_NAME}.png DESTINATION ${DATADIR}/icons/hicolor/${_res}x${_res}/apps )
+    endforeach( _file )
 endif(NOT WIN32)
 
-    install(FILES ${mirall_I18N} DESTINATION share/mirall/i18n)
+    install(FILES ${mirall_I18N} DESTINATION share/${APPLICATION_EXECUTABLE}/i18n)
 
     # we may not add MACOSX_BUNDLE here, if not building one
 
     # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src})
     add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src})
-    set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT)
-
-    # mirall is not built for the bundle
-    add_executable( mirall WIN32 main.cpp ${final_src})
-
-    target_link_libraries(mirall ${QT_LIBRARIES} )
-    target_link_libraries(mirall owncloudsync)
-    target_link_libraries(mirall ${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}
-    )
+    qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES})
 else()
     set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
     include(DeployQt4)
@@ -252,14 +335,7 @@ 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 )
-        install(FILES ${CSYNC_BINARY_DIR}/modules/ocsync_owncloud.so DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins)
-    else()
-        install(FILES /usr/local/lib/ocsync-0/ocsync_owncloud.so DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins)
-    endif()
+    qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql  ${ADDITIONAL_APP_MODULES})
 
     set (QM_DIR ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/Translations)
     install(FILES ${mirall_I18N} DESTINATION ${QM_DIR})
@@ -267,7 +343,6 @@ else()
     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()
 
 
@@ -275,7 +350,7 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
         RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY}
 )
 target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
-target_link_libraries( ${APPLICATION_EXECUTABLE} owncloudsync )
+target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
 target_link_libraries( ${APPLICATION_EXECUTABLE} ${CSYNC_LIBRARY} )
 
 install(TARGETS ${APPLICATION_EXECUTABLE}
@@ -289,7 +364,7 @@ install(TARGETS ${APPLICATION_EXECUTABLE}
 # currently it needs to be done because the code right above needs to be executed no matter
 # if building a bundle or not and the install_qt4_executable needs to be called afterwards
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
-    install_qt4_executable(${OWNCLOUD_OSX_BUNDLE} "" "${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins/ocsync_owncloud.so" ${dirs})
+    install_qt4_executable(${OWNCLOUD_OSX_BUNDLE} "qtaccessiblewidgets;qsqlite")
 endif()
 
 find_program(KRAZY2_EXECUTABLE krazy2)
@@ -302,3 +377,17 @@ if(KRAZY2_EXECUTABLE)
 )
 endif()
 
+set(owncloudcmd_NAME ${APPLICATION_EXECUTABLE}cmd)
+set(OWNCLOUDCMD_SRC owncloudcmd/owncloudcmd.cpp)
+add_executable(${owncloudcmd_NAME}  ${OWNCLOUDCMD_SRC})
+qt5_use_modules(${owncloudcmd_NAME} Network Sql)
+set_target_properties(${owncloudcmd_NAME} PROPERTIES
+	        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
+target_link_libraries(${owncloudcmd_NAME} ${synclib_NAME})
+target_link_libraries(${owncloudcmd_NAME} ${CSYNC_LIBRARY})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mirall)
+install(TARGETS ${owncloudcmd_NAME}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)

src/creds/abstractcredentials.h

@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 MIRALL_CREDS_ABSTRACT_CREDENTIALS_H
+#define MIRALL_CREDS_ABSTRACT_CREDENTIALS_H
+
+#include <QObject>
+
+#include <csync.h>
+
+class QNetworkAccessManager;
+class QNetworkReply;
+namespace Mirall
+{
+class Account;
+
+class AbstractCredentials : public QObject
+{
+    Q_OBJECT
+
+public:
+    // No need for virtual destructor - QObject already has one.
+    virtual void syncContextPreInit(CSYNC* ctx) = 0;
+    virtual void syncContextPreStart(CSYNC* ctx) = 0;
+    virtual bool changed(AbstractCredentials* credentials) const = 0;
+    virtual QString authType() const = 0;
+    virtual QString user() const = 0;
+    virtual QNetworkAccessManager* getQNAM() const = 0;
+    virtual bool ready() const = 0;
+    virtual void fetch(Account *account) = 0;
+    virtual bool stillValid(QNetworkReply *reply) = 0;
+    virtual bool fetchFromUser(Account *account) = 0;
+    virtual void persist(Account *account) = 0;
+    /** Invalidates auth token, or password for basic auth */
+    virtual void invalidateToken(Account *account) = 0;
+
+
+Q_SIGNALS:
+    void fetched();
+};
+
+} // ns Mirall
+
+#endif

src/creds/credentialscommon.cpp

@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) by Klaas Freitag <freitag@kde.org>
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 <QList>
+#include <QRegExp>
+#include <QString>
+#include <QSslCertificate>
+
+#include <QDebug>
+
+#include "creds/credentialscommon.h"
+
+#include "mirall/utility.h"
+#include "mirall/account.h"
+
+namespace Mirall
+{
+
+int handleNeonSSLProblems(const char* prompt,
+                          char* buf,
+                          size_t /*len*/,
+                          int /*echo*/,
+                          int /*verify*/,
+                          void* /*userdata*/)
+{
+    int re = 0;
+    const QString qPrompt = QString::fromLatin1( prompt ).trimmed();
+
+    if( qPrompt.startsWith( QLatin1String("There are problems with the SSL certificate:"))) {
+        // SSL is requested. If the program came here, the SSL check was done by mirall
+        // It needs to be checked if the  chain is still equal to the one which
+        // was verified by the user.
+        const QRegExp regexp("fingerprint: ([\\w\\d:]+)");
+        bool certOk = false;
+        int pos = 0;
+        // This is the set of certificates which QNAM accepted, so we should accept
+        // them as well
+        QList<QSslCertificate> certs = AccountManager::instance()->account()->certificateChain();
+
+        while (!certOk && (pos = regexp.indexIn(qPrompt, 1+pos)) != -1) {
+            QString neon_fingerprint = regexp.cap(1);
+
+            foreach( const QSslCertificate& c, certs ) {
+                QString verified_shasum = Utility::formatFingerprint(c.digest(QCryptographicHash::Sha1).toHex());
+                qDebug() << "SSL Fingerprint from neon: " << neon_fingerprint << " compared to verified: " << verified_shasum;
+                if( verified_shasum == neon_fingerprint ) {
+                    certOk = true;
+                    break;
+                }
+            }
+        }
+        // certOk = false;     DEBUG setting, keep disabled!
+        if( !certOk ) { // Problem!
+            qstrcpy( buf, "no" );
+            re = -1;
+        } else {
+            qstrcpy( buf, "yes" ); // Certificate is fine!
+        }
+    } else {
+        qDebug() << "Unknown prompt: <" << prompt << ">";
+        re = -1;
+    }
+    return re;
+}
+
+} // ns Mirall

src/creds/credentialscommon.h

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) by Klaas Freitag <freitag@kde.org>
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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_CREDS_COMMON_H
+#define MIRALL_CREDS_COMMON_H
+
+namespace Mirall
+{
+
+int handleNeonSSLProblems(const char* prompt,
+                          char* buf,
+                          size_t len,
+                          int echo,
+                          int verify,
+                          void* userdata);
+
+} // ns Mirall
+
+#endif

src/creds/credentialsfactory.cpp

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 <QString>
+
+#include "creds/httpcredentials.h"
+#include "creds/dummycredentials.h"
+#include "creds/shibbolethcredentials.h"
+
+namespace Mirall
+{
+
+namespace CredentialsFactory
+{
+
+AbstractCredentials* create(const QString& type)
+{
+    // empty string might happen for old version of configuration
+    if (type == "http" || type == "") {
+        return new HttpCredentials;
+    } else if (type == "dummy") {
+        return new DummyCredentials;
+    } else if (type == "shibboleth") {
+        return new ShibbolethCredentials;
+    } else {
+        qWarning("Unknown credentials type: %s", qPrintable(type));
+        return new DummyCredentials;
+    }
+}
+
+} // ns CredentialsFactory
+
+} // ns Mirall

src/creds/credentialsfactory.h

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 MIRALL_CREDS_CREDENTIALS_FACTORY_H
+#define MIRALL_CREDS_CREDENTIALS_FACTORY_H
+
+class AbstractCredentials;
+class QString;
+
+namespace Mirall
+{
+
+namespace CredentialsFactory
+{
+
+AbstractCredentials* create(const QString& type);
+
+} // ns CredentialsFactory
+
+} // ns Mirall
+
+#endif

src/creds/dummycredentials.cpp

@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 "creds/dummycredentials.h"
+#include "mirall/mirallaccessmanager.h"
+
+namespace Mirall
+{
+
+void DummyCredentials::syncContextPreInit(CSYNC*)
+{}
+
+void DummyCredentials::syncContextPreStart(CSYNC*)
+{}
+
+bool DummyCredentials::changed(AbstractCredentials* credentials) const
+{
+    DummyCredentials* dummy(dynamic_cast< DummyCredentials* >(credentials));
+
+    return dummy == 0;
+}
+
+QString DummyCredentials::authType() const
+{
+    return QString::fromLatin1("dummy");
+}
+
+QString DummyCredentials::user() const
+{
+    return QString();
+}
+
+QNetworkAccessManager* DummyCredentials::getQNAM() const
+{
+    return new MirallAccessManager;
+}
+
+bool DummyCredentials::ready() const
+{
+    return true;
+}
+
+bool DummyCredentials::stillValid(QNetworkReply *reply)
+{
+    Q_UNUSED(reply)
+    return true;
+}
+
+bool DummyCredentials::fetchFromUser(Account *account)
+{
+    Q_UNUSED(account)
+    return false;
+}
+
+void DummyCredentials::fetch(Account*)
+{
+    Q_EMIT(fetched());
+}
+
+void DummyCredentials::persist(Account*)
+{}
+
+} // ns Mirall

src/creds/dummycredentials.h

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 MIRALL_CREDS_DUMMY_CREDENTIALS_H
+#define MIRALL_CREDS_DUMMY_CREDENTIALS_H
+
+#include "creds/abstractcredentials.h"
+
+namespace Mirall
+{
+
+class DummyCredentials : public AbstractCredentials
+{
+    Q_OBJECT
+
+public:
+    void syncContextPreInit(CSYNC* ctx);
+    void syncContextPreStart(CSYNC* ctx);
+    bool changed(AbstractCredentials* credentials) const;
+    QString authType() const;
+    QString user() const;
+    QNetworkAccessManager* getQNAM() const;
+    bool ready() const;
+    bool stillValid(QNetworkReply *reply);
+    bool fetchFromUser(Account *account);
+    void fetch(Account*);
+    void persist(Account*);
+    void invalidateToken(Account *) {}
+};
+
+} // ns Mirall
+
+#endif

src/creds/http/httpconfigfile.cpp

@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 "creds/http/httpconfigfile.h"
+
+namespace Mirall
+{
+
+namespace
+{
+
+const char userC[] = "user";
+const char passwdC[] = "passwd";
+const char oldPasswdC[] = "password";
+
+} // ns
+
+QString HttpConfigFile::user() const
+{
+    return retrieveData(QString(), QLatin1String(userC)).toString();
+}
+
+void HttpConfigFile::setUser(const QString& user)
+{
+    storeData(QString(), QLatin1String(userC), QVariant(user));
+}
+
+QString HttpConfigFile::password() const
+{
+    const QVariant passwd(retrieveData(QString(), QLatin1String(passwdC)));
+
+    if (passwd.isValid()) {
+        return QString::fromUtf8(QByteArray::fromBase64(passwd.toByteArray()));
+    }
+
+    return QString();
+}
+
+void HttpConfigFile::setPassword(const QString& password)
+{
+    QByteArray pwdba = password.toUtf8();
+    storeData( QString(), QLatin1String(passwdC), QVariant(pwdba.toBase64()) );
+    removeOldPassword();
+}
+
+bool HttpConfigFile::passwordExists() const
+{
+    return dataExists(QString(), QLatin1String(passwdC));
+}
+
+void HttpConfigFile::removePassword()
+{
+    removeOldPassword();
+    removeData(QString(), QLatin1String(passwdC));
+}
+
+void HttpConfigFile::fixupOldPassword()
+{
+    const QString old(QString::fromLatin1(oldPasswdC));
+
+    if (dataExists(QString(), old)) {
+        setPassword(retrieveData(QString(), old).toString());
+    }
+}
+
+void HttpConfigFile::removeOldPassword()
+{
+    removeData(QString(), QLatin1String(oldPasswdC));
+}
+
+} // ns Mirall

src/creds/http/httpconfigfile.h

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 MIRALL_CREDS_HTTP_CONFIG_FILE_H
+#define MIRALL_CREDS_HTTP_CONFIG_FILE_H
+
+#include "mirall/mirallconfigfile.h"
+
+namespace Mirall
+{
+
+class HttpConfigFile : public MirallConfigFile
+{
+public:
+  QString user() const;
+  void setUser(const QString& user);
+
+  QString password() const;
+  void setPassword(const QString& password);
+  bool passwordExists() const;
+  void removePassword();
+  void fixupOldPassword();
+
+private:
+  void removeOldPassword();
+};
+
+} // ns Mirall
+
+#endif

src/creds/httpcredentials.cpp

@@ -0,0 +1,314 @@
+/*
+ * Copyright (C) by Klaas Freitag <freitag@kde.org>
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 <QMutex>
+#include <QDebug>
+#include <QNetworkReply>
+#include <QSettings>
+#include <QInputDialog>
+
+#include <qtkeychain/keychain.h>
+
+#include "mirall/account.h"
+#include "mirall/mirallaccessmanager.h"
+#include "mirall/utility.h"
+#include "mirall/theme.h"
+#include "creds/credentialscommon.h"
+#include "creds/httpcredentials.h"
+
+using namespace QKeychain;
+
+Q_DECLARE_METATYPE(Mirall::Account*)
+
+namespace Mirall
+{
+
+namespace
+{
+
+int getauth(const char *prompt,
+            char *buf,
+            size_t len,
+            int echo,
+            int verify,
+            void *userdata)
+{
+    int re = 0;
+    QMutex mutex;
+    // ### safe?
+    HttpCredentials* http_credentials = qobject_cast<HttpCredentials*>(AccountManager::instance()->account()->credentials());
+
+    if (!http_credentials) {
+      qDebug() << "Not a HTTP creds instance!";
+      return -1;
+    }
+
+    QString qPrompt = QString::fromLatin1( prompt ).trimmed();
+    QString user = http_credentials->user();
+    QString pwd  = http_credentials->password();
+
+    if( qPrompt == QLatin1String("Enter your username:") ) {
+        // qDebug() << "OOO Username requested!";
+        QMutexLocker locker( &mutex );
+        qstrncpy( buf, user.toUtf8().constData(), len );
+    } else if( qPrompt == QLatin1String("Enter your password:") ) {
+        QMutexLocker locker( &mutex );
+        // qDebug() << "OOO Password requested!";
+        qstrncpy( buf, pwd.toUtf8().constData(), len );
+    } else {
+        re = handleNeonSSLProblems(prompt, buf, len, echo, verify, userdata);
+    }
+    return re;
+}
+
+const char userC[] = "user";
+
+} // ns
+
+class HttpCredentialsAccessManager : public MirallAccessManager {
+public:
+    HttpCredentialsAccessManager(const HttpCredentials *cred, QObject* parent = 0)
+        : MirallAccessManager(parent), _cred(cred) {}
+protected:
+    QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) {
+        QByteArray credHash = QByteArray(_cred->user().toUtf8()+":"+_cred->password().toUtf8()).toBase64();
+        QNetworkRequest req(request);
+        req.setRawHeader(QByteArray("Authorization"), QByteArray("Basic ") + credHash);
+        //qDebug() << "Request for " << req.url() << "with authorization" << QByteArray::fromBase64(credHash);
+        return MirallAccessManager::createRequest(op, req, outgoingData);
+    }
+private:
+    const HttpCredentials *_cred;
+};
+
+HttpCredentials::HttpCredentials()
+    : _user(),
+      _password(),
+      _ready(false)
+{}
+
+HttpCredentials::HttpCredentials(const QString& user, const QString& password)
+    : _user(user),
+      _password(password),
+      _ready(true)
+{
+}
+
+void HttpCredentials::syncContextPreInit (CSYNC* ctx)
+{
+    csync_set_auth_callback (ctx, getauth);
+}
+
+void HttpCredentials::syncContextPreStart (CSYNC* ctx)
+{
+    // TODO: This should not be a part of this method, but we don't have
+    // any way to get "session_key" module property from csync. Had we
+    // have it, then we could remove this code and keep it in
+    // csyncthread code (or folder code, git remembers).
+    QList<QNetworkCookie> cookies(AccountManager::instance()->account()->lastAuthCookies());
+    QString cookiesAsString;
+
+    // Stuff cookies inside csync, then we can avoid the intermediate HTTP 401 reply
+    // when https://github.com/owncloud/core/pull/4042 is merged.
+    foreach(QNetworkCookie c, cookies) {
+        cookiesAsString += c.name();
+        cookiesAsString += '=';
+        cookiesAsString += c.value();
+        cookiesAsString += "; ";
+    }
+
+    csync_set_module_property(ctx, "session_key", cookiesAsString.toLatin1().data());
+}
+
+bool HttpCredentials::changed(AbstractCredentials* credentials) const
+{
+    HttpCredentials* other(dynamic_cast< HttpCredentials* >(credentials));
+
+    if (!other || other->user() != this->user()) {
+        return true;
+    }
+
+    return false;
+}
+
+QString HttpCredentials::authType() const
+{
+    return QString::fromLatin1("http");
+}
+
+QString HttpCredentials::user() const
+{
+    return _user;
+}
+
+QString HttpCredentials::password() const
+{
+    return _password;
+}
+
+QNetworkAccessManager* HttpCredentials::getQNAM() const
+{
+    MirallAccessManager* qnam = new HttpCredentialsAccessManager(this);
+
+    connect( qnam, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
+             this, SLOT(slotAuthentication(QNetworkReply*,QAuthenticator*)));
+
+    return qnam;
+}
+
+bool HttpCredentials::ready() const
+{
+    return _ready;
+}
+
+void HttpCredentials::fetch(Account *account)
+{
+    _user = account->credentialSetting(QLatin1String(userC)).toString();
+    if (_ready) {
+        Q_EMIT fetched();
+    } else {
+        ReadPasswordJob *job = new ReadPasswordJob(Theme::instance()->appName());
+        job->setSettings(account->settingsWithGroup(Theme::instance()->appName()));
+        job->setInsecureFallback(true);
+        job->setKey(keychainKey(account->url().toString(), _user));
+        connect(job, SIGNAL(finished(QKeychain::Job*)), SLOT(slotReadJobDone(QKeychain::Job*)));
+        job->setProperty("account", QVariant::fromValue(account));
+        job->start();
+    }
+}
+bool HttpCredentials::stillValid(QNetworkReply *reply)
+{
+    return ((reply->error() != QNetworkReply::AuthenticationRequiredError)
+            // returned if user or password is incorrect
+            && (reply->error() != QNetworkReply::OperationCanceledError));
+}
+
+bool HttpCredentials::fetchFromUser(Account *account)
+{
+    bool ok = false;
+    QString password = queryPassword(&ok);
+    if (ok) {
+        _password = password;
+        _ready = true;
+        persist(account);
+    }
+    return ok;
+}
+
+void HttpCredentials::slotReadJobDone(QKeychain::Job *job)
+{
+    ReadPasswordJob *readJob = static_cast<ReadPasswordJob*>(job);
+    delete readJob->settings();
+    _password = readJob->textData();
+    QKeychain::Error error = job->error();
+    switch (error) {
+    case NoError:
+        _ready = true;
+        Q_EMIT fetched();
+        break;
+    default:
+        if (!_user.isEmpty()) {
+            bool ok;
+            QString pwd = queryPassword(&ok);
+            if (ok) {
+                _password = pwd;
+                _ready = true;
+                persist(qvariant_cast<Account*>(readJob->property("account")));
+                Q_EMIT fetched();
+                break;
+            }
+        }
+        qDebug() << "Error while reading password" << job->errorString();
+    }
+}
+
+QString HttpCredentials::queryPassword(bool *ok)
+{
+    qDebug() << AccountManager::instance()->account()->state();
+    if (ok) {
+        QString str = QInputDialog::getText(0, tr("Enter Password"),
+                                     tr("Please enter %1 password for user '%2':")
+                                     .arg(Theme::instance()->appNameGUI(), _user),
+                                     QLineEdit::Password, QString(), ok);
+        qDebug() << AccountManager::instance()->account()->state();
+        return str;
+    } else {
+        return QString();
+    }
+}
+
+void HttpCredentials::invalidateToken(Account *account)
+{
+    _password = QString();
+    DeletePasswordJob *job = new DeletePasswordJob(Theme::instance()->appName());
+    job->setKey(keychainKey(account->url().toString(), _user));
+    job->start();
+    _ready = false;
+}
+
+void HttpCredentials::persist(Account *account)
+{
+    account->setCredentialSetting(QLatin1String(userC), _user);
+    WritePasswordJob *job = new WritePasswordJob(Theme::instance()->appName());
+    job->setSettings(account->settingsWithGroup(Theme::instance()->appName()));
+    job->setInsecureFallback(true);
+    connect(job, SIGNAL(finished(QKeychain::Job*)), SLOT(slotWriteJobDone(QKeychain::Job*)));
+    job->setKey(keychainKey(account->url().toString(), _user));
+    job->setTextData(_password);
+    job->start();
+}
+
+void HttpCredentials::slotWriteJobDone(QKeychain::Job *job)
+{
+    delete job->settings();
+    switch (job->error()) {
+    case NoError:
+        break;
+    default:
+        qDebug() << "Error while writing password" << job->errorString();
+    }
+}
+
+void HttpCredentials::slotAuthentication(QNetworkReply* reply, QAuthenticator* authenticator)
+{
+    Q_UNUSED(authenticator)
+    // we cannot use QAuthenticator, because it sends username and passwords with latin1
+    // instead of utf8 encoding. Instead, we send it manually. Thus, if we reach this signal,
+    // those credentials were invalid and we terminate.
+    qDebug() << "Stop request: Authentication failed for " << reply->url().toString();
+    reply->close();
+}
+
+QString HttpCredentials::keychainKey(const QString &url, const QString &user)
+{
+    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;
+}
+
+} // ns Mirall

src/creds/httpcredentials.h

@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) by Klaas Freitag <freitag@kde.org>
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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_CREDS_HTTP_CREDENTIALS_H
+#define MIRALL_CREDS_HTTP_CREDENTIALS_H
+
+#include <QMap>
+
+#include "creds/abstractcredentials.h"
+
+class QNetworkReply;
+class QAuthenticator;
+
+namespace QKeychain {
+class Job;
+}
+
+namespace Mirall
+{
+
+class HttpCredentials : public AbstractCredentials
+{
+    Q_OBJECT
+
+public:
+    HttpCredentials();
+    HttpCredentials(const QString& user, const QString& password);
+
+    void syncContextPreInit(CSYNC* ctx);
+    void syncContextPreStart(CSYNC* ctx);
+    bool changed(AbstractCredentials* credentials) const;
+    QString authType() const;
+    QNetworkAccessManager* getQNAM() const;
+    bool ready() const;
+    void fetch(Account *account);
+    bool stillValid(QNetworkReply *reply);
+    bool fetchFromUser(Account *account);
+    void persist(Account *account);
+    QString user() const;
+    QString password() const;
+    QString queryPassword(bool *ok);
+    void invalidateToken(Account *account);
+
+private Q_SLOTS:
+    void slotAuthentication(QNetworkReply*, QAuthenticator*);
+    void slotReadJobDone(QKeychain::Job*);
+    void slotWriteJobDone(QKeychain::Job*);
+
+private:
+    static QString keychainKey(const QString &url, const QString &user);
+    QString _user;
+    QString _password;
+    bool _ready;
+};
+
+} // ns Mirall
+
+#endif

src/creds/shibboleth/shibbolethaccessmanager.cpp

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 <QDebug>
+#include <QNetworkRequest>
+#include <QNetworkCookieJar>
+
+#include "creds/shibboleth/shibbolethaccessmanager.h"
+
+namespace Mirall
+{
+
+ShibbolethAccessManager::ShibbolethAccessManager(const QNetworkCookie& cookie, QObject* parent)
+    : MirallAccessManager (parent),
+      _cookie(cookie)
+{}
+
+QNetworkReply* ShibbolethAccessManager::createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest& request, QIODevice* outgoingData)
+{
+    if (!_cookie.name().isEmpty()) {
+        QNetworkCookieJar* jar(cookieJar());
+        QUrl url(request.url());
+        QList<QNetworkCookie> cookies;
+
+        Q_FOREACH(const QNetworkCookie& cookie, jar->cookiesForUrl(url)) {
+            if (!cookie.name().startsWith("_shibsession_")) {
+                cookies << cookie;
+            }
+        }
+
+        cookies << _cookie;
+        jar->setCookiesFromUrl(cookies, url);
+    }
+
+    qDebug() << "Creating a request to " << request.url().toString() << " with shibboleth cookie:" << _cookie.name();
+
+    return MirallAccessManager::createRequest (op, request, outgoingData);
+}
+
+void ShibbolethAccessManager::setCookie(const QNetworkCookie& cookie)
+{
+    qDebug() << "Got new shibboleth cookie:" << cookie.name();
+    _cookie = cookie;
+}
+
+} // ns Mirall

src/creds/shibboleth/shibbolethaccessmanager.h

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 MIRALL_WIZARD_SHIBBOLETH_ACCESS_MANAGER_H
+#define MIRALL_WIZARD_SHIBBOLETH_ACCESS_MANAGER_H
+
+#include <QNetworkCookie>
+
+#include "mirall/mirallaccessmanager.h"
+
+namespace Mirall
+{
+
+class ShibbolethAccessManager : public MirallAccessManager
+{
+    Q_OBJECT
+
+public:
+    ShibbolethAccessManager(const QNetworkCookie& cookie, QObject* parent = 0);
+
+public Q_SLOTS:
+    void setCookie(const QNetworkCookie& cookie);
+
+protected:
+    QNetworkReply* createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest& request, QIODevice* outgoingData = 0);
+
+private:
+    QNetworkCookie _cookie;
+};
+
+} // ns Mirall
+
+#endif

src/creds/shibboleth/shibbolethconfigfile.cpp

@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 <QDebug>
+#include <QTextStream>
+
+#include "creds/shibboleth/shibbolethconfigfile.h"
+#include "creds/shibboleth/shibbolethcookiejar.h"
+
+namespace Mirall
+{
+
+namespace
+{
+
+const char otherCookiesC[] = "otherCookies";
+
+} // ns
+
+void ShibbolethConfigFile::storeCookies(const QMap<QUrl, QList<QNetworkCookie> >& cookiesForUrl)
+{
+    if (cookiesForUrl.isEmpty()) {
+        removeData(QString(), QString::fromLatin1(otherCookiesC));
+    } else {
+        QByteArray data;
+        QTextStream stream(&data);
+
+        Q_FOREACH (const QUrl& url, cookiesForUrl.keys()) {
+            const QList<QNetworkCookie>& cookies(cookiesForUrl[url]);
+
+            if (cookies.isEmpty()) {
+                continue;
+            }
+            stream << "URL: " << url.toString().toUtf8() << "\n";
+            qDebug() << "URL: " << url.toString().toUtf8();
+
+            Q_FOREACH (const QNetworkCookie& cookie, cookies) {
+                stream << cookie.toRawForm(QNetworkCookie::NameAndValueOnly) << "\n";
+                qDebug() << cookie.toRawForm(QNetworkCookie::NameAndValueOnly);
+            }
+        }
+
+        stream.flush();
+
+        const QByteArray encodedCookies(data.toBase64());
+
+        qDebug() << "Raw cookies:\n" << data;
+        qDebug() << "Encoded cookies: " << encodedCookies;
+
+        storeData(QString(), QString::fromLatin1(otherCookiesC), QVariant(encodedCookies));
+    }
+}
+
+ShibbolethCookieJar* ShibbolethConfigFile::createCookieJar() const
+{
+    ShibbolethCookieJar* jar = new ShibbolethCookieJar();
+    const QVariant variant(retrieveData(QString(), QString::fromLatin1(otherCookiesC)));
+
+    if (variant.isValid()) {
+        QByteArray data(QByteArray::fromBase64(variant.toByteArray()));
+        QTextStream stream (&data);
+        const QString urlHeader(QString::fromLatin1("URL: "));
+        QUrl currentUrl;
+        QList<QNetworkCookie> currentCookies;
+
+        qDebug() << "Got valid cookies variant: " << data;
+
+        while (!stream.atEnd()) {
+            const QString line(stream.readLine());
+
+            qDebug() << line;
+
+            if (line.startsWith(urlHeader)) {
+                if (!currentUrl.isEmpty() && !currentCookies.isEmpty()) {
+                    jar->setCookiesFromUrl(currentCookies, currentUrl);
+                    currentCookies.clear();
+                    currentUrl.clear();
+                }
+                currentUrl = QUrl(line.mid(5));
+            } else if (!currentUrl.isEmpty()) {
+                const int equalPos(line.indexOf('='));
+
+                currentCookies << QNetworkCookie(line.left(equalPos).toUtf8(), line.mid(equalPos + 1).toUtf8());
+            }
+        }
+        if (!currentUrl.isEmpty() && !currentCookies.isEmpty()) {
+            jar->setCookiesFromUrl(currentCookies, currentUrl);
+        }
+    }
+
+    return jar;
+}
+
+} // ns Mirall

src/creds/shibboleth/shibbolethconfigfile.h

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 MIRALL_CREDS_SHIBBOLETH_CONFIG_FILE_H
+#define MIRALL_CREDS_SHIBBOLETH_CONFIG_FILE_H
+
+#include <QList>
+#include <QMap>
+#include <QNetworkCookie>
+#include <QUrl>
+
+#include "mirall/mirallconfigfile.h"
+
+namespace Mirall
+{
+
+class ShibbolethCookieJar;
+
+class ShibbolethConfigFile : public MirallConfigFile
+{
+public:
+    void storeCookies(const QMap<QUrl, QList<QNetworkCookie> >& cookies);
+    ShibbolethCookieJar* createCookieJar() const;
+};
+
+} // ns Mirall
+
+#endif

src/creds/shibboleth/shibbolethcookiejar.cpp

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 "creds/shibboleth/shibbolethcookiejar.h"
+
+namespace Mirall
+{
+
+ShibbolethCookieJar::ShibbolethCookieJar (QObject* parent)
+  : QNetworkCookieJar (parent)
+{}
+
+bool ShibbolethCookieJar::setCookiesFromUrl (const QList<QNetworkCookie>& cookieList, const QUrl& url)
+{
+  if (QNetworkCookieJar::setCookiesFromUrl (cookieList, url)) {
+    Q_EMIT newCookiesForUrl (cookieList, url);
+
+    return true;
+  }
+
+  return false;
+}
+
+} // ns Mirall

src/creds/shibboleth/shibbolethcookiejar.h

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 MIRALL_WIZARD_SHIBBOLETH_COOKIE_JAR_H
+#define MIRALL_WIZARD_SHIBBOLETH_COOKIE_JAR_H
+
+#include <QNetworkCookieJar>
+#include <QList>
+
+class QUrl;
+class QNetworkCookie;
+
+namespace Mirall
+{
+
+class ShibbolethCookieJar : public QNetworkCookieJar
+{
+  Q_OBJECT
+
+public:
+  ShibbolethCookieJar (QObject* parent = 0);
+
+  virtual bool setCookiesFromUrl (const QList<QNetworkCookie>& cookieList, const QUrl& url);
+
+Q_SIGNALS:
+  void newCookiesForUrl (const QList<QNetworkCookie>& cookieList, const QUrl& url);
+};
+
+} // ns Mirall
+
+#endif

src/creds/shibboleth/shibbolethrefresher.cpp

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 <QEventLoop>
+
+#include "mirall/account.h"
+#include "creds/shibboleth/shibbolethrefresher.h"
+#include "creds/shibbolethcredentials.h"
+
+namespace Mirall
+{
+
+ShibbolethRefresher::ShibbolethRefresher(Account *account, ShibbolethCredentials* creds, CSYNC* csync_ctx, QObject* parent)
+    : QObject(parent),
+      _account(account),
+      _creds(creds),
+      _csync_ctx(csync_ctx)
+{}
+
+void ShibbolethRefresher::refresh()
+{
+    QEventLoop loop;
+
+    connect(_creds, SIGNAL(invalidatedAndFetched(QByteArray)),
+            this, SLOT(onInvalidatedAndFetched(QByteArray)));
+    connect(_creds, SIGNAL(invalidatedAndFetched(QByteArray)),
+            &loop, SLOT(quit()));
+    QMetaObject::invokeMethod(_creds, "invalidateAndFetch",Qt::QueuedConnection,
+                              Q_ARG(Account*, _account));
+    loop.exec();
+    disconnect(_creds, SIGNAL(invalidatedAndFetched(QByteArray)),
+               &loop, SLOT(quit()));
+}
+
+void ShibbolethRefresher::onInvalidatedAndFetched(const QByteArray& cookies)
+{
+    // "cookies" is const and its data() return const void*. We want just void*.
+    QByteArray myCookies(cookies);
+
+    disconnect(_creds, SIGNAL(invalidatedAndFetched(QByteArray)),
+               this, SLOT(onInvalidatedAndFetched(QByteArray)));
+    csync_set_module_property(_csync_ctx, "session_key", myCookies.data());
+}
+
+} // ns Mirall

src/creds/shibboleth/shibbolethrefresher.h

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 MIRALL_CREDS_SHIBBOLETH_REFRESHER_H
+#define MIRALL_CREDS_SHIBBOLETH_REFRESHER_H
+
+#include <QObject>
+
+#include <csync.h>
+
+class QByteArray;
+
+namespace Mirall
+{
+
+class Account;
+class ShibbolethCredentials;
+
+class ShibbolethRefresher : public QObject
+{
+    Q_OBJECT
+
+public:
+    ShibbolethRefresher(Account *account, ShibbolethCredentials* creds, CSYNC* csync_ctx, QObject* parent = 0);
+
+    void refresh();
+
+private Q_SLOTS:
+    void onInvalidatedAndFetched(const QByteArray& cookieData);
+
+private:
+    Account* _account;
+    ShibbolethCredentials* _creds;
+    CSYNC* _csync_ctx;
+};
+
+} // ns Mirall
+
+#endif

src/creds/shibboleth/shibbolethwebview.cpp

@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 <QApplication>
+#include <QDebug>
+#include <QNetworkCookie>
+#include <QWebFrame>
+#include <QWebPage>
+#include <QMessageBox>
+
+#include "creds/shibboleth/shibbolethcookiejar.h"
+#include "creds/shibboleth/shibbolethwebview.h"
+#include "mirall/account.h"
+#include "mirall/mirallaccessmanager.h"
+#include "mirall/theme.h"
+
+namespace Mirall
+{
+
+void ShibbolethWebView::setup(Account *account, ShibbolethCookieJar* jar)
+{
+    MirallAccessManager* nm = new MirallAccessManager(this);
+    // we need our own QNAM, but the we offload the SSL error handling to
+    // the account object, which already can do this
+    connect(nm, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
+            account, SLOT(slotHandleErrors(QNetworkReply*,QList<QSslError>)));
+
+    QWebPage* page = new QWebPage(this);
+
+    jar->setParent(this);
+    connect(jar, SIGNAL (newCookiesForUrl (QList<QNetworkCookie>, QUrl)),
+            this, SLOT (onNewCookiesForUrl (QList<QNetworkCookie>, QUrl)));
+    connect(page, SIGNAL(loadStarted()),
+            this, SLOT(slotLoadStarted()));
+    connect(page, SIGNAL(loadFinished(bool)),
+            this, SLOT(slotLoadFinished(bool)));
+
+    nm->setCookieJar(jar);
+    page->setNetworkAccessManager(nm);
+    page->mainFrame()->load(account->url());
+    this->setPage(page);
+    setWindowTitle(tr("%1 - Authenticate").arg(Theme::instance()->appNameGUI()));
+}
+
+ShibbolethWebView::ShibbolethWebView(Account* account, QWidget* parent)
+  : QWebView(parent)
+{
+    setup(account, new ShibbolethCookieJar(this));
+}
+
+ShibbolethWebView::~ShibbolethWebView()
+{
+    slotLoadFinished();
+}
+
+ShibbolethWebView::ShibbolethWebView(Account* account, ShibbolethCookieJar* jar, QWidget* parent)
+  : QWebView(parent)
+{
+    setup(account, jar);
+}
+
+void ShibbolethWebView::onNewCookiesForUrl (const QList<QNetworkCookie>& cookieList, const QUrl& url)
+{
+  QList<QNetworkCookie> otherCookies;
+  QNetworkCookie shibCookie;
+
+  Q_FOREACH (const QNetworkCookie& cookie, cookieList) {
+    if (cookie.name().startsWith ("_shibsession_")) {
+      if (shibCookie.name().isEmpty()) {
+        shibCookie = cookie;
+      } else {
+        qWarning() << "Too many Shibboleth session cookies at once!";
+      }
+    } else {
+      otherCookies << cookie;
+    }
+  }
+
+  if (!otherCookies.isEmpty()) {
+    Q_EMIT otherCookiesReceived(otherCookies, url);
+  }
+  if (!shibCookie.name().isEmpty()) {
+    Q_EMIT shibbolethCookieReceived(shibCookie);
+  }
+}
+
+void ShibbolethWebView::hideEvent(QHideEvent* event)
+{
+    Q_EMIT viewHidden();
+    QWebView::hideEvent(event);
+}
+
+void ShibbolethWebView::slotLoadStarted()
+{
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+}
+
+void ShibbolethWebView::slotLoadFinished(bool success)
+{
+    QApplication::restoreOverrideCursor();
+
+    if (!title().isNull()) {
+        setWindowTitle(tr("%1 - %2").arg(Theme::instance()->appNameGUI(), title()));
+    }
+
+    if (!success) {
+        QMessageBox::critical(this, tr("Error loading IdP login page"),
+                              tr("Could not load Shibboleth login page to log you in.\n"
+                                 "Please ensure that your network connection is working."));
+
+    }
+}
+
+} // ns Mirall

src/creds/shibboleth/shibbolethwebview.h

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.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 MIRALL_WIZARD_SHIBBOLETH_WEB_VIEW_H
+#define MIRALL_WIZARD_SHIBBOLETH_WEB_VIEW_H
+
+#include <QList>
+#include <QWebView>
+
+class QNetworkCookie;
+class QUrl;
+
+namespace Mirall
+{
+
+class ShibbolethCookieJar;
+class Account;
+
+class ShibbolethWebView : public QWebView
+{
+  Q_OBJECT
+
+public:
+  ShibbolethWebView(Account *account, QWidget* parent = 0);
+  ShibbolethWebView(Account *account, ShibbolethCookieJar* jar, QWidget* parent = 0);
+  ~ShibbolethWebView();
+
+protected:
+  void hideEvent(QHideEvent* event);
+
+Q_SIGNALS:
+  void shibbolethCookieReceived(const QNetworkCookie& cookie);
+  void viewHidden();
+  void otherCookiesReceived(const QList<QNetworkCookie>& cookieList, const QUrl& url);
+
+private Q_SLOTS:
+  void onNewCookiesForUrl(const QList<QNetworkCookie>& cookieList, const QUrl& url);
+  void slotLoadStarted();
+  void slotLoadFinished(bool success = true);
+
+private:
+  void setup(Account *account, ShibbolethCookieJar* jar);
+};
+
+} // ns Mirall
+
+#endif

src/creds/shibbolethcredentials.cpp

@@ -0,0 +1,269 @@
+/*
+ * Copyright (C) by Krzesimir Nowak <krzesimir@endocode.com>
+ * 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 <QDebug>
+#include <QMutex>
+
+#include "creds/shibbolethcredentials.h"
+#include "creds/shibboleth/shibbolethaccessmanager.h"
+#include "creds/shibboleth/shibbolethwebview.h"
+#include "creds/shibboleth/shibbolethrefresher.h"
+#include "creds/shibboleth/shibbolethconfigfile.h"
+#include "creds/credentialscommon.h"
+#include "mirall/account.h"
+
+namespace Mirall
+{
+
+namespace
+{
+
+int shibboleth_redirect_callback(CSYNC* csync_ctx,
+                                 const char* uri)
+{
+    if (!csync_ctx || !uri) {
+        return 1;
+    }
+
+    const QString qurl(QString::fromLatin1(uri));
+    QRegExp shibbolethyWords ("SAML|wayf");
+
+    shibbolethyWords.setCaseSensitivity (Qt::CaseInsensitive);
+    if (!qurl.contains(shibbolethyWords)) {
+        return 1;
+    }
+
+    QMutex mutex;
+    QMutexLocker locker(&mutex);
+    Account *account = AccountManager::instance()->account();
+    ShibbolethCredentials* creds = qobject_cast<ShibbolethCredentials*>(account->credentials());
+
+
+    if (!creds) {
+      qDebug() << "Not a Shibboleth creds instance!";
+      return 1;
+    }
+
+    ShibbolethRefresher refresher(account, creds, csync_ctx);
+
+    // blocks
+    refresher.refresh();
+
+    return creds->ready() ? 0 : 1;
+}
+
+} // ns
+
+ShibbolethCredentials::ShibbolethCredentials()
+    : AbstractCredentials(),
+      _url(),
+      _shibCookie(),
+      _ready(false),
+      _browser(0),
+      _otherCookies()
+{}
+
+ShibbolethCredentials::ShibbolethCredentials(const QNetworkCookie& cookie, const QMap<QUrl, QList<QNetworkCookie> >& otherCookies)
+    : _shibCookie(cookie),
+      _ready(true),
+      _browser(0),
+      _otherCookies(otherCookies)
+{}
+
+void ShibbolethCredentials::syncContextPreInit(CSYNC* ctx)
+{
+    csync_set_auth_callback (ctx, handleNeonSSLProblems);
+}
+
+QByteArray ShibbolethCredentials::prepareCookieData() const
+{
+    QString cookiesAsString;
+    // TODO: This should not be a part of this method, but we don't
+    // have any way to get "session_key" module property from
+    // csync. Had we have it, then we could just append shibboleth
+    // cookies to the "session_key" value and set it in csync module.
+    QList<QNetworkCookie> cookies(AccountManager::instance()->account()->lastAuthCookies());
+    QMap<QString, QString> uniqueCookies;
+
+    cookies << _shibCookie;
+    // Stuff cookies inside csync, then we can avoid the intermediate HTTP 401 reply
+    // when https://github.com/owncloud/core/pull/4042 is merged.
+    foreach(QNetworkCookie c, cookies) {
+        const QString cookieName(c.name());
+
+        if (cookieName.startsWith("_shibsession_")) {
+            continue;
+        }
+        uniqueCookies.insert(cookieName, c.value());
+    }
+
+    if (!_shibCookie.name().isEmpty()) {
+        uniqueCookies.insert(_shibCookie.name(), _shibCookie.value());
+    }
+    foreach(const QString& cookieName, uniqueCookies.keys()) {
+        cookiesAsString += cookieName;
+        cookiesAsString += '=';
+        cookiesAsString += uniqueCookies[cookieName];
+        cookiesAsString += "; ";
+    }
+
+    return cookiesAsString.toLatin1();
+}
+
+void ShibbolethCredentials::syncContextPreStart (CSYNC* ctx)
+{
+    typedef int (*csync_owncloud_redirect_callback_t)(CSYNC* ctx, const char* uri);
+
+    csync_owncloud_redirect_callback_t cb = shibboleth_redirect_callback;
+
+    csync_set_module_property(ctx, "session_key", prepareCookieData().data());
+    csync_set_module_property(ctx, "redirect_callback", &cb);
+}
+
+bool ShibbolethCredentials::changed(AbstractCredentials* credentials) const
+{
+    ShibbolethCredentials* other(dynamic_cast< ShibbolethCredentials* >(credentials));
+
+    if (!other || other->cookie() != this->cookie()) {
+        return true;
+    }
+
+    return false;
+}
+
+QString ShibbolethCredentials::authType() const
+{
+    return QString::fromLatin1("shibboleth");
+}
+
+QString ShibbolethCredentials::user() const
+{
+    // ### TODO: If we had a way to extract the currently authenticated user
+    // somehow, we could return its id token (email) here (stored in REMOTE_USER)
+    // The server doesn't return it by default
+    return QString();
+}
+
+QNetworkCookie ShibbolethCredentials::cookie() const
+{
+    return _shibCookie;
+}
+
+QNetworkAccessManager* ShibbolethCredentials::getQNAM() const
+{
+    ShibbolethAccessManager* qnam(new ShibbolethAccessManager(_shibCookie));
+
+    connect(this, SIGNAL(newCookie(QNetworkCookie)),
+            qnam, SLOT(setCookie(QNetworkCookie)));
+    return qnam;
+}
+
+bool ShibbolethCredentials::ready() const
+{
+    return _ready;
+}
+
+void ShibbolethCredentials::fetch(Account *account)
+{
+    if (_ready) {
+        Q_EMIT fetched();
+    } else {
+        ShibbolethConfigFile cfg;
+        if (account) {
+            _url = account->url();
+        }
+        _browser = new ShibbolethWebView(account, cfg.createCookieJar());
+        connect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie)),
+                this, SLOT(onShibbolethCookieReceived(QNetworkCookie)));
+        connect(_browser, SIGNAL(viewHidden()),
+                this, SLOT(slotBrowserHidden()));
+        _browser->show ();
+    }
+}
+
+bool ShibbolethCredentials::stillValid(QNetworkReply *reply)
+{
+    Q_UNUSED(reply)
+    return true;
+}
+
+bool ShibbolethCredentials::fetchFromUser(Account *account)
+{
+    Q_UNUSED(account)
+    return false;
+}
+
+void ShibbolethCredentials::persist(Account* /*account*/)
+{
+    ShibbolethConfigFile cfg;
+
+    cfg.storeCookies(_otherCookies);
+}
+
+void ShibbolethCredentials::invalidateToken(Account *account)
+{
+    Q_UNUSED(account)
+    _shibCookie.setValue("");
+    // ### access to ctx missing, but might not be required at all
+    //csync_set_module_property(ctx, "session_key", "");
+}
+
+void ShibbolethCredentials::disposeBrowser()
+{
+    disconnect(_browser, SIGNAL(viewHidden()),
+               this, SLOT(slotBrowserHidden()));
+    disconnect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie)),
+               this, SLOT(onShibbolethCookieReceived(QNetworkCookie)));
+    _browser->hide();
+    _browser->deleteLater();
+    _browser = 0;
+}
+
+void ShibbolethCredentials::onShibbolethCookieReceived(const QNetworkCookie& cookie)
+{
+    disposeBrowser();
+    _ready = true;
+    _shibCookie = cookie;
+    Q_EMIT newCookie(_shibCookie);
+    Q_EMIT fetched();
+}
+
+void ShibbolethCredentials::slotBrowserHidden()
+{
+    disposeBrowser();
+    _ready = false;
+    _shibCookie = QNetworkCookie();
+    Q_EMIT fetched();
+}
+
+void ShibbolethCredentials::invalidateAndFetch(Account* account)
+{
+    _ready = false;
+    connect (this, SIGNAL(fetched()),
+             this, SLOT(onFetched()));
+    // small hack to support the ShibbolethRefresher hack
+    // we already rand fetch() with a valid account object,
+    // and hence know the url on refresh
+    fetch(account);
+}
+
+void ShibbolethCredentials::onFetched()
+{
+    disconnect (this, SIGNAL(fetched()),
+                this, SLOT(onFetched()));
+
+    Q_EMIT invalidatedAndFetched(prepareCookieData());
+}
+
+} // ns Mirall