1.4.0 final

- add description of syncing limitations
- update out-of-date comments

Fixes #788

.gitignore

@@ -1,3 +1,4 @@
+.gitmodules
 *build*/
 *flymake*
 CMakeLists.txt.user*

.gitmodules

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

CMakeLists.txt

@@ -4,6 +4,8 @@ project(mirall)
 set(PACKAGE "mirall")
 set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 
+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 )
@@ -11,12 +13,16 @@ 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} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")
 
 include(GNUInstallDirs)
-
+include(DefineInstallationPaths)
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 
@@ -32,10 +38,8 @@ if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
     endif()
 endif()
 
-## stupid, we should upstream this
+set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
-if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" AND NOT CMAKE_INSTALL_SYSCONFDIR)
+set(DATADIR ${DATA_INSTALL_DIR})
-    set(CMAKE_INSTALL_SYSCONFDIR "/etc")
-endif()
 
 #####
 ## handle BUILD_OWNCLOUD_OSX_BUNDLE
@@ -62,9 +66,9 @@ endif()
 ####
 
 #### find libs
-find_package(Qt4 4.6.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest REQUIRED )
+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.6.0 COMPONENTS QtDBus REQUIRED )
+    find_package(Qt4 4.7.0 COMPONENTS QtDBus REQUIRED )
 endif()
 find_package(Csync REQUIRED)
 if(UNIX)
@@ -81,25 +85,6 @@ 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)
 
 add_definitions(-DUNICODE)
@@ -121,5 +106,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()

ChangeLog

@@ -1,5 +1,63 @@
 ChangeLog
 =========
+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

OWNCLOUD.cmake

@@ -1,9 +1,9 @@
-set( APPLICATION_SHORTNAME  "owncloud" )
 set( APPLICATION_NAME       "ownCloud" )
-set( APPLICATION_EXECUTABLE "owncloud"        )
+#set( APPLICATION_SHORTNAME  ${APPLICATION_NAME} )
-set( APPLICATION_DOMAIN     "owncloud.com"    )
+set( APPLICATION_EXECUTABLE "owncloud" )
-set( APPLICATION_VENDOR     "ownCloud, Inc"   )
+set( APPLICATION_DOMAIN     "owncloud.com" )
-set( THEME_CLASS            "ownCloudTheme"   )
+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" )

VERSION.cmake

@@ -1,6 +1,6 @@
 set( VERSION_MAJOR 1 )
-set( VERSION_MINOR 3 )
+set( VERSION_MINOR 4 )
 set( VERSION_PATCH 0 )
-set( VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}beta2)
+set( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}")
 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
+hdiutil attach $tmp_dmg
-sleep 12s
 pushd $mount
 codesign -s "$identity" $mount/*.app
 popd

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/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
@@ -283,84 +282,20 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    !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_*.qm"
-        File "${BUILD_PATH}\src\mirall_cs_CZ.qm"
+        ; Make sure only to copy qt, not qt_help, etc
-        File "${BUILD_PATH}\src\mirall_da.qm"
+        File "${MING_SHARE}\qt4\translations\qt_??.qm"
-        File "${BUILD_PATH}\src\mirall_de.qm"
+        File "${MING_SHARE}\qt4\translations\qt_??_??.qm"
-        File "${BUILD_PATH}\src\mirall_el.qm"
+        File "${MING_SHARE}\qt4\translations\qtkeychain_*.qm"
-        File "${BUILD_PATH}\src\mirall_en.qm"
-        File "${BUILD_PATH}\src\mirall_eo.qm"
-        File "${BUILD_PATH}\src\mirall_es.qm"
-        File "${BUILD_PATH}\src\mirall_es_AR.qm"
-        File "${BUILD_PATH}\src\mirall_et_EE.qm"
-        File "${BUILD_PATH}\src\mirall_eu.qm"
-        File "${BUILD_PATH}\src\mirall_fa.qm"
-        File "${BUILD_PATH}\src\mirall_fi_FI.qm"
-        File "${BUILD_PATH}\src\mirall_fr.qm"
-        File "${BUILD_PATH}\src\mirall_gl.qm"
-        File "${BUILD_PATH}\src\mirall_he.qm"
-        File "${BUILD_PATH}\src\mirall_hr.qm"
-        File "${BUILD_PATH}\src\mirall_hu_HU.qm"
-        File "${BUILD_PATH}\src\mirall_it.qm"
-        File "${BUILD_PATH}\src\mirall_ja_JP.qm"
-        File "${BUILD_PATH}\src\mirall_ko.qm"
-        File "${BUILD_PATH}\src\mirall_lb.qm"
-        File "${BUILD_PATH}\src\mirall_lt_LT.qm"
-        File "${BUILD_PATH}\src\mirall_lv.qm"
-        File "${BUILD_PATH}\src\mirall_mk.qm"
-        File "${BUILD_PATH}\src\mirall_ms_MY.qm"
-        File "${BUILD_PATH}\src\mirall_nb_NO.qm"
-        File "${BUILD_PATH}\src\mirall_nl.qm"
-        File "${BUILD_PATH}\src\mirall_oc.qm"
-        File "${BUILD_PATH}\src\mirall_pl.qm"
-        File "${BUILD_PATH}\src\mirall_pt_BR.qm"
-        File "${BUILD_PATH}\src\mirall_pt_PT.qm"
-        File "${BUILD_PATH}\src\mirall_ro.qm"
-        File "${BUILD_PATH}\src\mirall_ru.qm"
-        File "${BUILD_PATH}\src\mirall_ru_RU.qm"
-        File "${BUILD_PATH}\src\mirall_si_LK.qm"
-        File "${BUILD_PATH}\src\mirall_sk_SK.qm"
-        File "${BUILD_PATH}\src\mirall_sl.qm"
-        File "${BUILD_PATH}\src\mirall_sr@latin.qm"
-        File "${BUILD_PATH}\src\mirall_sv.qm"
-        File "${BUILD_PATH}\src\mirall_ta_LK.qm"
-        File "${BUILD_PATH}\src\mirall_th_TH.qm"
-        File "${BUILD_PATH}\src\mirall_tr.qm"
-        File "${BUILD_PATH}\src\mirall_uk.qm"
-        File "${BUILD_PATH}\src\mirall_vi.qm"
-        File "${BUILD_PATH}\src\mirall_zh_CN.qm"
-        File "${BUILD_PATH}\src\mirall_zh_TW.qm"
-
-        #File "${MING_SHARE}\qt4\translations\qt_ar.qm"
-        File "${MING_SHARE}\qt4\translations\qt_cs.qm"
-        File "${MING_SHARE}\qt4\translations\qt_da.qm"
-        File "${MING_SHARE}\qt4\translations\qt_de.qm"
-        File "${MING_SHARE}\qt4\translations\qt_es.qm"
-        File "${MING_SHARE}\qt4\translations\qt_fa.qm"
-        File "${MING_SHARE}\qt4\translations\qt_fr.qm"
-        File "${MING_SHARE}\qt4\translations\qt_gl.qm"
-        File "${MING_SHARE}\qt4\translations\qt_he.qm"
-        File "${MING_SHARE}\qt4\translations\qt_hu.qm"
-        File "${MING_SHARE}\qt4\translations\qt_ja.qm"
-        File "${MING_SHARE}\qt4\translations\qt_ko.qm"
-        File "${MING_SHARE}\qt4\translations\qt_lt.qm"
-        File "${MING_SHARE}\qt4\translations\qt_pl.qm"
-        File "${MING_SHARE}\qt4\translations\qt_pt.qm"
-        File "${MING_SHARE}\qt4\translations\qt_ru.qm"
-        File "${MING_SHARE}\qt4\translations\qt_sk.qm"
-        File "${MING_SHARE}\qt4\translations\qt_sl.qm"
-        File "${MING_SHARE}\qt4\translations\qt_sv.qm"
-        File "${MING_SHARE}\qt4\translations\qt_uk.qm"
-        File "${MING_SHARE}\qt4\translations\qt_zh_CN.qm"
-        File "${MING_SHARE}\qt4\translations\qt_zh_TW.qm"
-        File "${MING_SHARE}\qt4\translations\qt_zh_TW.qm"
-
-        File "${MING_SHARE}\qt4\translations\qtkeychain_de.qm"
 
         SetOutPath "$INSTDIR\accessible"
         File "${ACCESSIBLE_DLL_PATH}\qtaccessiblewidgets4.dll"
+        SetOutPath "$INSTDIR\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
@@ -381,6 +316,7 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    File "${QT_DLL_PATH}\QtGui4.dll"
    File "${QT_DLL_PATH}\QtNetwork4.dll"
    File "${QT_DLL_PATH}\QtXml4.dll"
+   File "${QT_DLL_PATH}\QtWebKit4.dll"
 
    ;QtKeyChain stuff
    File "${MING_BIN}\libqtkeychain.dll"
@@ -404,7 +340,7 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
 
    ; 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"
@@ -455,17 +391,6 @@ 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
@@ -475,7 +400,6 @@ ${MementoSectionDone}
 !insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "${APPLICATION_NAME} program group."
 !insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for ${APPLICATION_NAME}."
 !insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for ${APPLICATION_NAME}."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_AUTOSTART} "Register ${APPLICATION_NAME} to run on Windows startup."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 Section -post
@@ -578,11 +502,6 @@ Section Uninstall
 
    DeleteRegKey HKCR "${APPLICATION_NAME}"
 
-   ;Windows Start entry
-   !ifdef OPTION_SECTION_SC_AUTOSTART
-      DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "${APPLICATION_NAME}"
-   !endif
-
    ;Start menu shortcuts.
    !ifdef OPTION_SECTION_SC_START_MENU
       SetShellVarContext all

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,16 @@
 #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 SYSCONFDIR "@SYSCONFDIR@"
+#cmakedefine DATADIR "@DATADIR@"
 #endif

doc/CMakeLists.txt

@@ -22,12 +22,17 @@ 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")
+       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} )
@@ -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/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
+with ownCloud server.
-source, currently hosted in the ownCloud source repo on gitorious.
 
-oCC is written in C++ using the `Qt Framework`_. As a result oCC runs on the
+ownCloud Client is written in C++ using the `Qt Framework`_. As a result, the
-three important platforms Linux, Windows and MacOS.
+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
+First it is important to recall what syncing is: It tries to keep the files
-on both repositories the same. That means if a file is added to one repository
+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
+transmit in the Etag_ field. Since the file number is guaranteed to change if
-per-directory database, located in the application directory (version 1.1) or
+the file changes, it can now be used to determine if one of the files has
-as a hidden file right in the directory to be synced (later versions).
+changed.
-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.
 
-If the per-directory database gets removed, oCC's CSync backend will fall back
+Before the 1.3.0 release of the client the sync process might create faux
-to a time-stamp based sync process to rebuild the database. Thus it should be
+conflict files if time deviates. The original and the conflict files only
-made sure that both server and client synchronized to NTP time before
+differed in the timestamp, but not in content. This behaviour was changed
-restarting the client after a database removal. If time deviates, the sync
+towards a binary check if the files are different.
-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,5 +1,7 @@
-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
@@ -37,7 +39,7 @@ Next, install the missing dependencies::
   brew install $(brew deps ocsync)
   brew install $(brew deps mirall)
 
-To build mirall and cmake, follow the `generic build instructions`_.
+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

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
@@ -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
+   introduction
-   usage 
+   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``
+``--confdir`` `<dirname>`
-        Use black/white pictograms for systray.
+        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,14 +1,15 @@
-Troubleshooting
+Appendix C: Troubleshooting
-===============
+===========================
 
 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.
 
-Here are a couple of useful steps to isolate the problem.
+Identifying basic functionality problems
+----------------------------------------
 
-:A general ownCloud Server test:
+: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
@@ -18,8 +19,12 @@ Here are a couple of useful steps to isolate the problem.
   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.
 
-:All desktop clients fail to connect to ownCloud:
+:Ensure the WebDAV API is working:
-  The ownCloud syncing use the built in WebDAV server of ownCloud. 
+  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
@@ -31,21 +36,50 @@ Here are a couple of useful steps to isolate the problem.
 
 :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
+  into the ownCloud WebDAV server, such as a little app called cadaver,
-  on Linux. It can be used to further verify that the WebDAV server is running
+  available on Linux. It can be used to further verify that the WebDAV server is
-  properly, for example by performing PROPFIND calls:
+  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.
 
-Logfiles
+Isolating other issues
-========
+----------------------
 
-Doing effective debugging requires to provide as much as relevant logfiles as
+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:
+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.
@@ -57,23 +91,41 @@ starting the client again with this parameter. Syntax:
   * Mac OS X: ``/Applications/owncloud.app/Contents/MacOS/owncloud --logwindow``
   * Linux: ``owncloud --logwindow``
 
-It is also possible to directly log into a file, which is an useful option
+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 logfile than piping the whole log through the log window.
+create a huge amount of data, as the log window has a limited buffer.
 
-To create a log file, start the client with ``--logfile <filename>``.
+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
+~~~~~~~~~~~~~~~~~~~~~~~
 
-: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 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:
+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
+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
@@ -82,4 +134,3 @@ log line contains a lot of information of every request and it's result.
 More information about the apache logging can be found at
 ``http://httpd.apache.org/docs/current/logs.html``.
 
- 

doc/usage.rst

@@ -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,178 @@
+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 Protocol, 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 Protocol
+~~~~~~~~~~~~~~~~~
+
+.. index:: sync protocol
+
+The ``Sync Protocol`` 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%
+
+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`
+Please use Gist (https://gist.github.com/) or a similar code paster for longer
-```
+logs.
-Insert your log output here
-```
 
-#### Web server error log
+```Template for output < 10 lines```
-```
-Insert your webserver log here
-```
 
-#### ownCloud log (data/owncloud.log)
+1. Output of `owncloud --logwindow` or `owncloud --logfile log.txt`
-```
+
-Insert your ownCloud log here
+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

@@ -9,6 +9,9 @@
         <file>resources/folder-grey.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/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/CMakeLists.txt

@@ -11,16 +11,22 @@ else()
     set(theme_dir ${CMAKE_CURRENT_SOURCE_DIR}/../theme)
 endif()
 
+set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
+
 set(mirall_UI
 mirall/folderwizardsourcepage.ui
 mirall/folderwizardtargetpage.ui
-mirall/statusdialog.ui
-mirall/owncloudsetuppage_ng.ui
-mirall/owncloudwizardresultpage.ui
-mirall/owncloudcredentialspage.ui
 mirall/sslerrordialog.ui
-mirall/proxydialog.ui
+mirall/settingsdialog.ui
-mirall/fileitemdialog.ui
+mirall/generalsettings.ui
+mirall/networksettings.ui
+mirall/accountsettings.ui
+mirall/ignorelisteditor.ui
+mirall/itemprogressdialog.ui
+wizard/owncloudsetupnocredspage.ui
+wizard/owncloudhttpcredspage.ui
+wizard/owncloudwizardresultpage.ui
+wizard/owncloudadvancedsetuppage.ui
 )
 
 set(3rdparty_SRC
@@ -63,8 +69,6 @@ set(libsync_SRCS
     mirall/syncresult.cpp
     mirall/networklocation.cpp
     mirall/mirallconfigfile.cpp
-    mirall/credentialstore.cpp
-    mirall/owncloudfolder.cpp
     mirall/csyncthread.cpp
     mirall/fileutils.cpp
     mirall/theme.cpp
@@ -73,17 +77,47 @@ set(libsync_SRCS
     mirall/logger.cpp
     mirall/utility.cpp
     mirall/connectionvalidator.cpp
+    mirall/progressdispatcher.cpp
+    mirall/mirallaccessmanager.cpp
+    creds/dummycredentials.cpp
+    creds/httpcredentials.cpp
+    creds/credentialsfactory.cpp
+    creds/http/credentialstore.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
 )
+
 set(libsync_HEADERS
     mirall/folderman.h
     mirall/folder.h
     mirall/folderwatcher.h
-    mirall/owncloudfolder.h
     mirall/csyncthread.h
+    mirall/theme.h
+    mirall/owncloudtheme.h
     mirall/owncloudinfo.h
-    mirall/credentialstore.h
     mirall/logger.h
     mirall/connectionvalidator.h
+    mirall/progressdispatcher.h
+    mirall/mirallaccessmanager.h
+    creds/abstractcredentials.h
+    creds/dummycredentials.h
+    creds/httpcredentials.h
+    creds/credentialsfactory.h
+    creds/http/credentialstore.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
 )
 
 IF( INOTIFY_FOUND )
@@ -114,46 +148,56 @@ if(QTKEYCHAIN_FOUND)
     include_directories(${QTKEYCHAIN_INCLUDE_DIR})
 endif()
 
-add_library(owncloudsync SHARED ${libsync_SRCS} ${syncMoc})
+add_library(${synclib_NAME} SHARED ${libsync_SRCS} ${syncMoc})
-set_target_properties( owncloudsync  PROPERTIES
+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
-		${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_SHORTNAME}.desktop)
+		${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}.desktop)
-        install(FILES  ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_SHORTNAME}.desktop DESTINATION share/applications )
+        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_SRCS
     mirall/application.cpp
     mirall/systray.cpp
     mirall/folderwizard.cpp
-    mirall/statusdialog.cpp
+    mirall/folderstatusmodel.cpp
-    mirall/owncloudwizard.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/settingsdialog.cpp
-    mirall/fileitemdialog.cpp
+    mirall/generalsettings.cpp
+    mirall/networksettings.cpp
+    mirall/accountsettings.cpp
+    mirall/ignorelisteditor.cpp
+    mirall/itemprogressdialog.cpp
 )
 
 set(mirall_HEADERS
@@ -161,13 +205,23 @@ set(mirall_HEADERS
     mirall/systray.h
     mirall/folderwizard.h
     mirall/owncloudsetupwizard.h
-    mirall/owncloudwizard.h
+    wizard/owncloudwizard.h
-    mirall/statusdialog.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/settingsdialog.h
-    mirall/fileitemdialog.h
+    mirall/generalsettings.h
+    mirall/networksettings.h
+    mirall/accountsettings.h
+    mirall/ignorelisteditor.h
+    mirall/itemprogressdialog.h
 )
 
 if( UNIX AND NOT APPLE)
@@ -200,7 +254,7 @@ set( final_src
 include( AddAppIconMacro )
 set(ownCloud_old ${ownCloud})
 
-kde4_add_app_icon( ownCloud "${theme_dir}/colored/${APPLICATION_SHORTNAME}-icon*.png")
+kde4_add_app_icon( ownCloud "${theme_dir}/colored/${APPLICATION_EXECUTABLE}-icon*.png")
 list(APPEND final_src ${ownCloud})
 set(ownCloud ${ownCloud_old})
 
@@ -208,12 +262,15 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
     set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 if(NOT WIN32)
-    install(FILES
+    file( GLOB _icons "${theme_dir}/colored/${APPLICATION_EXECUTABLE}-icon-*.png" )
-        ${theme_dir}/colored/${APPLICATION_SHORTNAME}-icon-48.png 
+    foreach( _file ${_icons} )
-        DESTINATION share/icons/hicolor/48x48/apps/ RENAME ${APPLICATION_SHORTNAME}.png)
+        string( REPLACE "${theme_dir}/colored/${APPLICATION_EXECUTABLE}-icon-" "" _res ${_file} )
+        string( REPLACE ".png" "" _res ${_res} )
+        install( FILES ${_file} RENAME ${APPLICATION_EXECUTABLE}.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
 
@@ -251,7 +308,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}

src/creds/abstractcredentials.h

@@ -0,0 +1,47 @@
+/*
+ * 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;
+
+namespace Mirall
+{
+
+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 QNetworkAccessManager* getQNAM() const = 0;
+  virtual bool ready() const = 0;
+  virtual void fetch() = 0;
+  virtual void persistForUrl(const QString& url) = 0;
+
+Q_SIGNALS:
+  void fetched();
+};
+
+} // ns Mirall
+
+#endif

src/creds/credentialscommon.cpp

@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) by Duncan Mac-Vicar P. <duncan@kde.org>
+ * 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 "creds/credentialscommon.h"
+
+#include "mirall/utility.h"
+#include "mirall/owncloudinfo.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 = ownCloudInfo::instance()->certificateChain();
+
+        while (!certOk && (pos = regexp.indexIn(qPrompt, 1+pos)) != -1) {
+            QString neon_fingerprint = regexp.cap(1);
+
+            foreach( const QSslCertificate& c, certs ) {
+                QString verified_shasum = Utility::formatFingerprint(c.digest(QCryptographicHash::Sha1).toHex());
+                qDebug() << "SSL Fingerprint from neon: " << neon_fingerprint << " compared to verified: " << verified_shasum;
+                if( verified_shasum == neon_fingerprint ) {
+                    certOk = true;
+                    break;
+                }
+            }
+        }
+        // certOk = false;     DEBUG setting, keep disabled!
+        if( !certOk ) { // Problem!
+            qstrcpy( buf, "no" );
+            re = -1;
+        } else {
+            qstrcpy( buf, "yes" ); // Certificate is fine!
+        }
+    } else {
+        qDebug() << "Unknown prompt: <" << prompt << ">";
+        re = -1;
+    }
+    return re;
+}
+
+} // ns Mirall

src/creds/credentialscommon.h

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) by Duncan Mac-Vicar P. <duncan@kde.org>
+ * 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,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 "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");
+}
+
+QNetworkAccessManager* DummyCredentials::getQNAM() const
+{
+    return new MirallAccessManager;
+}
+
+bool DummyCredentials::ready() const
+{
+    return true;
+}
+
+void DummyCredentials::fetch()
+{
+    Q_EMIT(fetched());
+}
+
+void DummyCredentials::persistForUrl(const QString&)
+{}
+
+} // ns Mirall

src/creds/dummycredentials.h

@@ -0,0 +1,39 @@
+/*
+ * 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;
+  QNetworkAccessManager* getQNAM() const;
+  bool ready() const;
+  void fetch();
+  void persistForUrl(const QString& url);
+};
+
+} // ns Mirall
+
+#endif

src/creds/http/credentialstore.cpp

@@ -16,8 +16,8 @@
 
 #include "config.h"
 
-#include "mirall/credentialstore.h"
+#include "creds/http/credentialstore.h"
-#include "mirall/mirallconfigfile.h"
+#include "creds/http/httpconfigfile.h"
 #include "mirall/theme.h"
 
 #ifdef WITH_QTKEYCHAIN
@@ -35,7 +35,6 @@ QString CredentialStore::_passwd   = QString::null;
 QString CredentialStore::_user     = QString::null;
 QString CredentialStore::_url      = QString::null;
 QString CredentialStore::_errorMsg = QString::null;
-int     CredentialStore::_tries    = 0;
 #ifdef WITH_QTKEYCHAIN
 CredentialStore::CredentialType CredentialStore::_type = KeyChain;
 #else
@@ -67,42 +66,14 @@ CredentialStore::CredState CredentialStore::state()
     return _state;
 }
 
-bool CredentialStore::canTryAgain()
-{
-    bool canDoIt = false;
-
-    if( _tries > MAX_LOGIN_ATTEMPTS ) {
-        qDebug() << "canTryAgain: Max attempts reached.";
-        return false;
-    }
-
-    /* Since QtKeyChain is required now, it makes to only
-     * query once. */
-    if( _state == NotFetched || _state == AsyncWriting ) {
-        return true;
-    } else {
-        return false;
-    }
-
-}
-
 void CredentialStore::fetchCredentials()
 {
-    MirallConfigFile cfgFile;
+    HttpConfigFile cfgFile;
-    if( ++_tries > MAX_LOGIN_ATTEMPTS ) {
-        qDebug() << "Too many attempts to enter password!";
-        _state = TooManyAttempts;
-        emit( fetchCredentialsFinished(false) );
-        return;
-    }
 
     bool ok = false;
     QString pwd;
-    _user = cfgFile.ownCloudUser();
+    _user = cfgFile.user();
     _url  = cfgFile.ownCloudUrl();
-    if( !cfgFile.passwordStorageAllowed() ) {
-        _type = CredentialStore::User;
-    }
 
     QString key = keyChainKey(_url);
 
@@ -114,26 +85,17 @@ void CredentialStore::fetchCredentials()
     }
 
     switch( _type ) {
-    case CredentialStore::User: {
-        /* Ask the user for the password */
-        /* Fixme: Move user interaction out here. */
-        _state = AsyncFetching;
-        _inputDialog = new QInputDialog;
-        _inputDialog->setWindowTitle(QApplication::translate("MirallConfigFile","Password Required") );
-        _inputDialog->setLabelText( QApplication::translate("MirallConfigFile","Please enter your %1 password:")
-                .arg(Theme::instance()->appNameGUI()));
-        _inputDialog->setInputMode( QInputDialog::TextInput );
-        _inputDialog->setTextEchoMode( QLineEdit::Password );
-
-        connect(_inputDialog, SIGNAL(finished(int)), SLOT(slotUserDialogDone(int)));
-        _inputDialog->exec();
-        break;
-    }
     case CredentialStore::Settings: {
         /* Read from config file. */
         _state = Fetching;
-        pwd = cfgFile.ownCloudPasswd();
+        cfgFile.fixupOldPassword();
-        ok = true;
+        if( cfgFile.passwordExists() ) {
+            pwd = cfgFile.password();
+            ok = true;
+        } else {
+            ok = false;
+            _state = EntryNotFound;
+        }
         break;
     }
     case CredentialStore::KeyChain: {
@@ -180,25 +142,11 @@ void CredentialStore::fetchCredentials()
     }
 }
 
-void CredentialStore::slotUserDialogDone( int result )
-{
-    if( result == QDialog::Accepted ) {
-        _passwd = _inputDialog->textValue();
-        _state = Ok;
-    } else {
-        _state = UserCanceled;
-        _passwd = QString::null;
-    }
-    _inputDialog->deleteLater();
-    emit(fetchCredentialsFinished(_state == Ok));
-}
-
 void CredentialStore::reset()
 {
     _state = NotFetched;
     _user   = QString::null;
     _passwd = QString::null;
-    _tries = 0;
 }
 
 QString CredentialStore::keyChainKey( const QString& url ) const
@@ -245,9 +193,6 @@ void CredentialStore::slotKeyChainReadFinished(QKeychain::Job* job)
         case QKeychain::CouldNotDeleteEntry:
             _state = Error;
             break;
-        case QKeychain::AccessDeniedByUser:
-           _state = AccessDeniedByUser;
-            break;
         case QKeychain::AccessDenied:
             _state = AccessDenied;
             break;
@@ -296,43 +241,36 @@ QString CredentialStore::errorMessage()
 }
 
 void CredentialStore::setCredentials( const QString& url, const QString& user,
-                                      const QString& pwd, bool allowToStore )
+                                      const QString& pwd )
 {
     _passwd = pwd;
     _user = user;
-    if( allowToStore ) {
 #ifdef WITH_QTKEYCHAIN
-        _type = KeyChain;
+     _type = KeyChain;
 #else
-        _type = Settings;
+     _type = Settings;
 #endif
-    } else {
-        _type = User;
-    }
     _url  = url;
     _state = Ok;
 }
 
 void CredentialStore::saveCredentials( )
 {
-    MirallConfigFile cfgFile;
+    HttpConfigFile cfgFile;
     QString key = keyChainKey(_url);
     if( key.isNull() ) {
         qDebug() << "Error: Can not save credentials, URL is zero!";
         return;
     }
 #ifdef WITH_QTKEYCHAIN
-    WritePasswordJob *job = NULL;
 #endif
 
+    cfgFile.setUser(_user);
     switch( _type ) {
-    case CredentialStore::User:
+    case CredentialStore::KeyChain: {
-        deleteKeyChainCredential( key );
-        break;
-    case CredentialStore::KeyChain:
 #ifdef WITH_QTKEYCHAIN
+        WritePasswordJob *job = new WritePasswordJob(Theme::instance()->appName());
         // Set password in KeyChain
-        job = new WritePasswordJob(Theme::instance()->appName());
         job->setKey( key );
         job->setTextData(_passwd);
 
@@ -341,9 +279,10 @@ void CredentialStore::saveCredentials( )
         _state = AsyncWriting;
         job->start();
 #endif
+        }
         break;
     case CredentialStore::Settings:
-        cfgFile.writePassword( _passwd );
+        cfgFile.setPassword( _passwd );
         reset();
         break;
     default:
@@ -363,19 +302,18 @@ void CredentialStore::slotKeyChainWriteFinished( QKeychain::Job *job )
             qDebug() << "Error with keychain: " << pwdJob->errorString();
             if( err == NoBackendAvailable || err == NotImplemented ||
                     pwdJob->errorString().contains(QLatin1String("Could not open wallet"))) {
+                _state = NoKeychainBackend;
                 _type = Settings;
                 saveCredentials();
-                _state = NoKeychainBackend;
             } else {
                 _state = Error;
             }
         } else {
             qDebug() << "Successfully stored password for user " << _user;
             // Try to remove password formerly stored in the config file.
-            MirallConfigFile cfgFile;
+            HttpConfigFile cfgFile;
-            cfgFile.clearPasswordFromConfig();
+            cfgFile.removePassword();
             _state = NotFetched;
-            _tries = 0;
         }
     } else {
         qDebug() << "Error: KeyChain Write Password Job failed!";

src/creds/http/credentialstore.h

@@ -34,10 +34,8 @@ namespace Mirall {
  * The fetchCredentials() call changes the internal state of the credential store
  * to one of
  *   Ok: There are credentials. Note that it's unknown if they are correct!!
- *   UserCanceled: The fetching involved user interaction and the user canceled
- *                 the operation. No valid credentials are there.
- *   TooManyAttempts: The user tried to often to enter a password.
  *   Fetching: The fetching is not yet finished.
+ *   EntryNotFound: No password entry found in the storage.
  *   Error:    A general error happened.
  * After fetching has finished, signal fetchCredentialsFinished(bool) is emitted.
  * The result can be retrieved with state() and password() and user() methods.
@@ -49,20 +47,16 @@ class CredentialStore : public QObject
 public:
     enum CredState { NotFetched = 0,
                      Ok,
-                     UserCanceled,
                      Fetching,
                      AsyncFetching,
                      EntryNotFound,
-                     AccessDeniedByUser,
                      AccessDenied,
                      NoKeychainBackend,
                      Error,
-                     AsyncWriting,
+                     AsyncWriting        };
-                     TooManyAttempts };
 
     enum CredentialType {
-        User = 0,
+        Settings = 0,
-        Settings,
         KeyChain
     };
 
@@ -97,19 +91,13 @@ public:
      * The function also sets the state to ok.
      * @param url - the connection url
      * @param user - the user name
-     * @param password - the password.
      */
-    void setCredentials( const QString&, const QString&, const QString&, bool );
+    void setCredentials( const QString& url, const QString& user, const QString& pwd);
 
     void saveCredentials( );
 
     QString errorMessage();
 
-    /**
-     * @brief canTryAgain - check if another try to get credentials makes sense.
-    */
-    bool canTryAgain();
-
     void reset();
 signals:
     /**
@@ -125,7 +113,6 @@ signals:
 protected slots:
     void slotKeyChainReadFinished( QKeychain::Job* );
     void slotKeyChainWriteFinished( QKeychain::Job* );
-    void slotUserDialogDone(int);
 
 private:
     explicit CredentialStore(QObject *parent = 0);
@@ -138,9 +125,7 @@ private:
     static QString _user;
     static QString _url;
     static QString _errorMsg;
-    static int     _tries;
     static CredentialType _type;
-    QInputDialog   *_inputDialog;
 };
 }
 

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,218 @@
+/*
+ * Copyright (C) by Duncan Mac-Vicar P. <duncan@kde.org>
+ * 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 "creds/httpcredentials.h"
+#include "mirall/owncloudinfo.h"
+#include "mirall/mirallconfigfile.h"
+#include "mirall/mirallaccessmanager.h"
+#include "mirall/utility.h"
+#include "creds/http/credentialstore.h"
+#include "creds/credentialscommon.h"
+
+namespace Mirall
+{
+
+namespace
+{
+
+int getauth(const char *prompt,
+            char *buf,
+            size_t len,
+            int echo,
+            int verify,
+            void *userdata)
+{
+    int re = 0;
+    QMutex mutex;
+    MirallConfigFile cfg;
+    HttpCredentials* http_credentials = dynamic_cast< HttpCredentials* > (cfg.getCredentials());
+
+    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;
+}
+
+} // ns
+
+HttpCredentials::HttpCredentials()
+    : _user(),
+      _password(),
+      _ready(false),
+      _attempts()
+{}
+
+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(ownCloudInfo::instance()->getLastAuthCookies());
+    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 MirallAccessManager;
+
+    connect( qnam, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
+             this, SLOT(slotAuthentication(QNetworkReply*,QAuthenticator*)));
+
+    return qnam;
+}
+
+bool HttpCredentials::ready() const
+{
+    return _ready;
+}
+
+void HttpCredentials::fetch()
+{
+    if (_ready) {
+        Q_EMIT fetched();
+    } else {
+        // TODO: merge CredentialStore into HttpCredentials?
+        CredentialStore* store(CredentialStore::instance());
+        connect(store, SIGNAL(fetchCredentialsFinished(bool)),
+                this, SLOT(slotCredentialsFetched(bool)));
+        store->fetchCredentials();
+    }
+}
+
+void HttpCredentials::persistForUrl(const QString& url)
+{
+    CredentialStore* store(CredentialStore::instance());
+    store->setCredentials(url, _user, _password);
+    store->saveCredentials();
+}
+
+void HttpCredentials::slotCredentialsFetched(bool ok)
+{
+    _ready = ok;
+    if (_ready) {
+        CredentialStore* store(CredentialStore::instance());
+        _user = store->user();
+        _password = store->password();
+    }
+    Q_EMIT fetched();
+}
+
+void HttpCredentials::slotAuthentication(QNetworkReply* reply, QAuthenticator* authenticator)
+{
+    if( !(authenticator && reply) ) return;
+
+    qDebug() << "Authenticating request for " << reply->url();
+
+    if (_attempts.contains(reply)) {
+        ++_attempts[reply];
+    } else {
+        connect(reply, SIGNAL(finished()),
+                this, SLOT(slotReplyFinished()));
+        _attempts[reply] = 1;
+    }
+    // TODO: Replace it with something meaningful...
+    //if( reply->url().toString().startsWith( webdavUrl( _connection ) ) ) {
+    if (_attempts[reply] > 1) {
+        qDebug() << "Too many attempts to authenticate. Stop request.";
+        reply->close();
+    } else {
+        authenticator->setUser( _user );
+        authenticator->setPassword( _password );
+    }
+    //} else {
+    //    qDebug() << "WRN: attempt to authenticate to different url - closing.";
+    // reply->close();
+    //}
+}
+
+void HttpCredentials::slotReplyFinished()
+{
+    QNetworkReply* reply = qobject_cast< QNetworkReply* >(sender());
+
+    disconnect(reply, SIGNAL(finished()),
+               this, SLOT(slotReplyFinished()));
+    _attempts.remove (reply);
+}
+
+} // ns Mirall

src/creds/httpcredentials.h

@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) by Duncan Mac-Vicar P. <duncan@kde.org>
+ * 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 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();
+  void persistForUrl(const QString& url);
+
+  QString user() const;
+  QString password() const;
+
+private Q_SLOTS:
+  void slotCredentialsFetched(bool);
+  void slotAuthentication(QNetworkReply*, QAuthenticator*);
+  void slotReplyFinished();
+
+private:
+  QString _user;
+  QString _password;
+  bool _ready;
+  QMap<QNetworkReply*, int> _attempts;
+};
+
+} // ns Mirall
+
+#endif

src/creds/shibboleth/shibbolethaccessmanager.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 <QDebug>
+#include <QNetworkRequest>
+
+#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,52 @@
+/*
+ * 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 "creds/shibboleth/shibbolethrefresher.h"
+#include "creds/shibbolethcredentials.h"
+
+namespace Mirall
+{
+
+ShibbolethRefresher::ShibbolethRefresher(ShibbolethCredentials* creds, CSYNC* csync_ctx, QObject* parent)
+    : QObject(parent),
+      _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);
+    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,47 @@
+/*
+ * 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 ShibbolethCredentials;
+
+class ShibbolethRefresher : public QObject
+{
+    Q_OBJECT
+
+public:
+    ShibbolethRefresher(ShibbolethCredentials* creds, CSYNC* csync_ctx, QObject* parent = 0);
+
+    void refresh();
+
+private Q_SLOTS:
+    void onInvalidatedAndFetched(const QByteArray& cookieData);
+
+private:
+    ShibbolethCredentials* _creds;
+    CSYNC* _csync_ctx;
+};
+
+} // ns Mirall
+
+#endif

src/creds/shibboleth/shibbolethwebview.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 <QApplication>
+#include <QDebug>
+#include <QNetworkCookie>
+#include <QWebFrame>
+#include <QWebPage>
+
+#include "creds/shibboleth/shibbolethcookiejar.h"
+#include "creds/shibboleth/shibbolethwebview.h"
+#include "mirall/mirallaccessmanager.h"
+
+namespace Mirall
+{
+
+void ShibbolethWebView::setup(const QUrl& url, ShibbolethCookieJar* jar)
+{
+    MirallAccessManager* nm = new MirallAccessManager(this);
+    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()));
+
+    nm->setCookieJar(jar);
+    page->setNetworkAccessManager(nm);
+    page->mainFrame ()->load (url);
+    this->setPage (page);
+}
+
+ShibbolethWebView::ShibbolethWebView(const QUrl& url, QWidget* parent)
+  : QWebView(parent)
+{
+    setup(url, new ShibbolethCookieJar(this));
+}
+
+ShibbolethWebView::~ShibbolethWebView()
+{
+    slotLoadFinished();
+}
+
+ShibbolethWebView::ShibbolethWebView(const QUrl& url, ShibbolethCookieJar* jar, QWidget* parent)
+  : QWebView(parent)
+{
+    setup(url, 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()
+{
+    QApplication::restoreOverrideCursor();
+}
+
+} // ns Mirall

src/creds/shibboleth/shibbolethwebview.h

@@ -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.
+ */
+
+#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 ShibbolethWebView : public QWebView
+{
+  Q_OBJECT
+
+public:
+  ShibbolethWebView(const QUrl& url, QWidget* parent = 0);
+  ShibbolethWebView(const QUrl& url, 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();
+
+private:
+  void setup(const QUrl& url, ShibbolethCookieJar* jar);
+};
+
+} // ns Mirall
+
+#endif

src/creds/shibbolethcredentials.cpp

@@ -0,0 +1,231 @@
+/*
+ * 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 "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/owncloudinfo.h"
+#include "mirall/mirallconfigfile.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);
+    MirallConfigFile cfg;
+    ShibbolethCredentials* creds = dynamic_cast< ShibbolethCredentials* > (cfg.getCredentials());
+
+    if (!creds) {
+      qDebug() << "Not a Shibboleth creds instance!";
+      return 1;
+    }
+
+    ShibbolethRefresher refresher(creds, csync_ctx);
+
+    // blocks
+    refresher.refresh();
+
+    return creds->ready() ? 0 : 1;
+}
+
+} // ns
+
+ShibbolethCredentials::ShibbolethCredentials()
+    : _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(ownCloudInfo::instance()->getLastAuthCookies());
+    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");
+}
+
+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()
+{
+    if (_ready) {
+        Q_EMIT fetched();
+    } else {
+        ShibbolethConfigFile cfg;
+
+        _browser = new ShibbolethWebView(QUrl(cfg.ownCloudUrl()), cfg.createCookieJar());
+        connect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie)),
+                this, SLOT(onShibbolethCookieReceived(QNetworkCookie)));
+        connect(_browser, SIGNAL(viewHidden()),
+                this, SLOT(slotBrowserHidden()));
+        _browser->show ();
+    }
+}
+
+void ShibbolethCredentials::persistForUrl(const QString& /*url*/)
+{
+    ShibbolethConfigFile cfg;
+
+    cfg.storeCookies(_otherCookies);
+}
+
+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()
+{
+    _ready = false;
+    connect (this, SIGNAL(fetched()),
+             this, SLOT(onFetched()));
+    fetch();
+}
+
+void ShibbolethCredentials::onFetched()
+{
+    disconnect (this, SIGNAL(fetched()),
+                this, SLOT(onFetched()));
+
+    Q_EMIT invalidatedAndFetched(prepareCookieData());
+}
+
+} // ns Mirall

src/creds/shibbolethcredentials.h

@@ -0,0 +1,72 @@
+/*
+ * 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_CREDENTIALS_H
+#define MIRALL_CREDS_SHIBBOLETH_CREDENTIALS_H
+
+#include <QList>
+#include <QMap>
+#include <QNetworkCookie>
+#include <QUrl>
+
+#include "creds/abstractcredentials.h"
+
+namespace Mirall
+{
+
+class ShibbolethWebView;
+
+class ShibbolethCredentials : public AbstractCredentials
+{
+Q_OBJECT
+
+public:
+    ShibbolethCredentials();
+    ShibbolethCredentials(const QNetworkCookie& cookie, const QMap<QUrl, QList<QNetworkCookie> >& otherCookies);
+
+    void syncContextPreInit(CSYNC* ctx);
+    void syncContextPreStart(CSYNC* ctx);
+    bool changed(AbstractCredentials* credentials) const;
+    QString authType() const;
+    QNetworkAccessManager* getQNAM() const;
+    bool ready() const;
+    void fetch();
+    void persistForUrl(const QString& url);
+
+    QNetworkCookie cookie() const;
+
+public Q_SLOTS:
+    void invalidateAndFetch();
+
+private Q_SLOTS:
+    void onShibbolethCookieReceived(const QNetworkCookie& cookie);
+    void slotBrowserHidden();
+    void onFetched();
+
+Q_SIGNALS:
+    void newCookie(const QNetworkCookie& cookie);
+    void invalidatedAndFetched(const QByteArray& cookieData);
+
+private:
+    QByteArray prepareCookieData() const;
+    void disposeBrowser();
+
+    QNetworkCookie _shibCookie;
+    bool _ready;
+    ShibbolethWebView* _browser;
+    QMap<QUrl, QList<QNetworkCookie> > _otherCookies;
+};
+
+} // ns Mirall
+
+#endif

src/main.cpp

@@ -13,6 +13,9 @@
  */
 
 #include "mirall/application.h"
+#include "mirall/theme.h"
+
+#include <QMessageBox>
 
 int main(int argc, char **argv)
 {
@@ -21,6 +24,11 @@ int main(int argc, char **argv)
     Mirall::Application app(argc, argv);
     app.initialize();
 
+    if( app.giveHelp() ) {
+        app.showHelp();
+        return 0;
+    }
+
     // if the application is already running, notify it.
     if( app.isRunning() ) {
         QStringList args = app.arguments();
@@ -30,12 +38,16 @@ int main(int argc, char **argv)
                 return -1;
         }
         return 0;
-    }
-    // if help requested, show on command line and exit.
-    if( ! app.giveHelp() ) {
-        return app.exec();
     } else {
-        app.showHelp();
+        if (!QSystemTrayIcon::isSystemTrayAvailable() && qgetenv("DESKTOP_SESSION") != "ubuntu") {
+            QMessageBox::critical(0, qApp->translate("main.cpp", "System Tray not available"),
+                                  qApp->translate("main.cpp", "%1 requires on a working system tray. "
+                                  "If you are running XFCE, please follow "
+                                  "<a href=\"http://docs.xfce.org/xfce/xfce4-panel/systray\">these instructions</a>. "
+                                  "Otherwise, please install a system tray application such as 'trayer' and try again.")
+                    .arg(Mirall::Theme::instance()->appNameGUI()));
+        }
     }
+    return app.exec();
 }
 

src/mirall/accountsettings.cpp

@@ -0,0 +1,714 @@
+/*
+ * Copyright (C) by Daniel Molkentin <danimo@owncloud.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; 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 "accountsettings.h"
+#include "ui_accountsettings.h"
+
+#include "mirall/theme.h"
+#include "mirall/folderman.h"
+#include "mirall/owncloudinfo.h"
+#include "mirall/folderwizard.h"
+#include "mirall/folderstatusmodel.h"
+#include "mirall/utility.h"
+#include "mirall/application.h"
+#include "mirall/owncloudsetupwizard.h"
+#include "mirall/mirallconfigfile.h"
+#include "mirall/ignorelisteditor.h"
+#include "mirall/itemprogressdialog.h"
+
+#include <math.h>
+
+#include <QDebug>
+#include <QDesktopServices>
+#include <QListWidgetItem>
+#include <QMessageBox>
+#include <QAction>
+#include <QKeySequence>
+
+namespace Mirall {
+
+static const char progressBarStyleC[] =
+        "QProgressBar {"
+        "border: 1px solid grey;"
+        "border-radius: 5px;"
+        "text-align: center;"
+        "}"
+        "QProgressBar::chunk {"
+        "background-color: %1; width: 1px;"
+        "}";
+
+AccountSettings::AccountSettings(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::AccountSettings),
+    _item(0)
+{
+    ui->setupUi(this);
+
+    _model = new FolderStatusModel;
+    _model->setParent(this);
+    FolderStatusDelegate *delegate = new FolderStatusDelegate;
+    delegate->setParent(this);
+
+    ui->_folderList->setItemDelegate( delegate );
+    ui->_folderList->setModel( _model );
+    ui->_folderList->setMinimumWidth( 300 );
+    ui->_folderList->setEditTriggers( QAbstractItemView::NoEditTriggers );
+
+    ui->_ButtonRemove->setEnabled(false);
+    ui->_ButtonEnable->setEnabled(false);
+    ui->_ButtonInfo->setEnabled(false);
+    ui->_ButtonAdd->setEnabled(true);
+
+    QAction *resetFolderAction = new QAction(this);
+    resetFolderAction->setShortcut(QKeySequence(Qt::Key_F5));
+    connect(resetFolderAction, SIGNAL(triggered()), SLOT(slotResetCurrentFolder()));
+    addAction(resetFolderAction);
+
+    connect(ui->_ButtonRemove, SIGNAL(clicked()), this, SLOT(slotRemoveCurrentFolder()));
+    connect(ui->_ButtonEnable, SIGNAL(clicked()), this, SLOT(slotEnableCurrentFolder()));
+    connect(ui->_ButtonInfo,   SIGNAL(clicked()), this, SLOT(slotInfoAboutCurrentFolder()));
+    connect(ui->_ButtonAdd,    SIGNAL(clicked()), this, SLOT(slotAddFolder()));
+    connect(ui->modifyAccountButton, SIGNAL(clicked()), SLOT(slotOpenAccountWizard()));
+    connect(ui->ignoredFilesButton, SIGNAL(clicked()), SLOT(slotIgnoreFilesEditor()));;
+
+    connect(ui->_folderList, SIGNAL(clicked(QModelIndex)), SLOT(slotFolderActivated(QModelIndex)));
+    connect(ui->_folderList, SIGNAL(doubleClicked(QModelIndex)),SLOT(slotDoubleClicked(QModelIndex)));
+
+    QColor color = palette().highlight().color();
+    ui->quotaProgressBar->setStyleSheet(QString::fromLatin1(progressBarStyleC).arg(color.name()));
+    ownCloudInfo *ocInfo = ownCloudInfo::instance();
+    slotUpdateQuota(ocInfo->lastQuotaTotalBytes(), ocInfo->lastQuotaUsedBytes());
+    connect(ocInfo, SIGNAL(quotaUpdated(qint64,qint64)), SLOT(slotUpdateQuota(qint64,qint64)));
+
+    ui->connectLabel->setWordWrap( true );
+
+    setFolderList(FolderMan::instance()->map());
+
+    slotCheckConnection();
+}
+
+void AccountSettings::slotFolderActivated( const QModelIndex& indx )
+{
+  bool state = indx.isValid();
+
+  ui->_ButtonRemove->setEnabled( state );
+  ui->_ButtonEnable->setEnabled( state );
+  ui->_ButtonInfo->setEnabled( state );
+
+  if ( state ) {
+    bool folderEnabled = _model->data( indx, FolderStatusDelegate::FolderSyncEnabled).toBool();
+    qDebug() << "folder is sync enabled: " << folderEnabled;
+    if ( folderEnabled ) {
+      ui->_ButtonEnable->setText( tr( "Pause" ) );
+    } else {
+      ui->_ButtonEnable->setText( tr( "Resume" ) );
+    }
+  }
+}
+
+
+
+void AccountSettings::slotAddFolder()
+{
+    FolderMan *folderMan = FolderMan::instance();
+    folderMan->setSyncEnabled(false); // do not start more syncs.
+
+    FolderWizard *folderWizard = new FolderWizard(this);
+    Folder::Map folderMap = folderMan->map();
+    folderWizard->setFolderMap( folderMap );
+
+    connect(folderWizard, SIGNAL(accepted()), SLOT(slotFolderWizardAccepted()));
+    connect(folderWizard, SIGNAL(rejected()), SLOT(slotFolderWizardRejected()));
+    folderWizard->open();
+}
+
+
+void AccountSettings::slotFolderWizardAccepted()
+{
+    FolderWizard *folderWizard = qobject_cast<FolderWizard*>(sender());
+    FolderMan *folderMan = FolderMan::instance();
+
+    qDebug() << "* Folder wizard completed";
+
+    QString alias        = folderWizard->field(QLatin1String("alias")).toString();
+    QString sourceFolder = folderWizard->field(QLatin1String("sourceFolder")).toString();
+    QString targetPath   = folderWizard->property("targetPath").toString();
+
+    if (!FolderMan::ensureJournalGone( sourceFolder ))
+        return;
+    folderMan->addFolderDefinition(alias, sourceFolder, targetPath );
+    Folder *f = folderMan->setupFolderFromConfigFile( alias );
+    slotAddFolder( f );
+    folderMan->setSyncEnabled(true);
+    if( f ) {
+        folderMan->slotScheduleAllFolders();
+        emit folderChanged();
+    }
+    buttonsSetEnabled();
+}
+
+void AccountSettings::slotFolderWizardRejected()
+{
+    qDebug() << "* Folder wizard cancelled";
+    FolderMan *folderMan = FolderMan::instance();
+    folderMan->setSyncEnabled(true);
+    folderMan->slotScheduleAllFolders();
+}
+
+void AccountSettings::slotOpenAccountWizard()
+{
+    this->topLevelWidget()->close();
+    OwncloudSetupWizard::runWizard(qApp, SLOT(slotownCloudWizardDone(int)), 0);
+}
+
+void AccountSettings::slotAddFolder( Folder *folder )
+{
+    if( ! folder || folder->alias().isEmpty() ) return;
+
+    QStandardItem *item = new QStandardItem();
+    folderToModelItem( item, folder );
+    _model->appendRow( item );
+    slotCheckConnection();
+}
+
+
+
+void AccountSettings::buttonsSetEnabled()
+{
+    bool haveFolders = ui->_folderList->model()->rowCount() > 0;
+
+    ui->_ButtonRemove->setEnabled(false);
+    if( Theme::instance()->singleSyncFolder() ) {
+        // only one folder synced folder allowed.
+        ui->_ButtonAdd->setVisible(!haveFolders);
+    } else {
+        ui->_ButtonAdd->setVisible(true);
+        ui->_ButtonAdd->setEnabled(true);
+    }
+
+    QModelIndex selected = ui->_folderList->currentIndex();
+    bool isSelected = selected.isValid();
+
+    ui->_ButtonEnable->setEnabled(isSelected);
+    ui->_ButtonRemove->setEnabled(isSelected);
+    ui->_ButtonInfo->setEnabled(isSelected);
+}
+
+void AccountSettings::setListWidgetItem( QListWidgetItem *item )
+{
+    _item = item;
+}
+
+void AccountSettings::folderToModelItem( QStandardItem *item, Folder *f )
+{
+    if( ! item || !f ) return;
+
+    item->setData( f->nativePath(),        FolderStatusDelegate::FolderPathRole );
+    item->setData( f->secondPath(),        FolderStatusDelegate::FolderSecondPathRole );
+    item->setData( f->alias(),             FolderStatusDelegate::FolderAliasRole );
+    item->setData( f->syncEnabled(),       FolderStatusDelegate::FolderSyncEnabled );
+
+    SyncResult res = f->syncResult();
+    SyncResult::Status status = res.status();
+
+    QStringList errorList = res.errorStrings();
+    QString errors;
+    if( ! errorList.isEmpty() ) {
+        errors = res.errorStrings().join(QLatin1String("<br/>"));
+    }
+
+    Theme *theme = Theme::instance();
+    item->setData( theme->statusHeaderText( status ),  Qt::ToolTipRole );
+    if( f->syncEnabled() ) {
+        item->setData( theme->syncStateIcon( status ), FolderStatusDelegate::FolderStatusIconRole );
+    } else {
+        item->setData( theme->folderDisabledIcon( ),   FolderStatusDelegate::FolderStatusIconRole ); // size 48 before
+    }
+    item->setData( theme->statusHeaderText( status ),  FolderStatusDelegate::FolderStatus );
+    item->setData( errors,                             FolderStatusDelegate::FolderErrorMsg );
+
+    if( errors.isEmpty() && (status == SyncResult::Error ||
+                             status == SyncResult::SetupError ||
+                             status == SyncResult::Unavailable )) {
+        item->setData( theme->statusHeaderText(status), FolderStatusDelegate::FolderErrorMsg);
+    }
+
+    bool ongoing = false;
+    item->setData( QVariant(res.warnCount()), FolderStatusDelegate::WarningCount );
+    if( status == SyncResult::SyncRunning ) {
+        ongoing = true;
+    }
+    item->setData( ongoing, FolderStatusDelegate::SyncRunning);
+
+}
+
+void AccountSettings::slotRemoveCurrentFolder()
+{
+    QModelIndex selected = ui->_folderList->selectionModel()->currentIndex();
+    if( selected.isValid() ) {
+        QString alias = _model->data( selected, FolderStatusDelegate::FolderAliasRole ).toString();
+        qDebug() << "Remove Folder alias " << alias;
+        if( !alias.isEmpty() ) {
+            // remove from file system through folder man
+            // _model->removeRow( selected.row() );
+            int ret = QMessageBox::question( this, tr("Confirm Folder Remove"),
+                                             tr("<p>Do you really want to stop syncing the folder <i>%1</i>?</p>"
+                                                "<p><b>Note:</b> This will not remove the files from your client.</p>").arg(alias),
+                                             QMessageBox::Yes|QMessageBox::No );
+
+            if( ret == QMessageBox::No ) {
+                return;
+            }
+            FolderMan *folderMan = FolderMan::instance();
+            folderMan->slotRemoveFolder( alias );
+            setFolderList(folderMan->map());
+            emit folderChanged();
+            slotCheckConnection();
+        }
+    }
+}
+void AccountSettings::slotResetCurrentFolder()
+{
+    QModelIndex selected = ui->_folderList->selectionModel()->currentIndex();
+    if( selected.isValid() ) {
+        QString alias = _model->data( selected, FolderStatusDelegate::FolderAliasRole ).toString();
+        int ret = QMessageBox::question( 0, tr("Confirm Folder Reset"),
+                                         tr("<p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p>"
+                                            "<p><b>Note:</b> This function is designed for maintenance purposes only. "
+                                            "No files will be removed, but this can cause significant data traffic and "
+                                            "take several minutes or hours to complete, depending on the size of the folder. "
+                                            "Only use this option if advised by your administrator.</p>").arg(alias),
+                                         QMessageBox::Yes|QMessageBox::No );
+        if( ret == QMessageBox::Yes ) {
+            FolderMan *folderMan = FolderMan::instance();
+            Folder *f = folderMan->folder(alias);
+            f->slotTerminateSync();
+            f->wipe();
+            folderMan->slotScheduleAllFolders();
+        }
+    }
+}
+
+void AccountSettings::slotDoubleClicked( const QModelIndex& indx )
+{
+    if( ! indx.isValid() ) return;
+    QString alias = _model->data( indx, FolderStatusDelegate::FolderAliasRole ).toString();
+
+    emit openFolderAlias( alias );
+}
+
+void AccountSettings::slotCheckConnection()
+{
+    if( ownCloudInfo::instance()->isConfigured() ) {
+        connect(ownCloudInfo::instance(), SIGNAL(ownCloudInfoFound(const QString&, const QString&, const QString&, const QString&)),
+                this, SLOT(slotOCInfo( const QString&, const QString&, const QString&, const QString& )));
+        connect(ownCloudInfo::instance(), SIGNAL(noOwncloudFound(QNetworkReply*)),
+                this, SLOT(slotOCInfoFail(QNetworkReply*)));
+
+        ui->connectLabel->setText( tr("Checking %1 connection...").arg(Theme::instance()->appNameGUI()));
+        qDebug() << "Check status.php from statusdialog.";
+        ownCloudInfo::instance()->checkInstallation();
+    } else {
+        // ownCloud is not yet configured.
+        ui->connectLabel->setText( tr("No %1 connection configured.").arg(Theme::instance()->appNameGUI()));
+        ui->_ButtonAdd->setEnabled( false);
+    }
+}
+
+void AccountSettings::setFolderList( const Folder::Map &folders )
+{
+    _model->clear();
+    foreach( Folder *f, folders ) {
+        qDebug() << "Folder: " << f;
+        slotAddFolder( f );
+    }
+
+    QModelIndex idx = _model->index(0, 0);
+    if (idx.isValid()) {
+        ui->_folderList->setCurrentIndex(idx);
+    }
+    buttonsSetEnabled();
+
+}
+
+// move from Application
+void AccountSettings::slotFolderOpenAction( const QString& alias )
+{
+    Folder *f = FolderMan::instance()->folder(alias);
+    qDebug() << "opening local url " << f->path();
+    if( f ) {
+        QUrl url(f->path(), QUrl::TolerantMode);
+        url.setScheme( QLatin1String("file") );
+
+#ifdef Q_OS_WIN32
+        // work around a bug in QDesktopServices on Win32, see i-net
+        QString filePath = f->path();
+
+        if (filePath.startsWith(QLatin1String("\\\\")) || filePath.startsWith(QLatin1String("//")))
+            url.setUrl(QDir::toNativeSeparators(filePath));
+        else
+            url = QUrl::fromLocalFile(filePath);
+#endif
+        QDesktopServices::openUrl(url);
+    }
+}
+
+void AccountSettings::slotEnableCurrentFolder()
+{
+    QModelIndex selected = ui->_folderList->selectionModel()->currentIndex();
+
+    if( selected.isValid() ) {
+        QString alias = _model->data( selected, FolderStatusDelegate::FolderAliasRole ).toString();
+        bool folderEnabled = _model->data( selected, FolderStatusDelegate::FolderSyncEnabled).toBool();
+        qDebug() << "Toggle enabled/disabled Folder alias " << alias << " - current state: " << folderEnabled;
+        if( !alias.isEmpty() ) {
+            FolderMan *folderMan = FolderMan::instance();
+
+            qDebug() << "Application: enable folder with alias " << alias;
+            bool terminate = false;
+
+            // this sets the folder status to disabled but does not interrupt it.
+            Folder *f = folderMan->folder( alias );
+            if( f && folderEnabled ) {
+                // check if a sync is still running and if so, ask if we should terminate.
+                if( f->isBusy() ) { // its still running
+                    int reply = QMessageBox::question( 0, tr("Sync Running"),
+                                                       tr("The syncing operation is running.<br/>Do you want to terminate it?"),
+                                                       QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes );
+                    if ( reply == QMessageBox::Yes )
+                        terminate = true;
+                    else
+                        return; // do nothing
+                }
+            }
+
+            // message box can return at any time while the thread keeps running,
+            // so better check again after the user has responded.
+            if ( f->isBusy() && terminate )
+                folderMan->terminateSyncProcess( alias );
+
+            folderMan->slotEnableFolder( alias, !folderEnabled );
+            slotUpdateFolderState (f);
+            // set the button text accordingly.
+            slotFolderActivated( selected );
+        }
+    }
+}
+
+void AccountSettings::slotUpdateFolderState( Folder *folder )
+{
+    QStandardItem *item = 0;
+    int row = 0;
+
+    if( ! folder ) return;
+
+    item = _model->item( row );
+
+    while( item ) {
+        if( item->data( FolderStatusDelegate::FolderAliasRole ) == folder->alias() ) {
+            // its the item to update!
+            break;
+        }
+        item = _model->item( ++row );
+    }
+
+    if( item ) {
+        folderToModelItem( item, folder );
+    } else {
+        // the dialog is not visible.
+    }
+    slotCheckConnection();
+}
+
+void AccountSettings::slotOCInfo( const QString& url, const QString& versionStr, const QString& version, const QString& )
+{
+#ifdef Q_OS_WIN32
+        // work around a bug in QDesktopServices on Win32, see i-net
+        QString filePath = url;
+
+        if (filePath.startsWith("\\\\") || filePath.startsWith("//"))
+            _OCUrl.setUrl(QDir::toNativeSeparators(filePath));
+        else
+            _OCUrl = QUrl::fromLocalFile(filePath);
+#else
+    _OCUrl = QUrl::fromLocalFile(url);
+#endif
+
+    qDebug() << "#-------# oC found on " << url;
+    /* enable the open button */
+    ui->connectLabel->setOpenExternalLinks(true);
+    QUrl safeUrl(url);
+    safeUrl.setPassword(QString()); // Remove the password from the URL to avoid showing it in the UI
+    ui->connectLabel->setText( tr("Connected to <a href=\"%1\">%2</a>.").arg(url, safeUrl.toString()) );
+    ui->connectLabel->setToolTip( tr("Version: %1 (%2)").arg(versionStr).arg(version));
+    ui->_ButtonAdd->setEnabled(true);
+
+    disconnect(ownCloudInfo::instance(), SIGNAL(ownCloudInfoFound(const QString&, const QString&, const QString&, const QString&)),
+            this, SLOT(slotOCInfo( const QString&, const QString&, const QString&, const QString& )));
+    disconnect(ownCloudInfo::instance(), SIGNAL(noOwncloudFound(QNetworkReply*)),
+            this, SLOT(slotOCInfoFail(QNetworkReply*)));
+}
+
+void AccountSettings::slotOCInfoFail( QNetworkReply *reply)
+{
+    QString errStr = tr("unknown problem.");
+    if( reply ) errStr = reply->errorString();
+
+    ui->connectLabel->setText( tr("<p>Failed to connect to %1: <tt>%2</tt></p>").arg(Theme::instance()->appNameGUI()).arg(errStr) );
+    ui->_ButtonAdd->setEnabled( false);
+
+    disconnect(ownCloudInfo::instance(), SIGNAL(ownCloudInfoFound(const QString&, const QString&, const QString&, const QString&)),
+            this, SLOT(slotOCInfo( const QString&, const QString&, const QString&, const QString& )));
+    disconnect(ownCloudInfo::instance(), SIGNAL(noOwncloudFound(QNetworkReply*)),
+            this, SLOT(slotOCInfoFail(QNetworkReply*)));
+
+}
+
+void AccountSettings::slotOpenOC()
+{
+  if( _OCUrl.isValid() )
+    QDesktopServices::openUrl( _OCUrl );
+}
+
+QStandardItem* AccountSettings::itemForFolder(const QString& folder)
+{
+    QStandardItem *item = NULL;
+
+    if( folder.isEmpty() ) {
+        return item;
+    }
+
+    int row = 0;
+
+    item = _model->item( row );
+
+    while( item ) {
+        if( item->data( FolderStatusDelegate::FolderAliasRole ) == folder ) {
+            // its the item to update!
+            break;
+        }
+        item = _model->item( ++row );
+    }
+    return item;
+}
+
+QString AccountSettings::shortenFilename( const QString& folder, const QString& file ) const
+{
+    // strip off the server prefix from the file name
+    QString shortFile(file);
+    if( shortFile.isEmpty() ) {
+        return QString::null;
+    }
+
+    if(shortFile.startsWith(QLatin1String("ownclouds://")) ||
+            shortFile.startsWith(QLatin1String("owncloud://")) ) {
+        // rip off the whole ownCloud URL.
+        Folder *f = FolderMan::instance()->folder(folder);
+        if( f ) {
+            QString remotePathUrl = ownCloudInfo::instance()->webdavUrl() + QLatin1Char('/') + f->secondPath();
+            shortFile.remove(Utility::toCSyncScheme(remotePathUrl));
+
+        }
+    }
+    return shortFile;
+}
+
+void AccountSettings::slotProgressProblem(const QString& folder, const Progress::SyncProblem& problem)
+{
+    Q_UNUSED(problem);
+
+    QStandardItem *item = itemForFolder( folder );
+    if( !item ) return;
+
+    int warnCount = qvariant_cast<int>( item->data(FolderStatusDelegate::WarningCount) );
+    warnCount++;
+    item->setData( QVariant(warnCount), FolderStatusDelegate::WarningCount );
+}
+
+void AccountSettings::slotSetProgress(const QString& folder, const Progress::Info &progress )
+{
+    // qDebug() << "================================> Progress for folder " << folder << " file " << file << ": "<< p1;
+    QStandardItem *item = itemForFolder( folder );
+    qint64 prog1 = progress.current_file_bytes;
+    qint64 prog2 = progress.file_size;
+
+    if( item == NULL ) {
+        return;
+    }
+
+    // Hotfix for a crash that I experienced in a very rare case/setup
+    if (progress.kind == Mirall::Progress::Invalid) {
+        qDebug() << "================================> INVALID Progress for folder " << folder;
+        return;
+    }
+
+    QString itemFileName = shortenFilename(folder, progress.current_file);
+    QString syncFileProgressString;
+
+    // stay with the previous kind-string for Context.
+    if( progress.kind != Progress::Context ) {
+        _kindContext = Progress::asActionString(progress.kind);
+    } else {
+        if( _kindContext.isEmpty() ) {
+            // empty kind context means that the dialog was opened after the action
+            // was started.
+            Progress::Kind kind = ProgressDispatcher::instance()->currentFolderContext(progress.folder);
+            if( kind != Progress::Invalid ) {
+                _kindContext = Progress::asActionString(kind);
+            }
+        }
+    }
+    QString kindString = _kindContext;
+
+    switch( progress.kind ) {
+    case Progress::StartSync:
+        item->setData( QVariant(0), FolderStatusDelegate::WarningCount );
+        break;
+    case Progress::StartDownload:
+    case Progress::StartUpload:
+    case Progress::StartDelete:
+        syncFileProgressString = tr("Start");
+        if( _hideProgressTimers.contains(item) ) {
+            // The timer is still running.
+            QTimer *t = _hideProgressTimers.take(item);
+            t->stop();
+            t->deleteLater();
+        }
+        break;
+    case Progress::Context:
+        syncFileProgressString = tr("Currently");
+        break;
+    case Progress::EndDownload:
+    case Progress::EndUpload:
+    case Progress::EndDelete:
+        break;
+    case Progress::EndSync:
+        syncFileProgressString = tr("Completely");
+
+        // start a timer to stop the progress display
+        QTimer *timer;
+        if( _hideProgressTimers.contains(item) ) {
+            timer = _hideProgressTimers[item];
+            // there is already one timer running.
+        } else {
+            timer = new QTimer;
+            connect(timer, SIGNAL(timeout()), this, SLOT(slotHideProgress()));
+            timer->setSingleShot(true);
+            _hideProgressTimers.insert(item, timer);
+        }
+        timer->start(5000);
+        break;
+    case Progress::Invalid:
+    case Progress::Download:
+    case Progress::Upload:
+    case Progress::Inactive:
+    case Progress::Error:
+        break;
+    }
+
+    QString fileProgressString;
+    QString s1 = Utility::octetsToString( prog1 );
+    QString s2 = Utility::octetsToString( prog2 );
+
+    // switch on extra space.
+    item->setData( QVariant(true), FolderStatusDelegate::AddProgressSpace );
+
+    if( progress.kind != Progress::EndSync ) {
+        // Example text: "Currently uploading foobar.png (1MB of 2MB)"
+        fileProgressString = tr("%1 %2 %3 (%4 of %5)").arg(syncFileProgressString).arg(kindString).
+                arg(itemFileName).arg(s1).arg(s2);
+    } else {
+        fileProgressString = tr("Completely finished.");
+    }
+    item->setData( fileProgressString,FolderStatusDelegate::SyncProgressItemString);
+
+    // overall progress
+    s1 = Utility::octetsToString( progress.overall_current_bytes );
+    s2 = Utility::octetsToString( progress.overall_transmission_size );
+    QString overallSyncString = tr("%1 of %2, file %3 of %4").arg(s1).arg(s2)
+            .arg(progress.current_file_no).arg(progress.overall_file_count);
+    item->setData( overallSyncString, FolderStatusDelegate::SyncProgressOverallString );
+
+    int overallPercent = 0;
+    if( progress.overall_transmission_size > 0 ) {
+        overallPercent = qRound(double(progress.overall_current_bytes)/double(progress.overall_transmission_size) * 100.0);
+    }
+    item->setData( overallPercent, FolderStatusDelegate::SyncProgressOverallPercent);
+}
+
+void AccountSettings::slotHideProgress()
+{
+    QTimer *send_timer = qobject_cast<QTimer*>(this->sender());
+    QHash<QStandardItem*, QTimer*>::const_iterator i = _hideProgressTimers.constBegin();
+    while (i != _hideProgressTimers.constEnd()) {
+        if( i.value() == send_timer ) {
+            QStandardItem *item = i.key();
+            item->setData( QVariant(false),  FolderStatusDelegate::AddProgressSpace );
+            item->setData( QVariant(QString::null), FolderStatusDelegate::SyncProgressOverallString );
+            item->setData( QVariant(QString::null), FolderStatusDelegate::SyncProgressItemString );
+            item->setData( 0,                       FolderStatusDelegate::SyncProgressOverallPercent );
+
+            ui->_folderList->repaint();
+            _hideProgressTimers.remove(item);
+            break;
+        }
+        ++i;
+    }
+
+    send_timer->deleteLater();
+}
+
+void AccountSettings::slotUpdateQuota(qint64 total, qint64 used)
+{
+    if( total > 0 ) {
+        ui->quotaProgressBar->setVisible(true);
+        ui->quotaInfoLabel->setVisible(true);
+        ui->quotaProgressBar->setEnabled(true);
+        // workaround the label only accepting ints (which may be only 32 bit wide)
+        ui->quotaProgressBar->setMaximum(100);
+        int qVal = qRound(used/(double)total * 100);
+        if( qVal > 100 ) qVal = 100;
+        ui->quotaProgressBar->setValue(qVal);
+        QString usedStr = Utility::octetsToString(used);
+        QString totalStr = Utility::octetsToString(total);
+        ui->quotaLabel->setText(tr("%1 of %2 in use.").arg(usedStr, totalStr));
+    } else {
+        ui->quotaProgressBar->setVisible(false);
+        ui->quotaInfoLabel->setVisible(false);
+        ui->quotaLabel->setText(tr("Currently there is no storage usage information available."));
+    }
+}
+
+void AccountSettings::slotIgnoreFilesEditor()
+{
+    if (_ignoreEditor.isNull()) {
+        _ignoreEditor = new IgnoreListEditor(this);
+        _ignoreEditor->setAttribute( Qt::WA_DeleteOnClose, true );
+        _ignoreEditor->open();
+    } else {
+        Utility::raiseDialog(_ignoreEditor);
+    }
+}
+
+void AccountSettings::slotInfoAboutCurrentFolder()
+{
+    emit(openProgressDialog());
+}
+
+AccountSettings::~AccountSettings()
+{
+    delete ui;
+}
+
+} // namespace Mirall

src/mirall/accountsettings.h

@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) by Daniel Molkentin <danimo@owncloud.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; 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 ACCOUNTSETTINGS_H
+#define ACCOUNTSETTINGS_H
+
+#include <QWidget>
+#include <QUrl>
+#include <QPointer>
+#include <QHash>
+#include <QTimer>
+#include <QStandardItem>
+
+#include "mirall/folder.h"
+#include "mirall/progressdispatcher.h"
+#include "mirall/itemprogressdialog.h"
+
+class QStandardItemModel;
+class QModelIndex;
+class QStandardItem;
+class QNetworkReply;
+class QListWidgetItem;
+
+namespace Mirall {
+
+namespace Ui {
+class AccountSettings;
+}
+
+class FolderMan;
+class ItemProgressDialog;
+class IgnoreListEditor;
+
+class AccountSettings : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit AccountSettings(QWidget *parent = 0);
+    ~AccountSettings();
+
+    void setFolderList( const Folder::Map& );
+    void buttonsSetEnabled();
+    void setListWidgetItem(QListWidgetItem* item);
+
+signals:
+    void folderChanged();
+    void openProgressDialog();
+    void openFolderAlias( const QString& );
+    void infoFolderAlias( const QString& );
+
+public slots:
+    void slotFolderActivated( const QModelIndex& );
+    void slotOpenOC();
+    void slotUpdateFolderState( Folder* );
+    void slotCheckConnection();
+    void slotOCInfo( const QString&, const QString&, const QString&, const QString& );
+    void slotOCInfoFail( QNetworkReply* );
+    void slotDoubleClicked( const QModelIndex& );
+    void slotFolderOpenAction( const QString& );
+    void slotSetProgress(const QString&, const Progress::Info& progress);
+    void slotProgressProblem(const QString& folder, const Progress::SyncProblem& problem);
+
+    void slotUpdateQuota( qint64,qint64 );
+    void slotIgnoreFilesEditor();
+
+protected slots:
+    void slotAddFolder();
+    void slotAddFolder( Folder* );
+    void slotEnableCurrentFolder();
+    void slotRemoveCurrentFolder();
+    void slotInfoAboutCurrentFolder();
+    void slotResetCurrentFolder();
+    void slotFolderWizardAccepted();
+    void slotFolderWizardRejected();
+    void slotOpenAccountWizard();
+    void slotHideProgress();
+
+private:
+    QString shortenFilename( const QString& folder, const QString& file ) const;
+    void folderToModelItem( QStandardItem *, Folder * );
+    QStandardItem* itemForFolder(const QString& );
+
+    Ui::AccountSettings *ui;
+    QPointer<ItemProgressDialog> _fileItemDialog;
+    QPointer<IgnoreListEditor> _ignoreEditor;
+    QStandardItemModel *_model;
+    QListWidgetItem *_item;
+    QUrl   _OCUrl;
+    QHash<QStandardItem*, QTimer*> _hideProgressTimers;
+    QString _kindContext;
+
+};
+
+} // namespace Mirall
+
+#endif // ACCOUNTSETTINGS_H

src/mirall/accountsettings.ui

@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Mirall::AccountSettings</class>
+ <widget class="QWidget" name="Mirall::AccountSettings">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>607</width>
+    <height>382</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="1" column="1">
+    <widget class="QGroupBox" name="maintenanceGroupBox">
+     <property name="title">
+      <string>Account Maintenance</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <widget class="QPushButton" name="ignoredFilesButton">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="text">
+         <string>Edit Ignored Files</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="modifyAccountButton">
+        <property name="text">
+         <string>Modify Account</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QGroupBox" name="syncStatusGroupBox">
+     <property name="title">
+      <string>Sync Status</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0" colspan="2">
+       <widget class="QLabel" name="connectLabel">
+        <property name="text">
+         <string>Connected with &lt;server&gt; as &lt;user&gt;</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QListView" name="_folderList"/>
+      </item>
+      <item row="1" column="1">
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QPushButton" name="_ButtonAdd">
+          <property name="text">
+           <string>Add Folder...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="_ButtonEnable">
+          <property name="text">
+           <string>Pause</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="_ButtonRemove">
+          <property name="text">
+           <string>Remove</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="verticalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="_ButtonInfo">
+          <property name="text">
+           <string>Info...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="storageGroupBox">
+     <property name="title">
+      <string>Storage Usage</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QProgressBar" name="quotaProgressBar">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="maximum">
+         <number>0</number>
+        </property>
+        <property name="value">
+         <number>-1</number>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="quotaLabel">
+        <property name="text">
+         <string>Retrieving usage information...</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="quotaInfoLabel">
+        <property name="text">
+         <string>&lt;b&gt;Note:&lt;/b&gt; Some folders, including network mounted or shared folders, might have different limits.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/mirall/application.h

@@ -18,15 +18,16 @@
 #include <QApplication>
 #include <QNetworkReply>
 #include <QSslError>
+#include <QPointer>
+#include <QQueue>
 
 #include "qtsingleapplication.h"
 
 #include "mirall/syncresult.h"
-#include "mirall/folder.h"
 #include "mirall/logbrowser.h"
-#include "mirall/folderman.h"
-#include "mirall/fileitemdialog.h"
 #include "mirall/systray.h"
+#include "mirall/connectionvalidator.h"
+#include "mirall/progressdispatcher.h"
 
 class QAction;
 class QMenu;
@@ -37,13 +38,13 @@ class QNetworkReply;
 
 namespace Mirall {
 class Theme;
+class Folder;
 class FolderWatcher;
 class FolderWizard;
-class StatusDialog;
-class OwncloudSetupWizard;
 class ownCloudInfo;
 class SslErrorDialog;
-class UpdateDetector;
+class SettingsDialog;
+class ItemProgressDialog;
 
 class Application : public SharedTools::QtSingleApplication
 {
@@ -55,84 +56,92 @@ public:
     bool giveHelp();
     void showHelp();
 
-signals:
+public slots:
-
+    // TODO: this should not be public
-protected slots:
-    void slotAddFolder();
-    void slotOpenStatus();
-    void slotRemoveFolder( const QString& );
-    void slotEnableFolder( const QString&, const bool );
-    void slotInfoFolder( const QString& );
-    void slotConfigure();
-    void slotConfigureProxy();
-    void slotParseOptions( const QString& );
-    void slotShowTrayMessage(const QString&, const QString&);
-
-    void slotSyncStateChange( const QString& );
     void slotownCloudWizardDone(int);
-protected:
 
+protected:
     void parseOptions(const QStringList& );
     void setupTranslations();
     void setupActions();
     void setupSystemTray();
     void setupContextMenu();
     void setupLogBrowser();
-    void setupProxy();
+    void enterNextLogFile();
+    bool checkConfigExists(bool openSettings);
 
     //folders have to be disabled while making config changes
     void computeOverallSyncStatus();
 
+    // reimplemented
+#if defined(Q_WS_WIN)
+    bool winEventFilter( MSG * message, long * result );
+#endif
+
+signals:
+    void folderRemoved();
+    void folderStateChanged(Folder*);
+
 protected slots:
+    void slotFoldersChanged();
+    void slotSettings();
+    void slotItemProgressDialog();
+    void slotParseOptions( const QString& );
+    void slotShowTrayMessage(const QString&, const QString&);
+    void slotShowOptionalTrayMessage(const QString&, const QString&);
+    void slotShowGuiMessage(const QString& title, const QString& message);
+    void slotCheckConnection();
+    void slotConnectionValidatorResult(ConnectionValidator::Status);
+    void slotSyncStateChange( const QString& );
     void slotTrayClicked( QSystemTrayIcon::ActivationReason );
     void slotFolderOpenAction(const QString & );
     void slotOpenOwnCloud();
-    void slotStartFolderSetup(int result = QDialog::Accepted); // defaulting to Accepted
-    void slotOwnCloudFound( const QString&, const QString&, const QString&, const QString& );
-    void slotNoOwnCloudFound( QNetworkReply* );
-    void slotCheckAuthentication();
-    void slotAuthCheck( const QString& ,QNetworkReply* );
     void slotOpenLogBrowser();
-    void slotAbout();
     void slotSSLFailed( QNetworkReply *reply, QList<QSslError> errors );
-    void slotFetchCredentials();
-    void slotCredentialsFetched( bool );
     void slotStartUpdateDetector();
-
+    void slotSetupProxy();
+    void slotRefreshQuotaDisplay( qint64 total, qint64 used );
+    void slotUseMonoIconsChanged( bool );
+    void slotUpdateProgress(const QString&, const Progress::Info&);
+    void slotProgressSyncProblem(const QString& folder, const Progress::SyncProblem &problem);
+    void slotDisplayIdle();
+    void slotHelp();
+    void slotCredentialsFetched();
 private:
     void setHelp();
     void raiseDialog( QWidget* );
+    void rebuildRecentMenus();
+    void runValidator();
 
-    // configuration file -> folder
     Systray *_tray;
-    QAction *_actionQuit;
-    QAction *_actionAddFolder;
-    QAction *_actionOpenStatus;
-    QAction *_actionConfigure;
     QAction *_actionOpenoC;
-    QAction *_actionConfigureProxy;
+    QAction *_actionSettings;
-    QAction *_actionAbout;
+    QAction *_actionQuota;
+    QAction *_actionStatus;
+    QAction *_actionRecent;
+    QAction *_actionHelp;
+    QAction *_actionQuit;
 
-#if QT_VERSION >= 0x040700
     QNetworkConfigurationManager *_networkMgr;
-#endif
 
-    FolderWizard  *_folderWizard;
+    QPointer<FolderWizard> _folderWizard;
-    OwncloudSetupWizard *_owncloudSetupWizard;
     SslErrorDialog *_sslErrorDialog;
+    ConnectionValidator *_conValidator;
 
     // tray's menu
     QMenu *_contextMenu;
-    StatusDialog *_statusDialog;
+    QMenu *_recentActionsMenu;
-    FileItemDialog *_fileItemDialog;
 
-    FolderMan *_folderMan;
     Theme *_theme;
     QSignalMapper *_folderOpenActionMapper;
-    UpdateDetector *_updateDetector;
-    QMap<QString, QString> _overallStatusStrings;
     LogBrowser *_logBrowser;
+    QPointer<SettingsDialog> _settingsDialog;
+    QPointer<ItemProgressDialog> _progressDialog;
+
     QString _logFile;
+    QString _logDirectory;
+
+    int _logExpire;
     bool _showLogWindow;
     bool _logFlush;
     bool _helpOnly;

src/mirall/connectionvalidator.cpp

@@ -17,7 +17,6 @@
 #include "mirall/owncloudinfo.h"
 #include "mirall/mirallconfigfile.h"
 #include "mirall/theme.h"
-#include "mirall/credentialstore.h"
 
 namespace Mirall {
 
@@ -28,7 +27,8 @@ ConnectionValidator::ConnectionValidator(QObject *parent) :
 }
 
 ConnectionValidator::ConnectionValidator(const QString& connection, QObject *parent)
-    :_connection(connection)
+    : QObject(parent),
+      _connection(connection)
 {
     ownCloudInfo::instance()->setCustomConfigHandle(_connection);
 }
@@ -38,9 +38,42 @@ QStringList ConnectionValidator::errors() const
     return _errors;
 }
 
-QString ConnectionValidator::statusString( Status )
+QString ConnectionValidator::statusString( Status stat ) const
 {
-    return QLatin1String("Get your street creds!");
+    QString re;
+
+    switch( stat ) {
+    case Undefined:
+        re = QLatin1String("Undefined");
+        break;
+    case Connected:
+        re = QLatin1String("Connected");
+        break;
+    case NotConfigured:
+        re = QLatin1String("NotConfigured");
+        break;
+    case ServerVersionMismatch:
+        re = QLatin1String("Server Version Mismatch");
+        break;
+    case CredentialsTooManyAttempts:
+        re = QLatin1String("Credentials Too Many Attempts");
+        break;
+     case CredentialError:
+        re = QLatin1String("CredentialError");
+        break;
+    case CredentialsUserCanceled:
+        re = QLatin1String("Credential User Canceled");
+        break;
+    case CredentialsWrong:
+        re = QLatin1String("Credentials Wrong");
+        break;
+    case StatusNotFound:
+        re = QLatin1String("Status not found");
+        break;
+    default:
+        re = QLatin1String("status undeclared.");
+    }
+    return re;
 }
 
 
@@ -60,7 +93,7 @@ void ConnectionValidator::checkConnection()
     }
 }
 
-void ConnectionValidator::slotStatusFound( const QString& url, const QString& versionStr, const QString& version, const QString& edition)
+void ConnectionValidator::slotStatusFound( const QString& url, const QString& versionStr, const QString& version, const QString& /*edition*/)
 {
     // status.php was found.
     qDebug() << "** Application: ownCloud found: " << url << " with version " << versionStr << "(" << version << ")";
@@ -82,7 +115,7 @@ void ConnectionValidator::slotStatusFound( const QString& url, const QString& ve
         return;
     }
 
-    QTimer::singleShot( 0, this, SLOT( slotFetchCredentials() ));
+    QTimer::singleShot( 0, this, SLOT( slotCheckAuthentication() ));
 }
 
 // status.php could not be loaded.
@@ -100,77 +133,19 @@ void ConnectionValidator::slotNoStatusFound(QNetworkReply *reply)
 
 }
 
-void ConnectionValidator::slotFetchCredentials()
-{
-    if( _connection.isEmpty() ) {
-        if( CredentialStore::instance()->canTryAgain() ) {
-            connect( CredentialStore::instance(), SIGNAL(fetchCredentialsFinished(bool)),
-                     this, SLOT(slotCredentialsFetched(bool)) );
-            CredentialStore::instance()->fetchCredentials();
-        }
-
-        if( CredentialStore::instance()->state() == CredentialStore::TooManyAttempts ) {
-            _errors << tr("Too many attempts to get a valid password.");
-            emit connectionResult( CredentialsTooManyAttempts );
-        }
-    } else {
-        // Pull credentials from Mirall config.
-        slotCredentialsFetched( true );
-    }
-}
-
-void ConnectionValidator::slotCredentialsFetched( bool ok )
-{
-    qDebug() << "Credentials successfully fetched: " << ok;
-    disconnect( CredentialStore::instance(), SIGNAL(fetchCredentialsFinished(bool)) );
-
-    if( ! ok ) {
-        Status stat;
-        _errors << tr("Error: Could not retrieve the password!");
-
-        if( CredentialStore::instance()->state() == CredentialStore::UserCanceled ) {
-            _errors << tr("Password dialog was canceled!");
-            stat = CredentialsUserCanceled;
-        } else {
-            _errors << CredentialStore::instance()->errorMessage();
-            stat = CredentialError;
-        }
-
-        qDebug() << "Could not fetch credentials" << _errors;
-
-        emit connectionResult( stat );
-    } else {
-        QString user, pwd;
-        if( _connection.isEmpty() ) {
-            user = CredentialStore::instance()->user();
-            pwd  = CredentialStore::instance()->password();
-        } else {
-            // in case of reconfiguration, the _connection is set.
-            MirallConfigFile cfg(_connection);
-            user = cfg.ownCloudUser();
-            pwd  = cfg.ownCloudPasswd();
-        }
-        ownCloudInfo::instance()->setCredentials( user, pwd );
-
-        // Credential fetched ok.
-        QTimer::singleShot( 0, this, SLOT( slotCheckAuthentication() ));
-    }
-}
-
 void ConnectionValidator::slotCheckAuthentication()
 {
     connect( ownCloudInfo::instance(), SIGNAL(ownCloudDirExists(QString,QNetworkReply*)),
              this, SLOT(slotAuthCheck(QString,QNetworkReply*)));
 
     qDebug() << "# checking for authentication settings.";
-    ownCloudInfo::instance()->getRequest(QLatin1String("/"), true ); // this call needs to be authenticated.
+    ownCloudInfo::instance()->getWebDAVPath(QLatin1String("/") ); // this call needs to be authenticated.
     // simply GET the webdav root, will fail if credentials are wrong.
     // continue in slotAuthCheck here :-)
 }
 
 void ConnectionValidator::slotAuthCheck( const QString& ,QNetworkReply *reply )
 {
-    bool ok = true;
     Status stat = Connected;
 
     if( reply->error() == QNetworkReply::AuthenticationRequiredError ||
@@ -178,7 +153,6 @@ void ConnectionValidator::slotAuthCheck( const QString& ,QNetworkReply *reply )
         qDebug() << "******** Password is wrong!";
         _errors << "The provided credentials are wrong.";
         stat = CredentialsWrong;
-        ok = false;
     }
 
     // disconnect from ownCloud Info signals
@@ -186,7 +160,6 @@ void ConnectionValidator::slotAuthCheck( const QString& ,QNetworkReply *reply )
              this,SLOT(slotAuthCheck(QString,QNetworkReply*)));
 
     emit connectionResult( stat );
-
 }
 
 

src/mirall/connectionvalidator.h

@@ -45,12 +45,12 @@ public:
 
     void checkConnection();
 
-    QString statusString( Status );
+    QString statusString( Status ) const;
 
 signals:
     void connectionResult( ConnectionValidator::Status );
-    void connectionAvailable();
+    // void connectionAvailable();
-    void connectionFailed();
+    // void connectionFailed();
 
 public slots:
 
@@ -58,8 +58,6 @@ protected slots:
     void slotStatusFound( const QString&, const QString&, const QString&, const QString& );
     void slotNoStatusFound(QNetworkReply *);
 
-    void slotFetchCredentials();
-    void slotCredentialsFetched( bool );
     void slotCheckAuthentication();
     void slotAuthCheck( const QString& ,QNetworkReply * );
 

src/mirall/csyncthread.cpp

@@ -18,6 +18,7 @@
 #include "mirall/theme.h"
 #include "mirall/logger.h"
 #include "mirall/owncloudinfo.h"
+#include "creds/abstractcredentials.h"
 
 #ifdef Q_OS_WIN
 #include <windows.h>
@@ -58,6 +59,8 @@ CSyncThread::~CSyncThread()
 
 }
 
+//Convert an error code from csync to a user readable string.
+// Keep that function thread safe as it can be called from the sync thread or the main thread
 QString CSyncThread::csyncErrorToString( CSYNC_ERROR_CODE err, const char *errString )
 {
     QString errStr;
@@ -106,8 +109,6 @@ QString CSyncThread::csyncErrorToString( CSYNC_ERROR_CODE err, const char *errSt
         break;
     case CSYNC_ERR_ACCESS_FAILED:
         errStr = tr("<p>The target directory does not exist.</p><p>Please check the sync setup.</p>");
-        // this is critical. The database has to be removed.
-        emit wipeDb();
         break;
     case CSYNC_ERR_REMOTE_CREATE:
     case CSYNC_ERR_REMOTE_STAT:
@@ -139,19 +140,19 @@ QString CSyncThread::csyncErrorToString( CSYNC_ERROR_CODE err, const char *errSt
         errStr = tr("A HTTP transmission error happened.");
         break;
     case CSYNC_ERR_PERM:
-        errStr = tr("CSync failed due to not handled permission deniend.");
+        errStr = tr("CSync: Permission deniend.");
         break;
     case CSYNC_ERR_NOT_FOUND:
-        errStr = tr("CSync failed to find a specific file.");
+        errStr = tr("CSync: File not found.");
         break;
     case CSYNC_ERR_EXISTS:
-        errStr = tr("CSync tried to create a directory that already exists.");
+        errStr = tr("CSync: Directory already exists.");
         break;
     case CSYNC_ERR_NOSPC:
-        errStr = tr("CSync: No space on %1 server available.").arg(Theme::instance()->appNameGUI());
+        errStr = tr("CSync: No space left on %1 server.").arg(Theme::instance()->appNameGUI());
         break;
     case CSYNC_ERR_UNSPEC:
-        errStr = tr("CSync unspecified error.");
+        errStr = tr("CSync: unspecified error.");
 
     default:
         errStr = tr("An internal error number %1 happend.").arg( (int) err );
@@ -186,11 +187,18 @@ int CSyncThread::treewalkFile( TREE_WALK_FILE *file, bool remote )
     item._file = QString::fromUtf8( file->path );
     item._instruction = file->instruction;
     item._dir = SyncFileItem::None;
-
+    if(file->error_string) {
+        item._errorString = QString::fromUtf8(file->error_string);
+    }
     SyncFileItem::Direction dir;
 
     int re = 0;
 
+    if (file->instruction != CSYNC_INSTRUCTION_IGNORE
+        && file->instruction != CSYNC_INSTRUCTION_REMOVE) {
+      _hasFiles = true;
+    }
+
     switch(file->instruction) {
     case CSYNC_INSTRUCTION_NONE:
     case CSYNC_INSTRUCTION_IGNORE:
@@ -227,6 +235,20 @@ int CSyncThread::treewalkFile( TREE_WALK_FILE *file, bool remote )
         break;
     }
 
+    switch( file->type ) {
+    case CSYNC_FTW_TYPE_DIR:
+        item._type = SyncFileItem::Directory;
+        break;
+    case CSYNC_FTW_TYPE_FILE:
+        item._type = SyncFileItem::File;
+        break;
+    case CSYNC_FTW_TYPE_SLINK:
+        item._type = SyncFileItem::SoftLink;
+        break;
+    default:
+        item._type = SyncFileItem::UnknownType;
+    }
+
     item._dir = dir;
     _mutex.lock();
     _syncedItems.append(item);
@@ -237,7 +259,7 @@ int CSyncThread::treewalkFile( TREE_WALK_FILE *file, bool remote )
 
 int CSyncThread::treewalkError(TREE_WALK_FILE* file)
 {
-    SyncFileItem item;
+    SyncFileItem item; // only used for search.
     item._file= QString::fromUtf8(file->path);
     int indx = _syncedItems.indexOf(item);
 
@@ -245,10 +267,11 @@ int CSyncThread::treewalkError(TREE_WALK_FILE* file)
         return 0;
 
     if( file &&
-        file->instruction == CSYNC_INSTRUCTION_STAT_ERROR ||
+        (file->instruction == CSYNC_INSTRUCTION_STAT_ERROR ||
-        file->instruction == CSYNC_INSTRUCTION_ERROR ) {
+         file->instruction == CSYNC_INSTRUCTION_ERROR) ) {
         _mutex.lock();
         _syncedItems[indx]._instruction = file->instruction;
+        _syncedItems[indx]._errorString = QString::fromUtf8(file->error_string);
         _mutex.unlock();
     }
 
@@ -310,10 +333,50 @@ void CSyncThread::startSync()
     // cleans up behind us and emits finished() to ease error handling
     CSyncRunScopeHelper helper(_csync_ctx, this);
 
+    // maybe move this somewhere else where it can influence a running sync?
+    MirallConfigFile cfg;
+
+    int downloadLimit = 0;
+    if (cfg.useDownloadLimit()) {
+         downloadLimit = cfg.downloadLimit() * 1000;
+    }
+    csync_set_module_property(_csync_ctx, "bandwidth_limit_download", &downloadLimit);
+
+    int uploadLimit = -75; // 75%
+    int useUpLimit = cfg.useUploadLimit();
+    if ( useUpLimit >= 1) {
+         uploadLimit = cfg.uploadLimit() * 1000;
+    } else if (useUpLimit == 0) {
+        uploadLimit = 0;
+    }
+    csync_set_module_property(_csync_ctx, "bandwidth_limit_upload", &uploadLimit);
+
+    csync_set_progress_callback( _csync_ctx, cb_progress );
+
+    csync_set_module_property(_csync_ctx, "csync_context", _csync_ctx);
     csync_set_userdata(_csync_ctx, this);
 
+    // TODO: This should 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 keep this code and remove it from
+    // AbstractCredentials implementations.
+    cfg.getCredentials()->syncContextPreStart(_csync_ctx);
+    // if (_lastAuthCookies.length() > 0) {
+    //     // Stuff cookies inside csync, then we can avoid the intermediate HTTP 401 reply
+    //     // when https://github.com/owncloud/core/pull/4042 is merged.
+    //     QString cookiesAsString;
+    //     foreach(QNetworkCookie c, _lastAuthCookies) {
+    //         cookiesAsString += c.name();
+    //         cookiesAsString += '=';
+    //         cookiesAsString += c.value();
+    //         cookiesAsString += "; ";
+    //     }
+    //     csync_set_module_property(_csync_ctx, "session_key", cookiesAsString.to
+    // }
+
     // csync_set_auth_callback( _csync_ctx, getauth );
-    csync_set_progress_callback( _csync_ctx, progress );
+
+
 
     qDebug() << "#### Update start #################################################### >>";
     if( csync_update(_csync_ctx) < 0 ) {
@@ -323,10 +386,11 @@ void CSyncThread::startSync()
     qDebug() << "<<#### Update end ###########################################################";
 
     if( csync_reconcile(_csync_ctx) < 0 ) {
-        handleSyncError(_csync_ctx, "cysnc_reconcile");
+        handleSyncError(_csync_ctx, "csync_reconcile");
         return;
     }
 
+    _hasFiles = false;
     bool walkOk = true;
     if( csync_walk_local_tree(_csync_ctx, &treewalkLocal, 0) < 0 ) {
         qDebug() << "Error in local treewalk.";
@@ -336,6 +400,16 @@ void CSyncThread::startSync()
         qDebug() << "Error in remote treewalk.";
     }
 
+    if (!_hasFiles && !_syncedItems.isEmpty()) {
+        qDebug() << Q_FUNC_INFO << "All the files are going to be removed, asking the user";
+        bool cancel = true;
+        emit aboutToRemoveAllFiles(_syncedItems.first()._dir, &cancel);
+        if (cancel) {
+            qDebug() << Q_FUNC_INFO << "Abort sync";
+            return;
+        }
+    }
+
     if (_needsUpdate)
         emit(started());
 
@@ -346,7 +420,7 @@ void CSyncThread::startSync()
 
     if( walkOk ) {
         if( csync_walk_local_tree(_csync_ctx, &walkFinalize, 0) < 0 ||
-            csync_walk_remote_tree( _csync_ctx, &walkFinalize, 0 ) < 0 ) {
+            csync_walk_remote_tree(_csync_ctx, &walkFinalize, 0 ) < 0 ) {
             qDebug() << "Error in finalize treewalk.";
         } else {
         // emit the treewalk results.
@@ -356,16 +430,78 @@ void CSyncThread::startSync()
     qDebug() << Q_FUNC_INFO << "Sync finished";
 }
 
-void CSyncThread::progress(const char *remote_url, enum csync_notify_type_e kind,
+Progress::Kind CSyncThread::csyncToProgressKind( enum csync_notify_type_e kind )
-                                        long long o1, long long o2, void *userdata)
 {
-    (void) o1; (void) o2;
+    Progress::Kind pKind = Progress::Invalid;
-    if (kind == CSYNC_NOTIFY_FINISHED_DOWNLOAD) {
+
-        QString path = QUrl::fromEncoded(remote_url).toString();
+    switch(kind) {
-        CSyncThread *thread = static_cast<CSyncThread*>(userdata);
+    case CSYNC_NOTIFY_INVALID:
-        thread->fileReceived(path);
+        pKind = Progress::Invalid;
+        break;
+    case CSYNC_NOTIFY_START_SYNC_SEQUENCE:
+        pKind = Progress::StartSync;
+        break;
+    case CSYNC_NOTIFY_START_DOWNLOAD:
+        pKind = Progress::StartDownload;
+        break;
+    case CSYNC_NOTIFY_START_UPLOAD:
+        pKind = Progress::StartUpload;
+        break;
+    case CSYNC_NOTIFY_PROGRESS:
+        pKind = Progress::Context;
+        break;
+    case CSYNC_NOTIFY_FINISHED_DOWNLOAD:
+        pKind = Progress::EndDownload;
+        break;
+    case CSYNC_NOTIFY_FINISHED_UPLOAD:
+        pKind = Progress::EndUpload;
+        break;
+    case CSYNC_NOTIFY_FINISHED_SYNC_SEQUENCE:
+        pKind = Progress::EndSync;
+        break;
+    case CSYNC_NOTIFY_START_DELETE:
+        pKind = Progress::StartDelete;
+        break;
+    case CSYNC_NOTIFY_END_DELETE:
+        pKind = Progress::EndDelete;
+        break;
+    case CSYNC_NOTIFY_ERROR:
+        pKind = Progress::Error;
+        break;
+    default:
+        pKind = Progress::Invalid;
+        break;
     }
+    return pKind;
 }
 
+void CSyncThread::cb_progress( CSYNC_PROGRESS *progress, void *userdata )
+{
+    if( !progress ) {
+        qDebug() << "No progress block in progress callback found!";
+        return;
+    }
+    if( !userdata ) {
+        qDebug() << "No thread given in progress callback!";
+        return;
+    }
+    Progress::Info pInfo;
+    CSyncThread *thread = static_cast<CSyncThread*>(userdata);
+
+    pInfo.kind                  = thread->csyncToProgressKind( progress->kind );
+    pInfo.current_file          = QUrl::fromEncoded( progress->path ).toString();
+    pInfo.file_size             = progress->file_size;
+    pInfo.current_file_bytes    = progress->curr_bytes;
+
+    pInfo.overall_file_count    = progress->overall_file_count;
+    pInfo.current_file_no       = progress->current_file_no;
+    pInfo.overall_transmission_size = progress->overall_transmission_size;
+    pInfo.overall_current_bytes = progress->current_overall_bytes;
+    pInfo.timestamp = QDateTime::currentDateTime();
+
+    // Connect to something in folder!
+    thread->transmissionProgress( pInfo );
 
 }
+
+} // ns Mirall

src/mirall/csyncthread.h

@@ -22,10 +22,12 @@
 #include <QThread>
 #include <QString>
 #include <QNetworkProxy>
+#include <QNetworkCookie>
 
 #include <csync.h>
 
 #include "mirall/syncfileitem.h"
+#include "mirall/progressdispatcher.h"
 
 class QProcess;
 
@@ -38,7 +40,7 @@ public:
     CSyncThread(CSYNC *);
     ~CSyncThread();
 
-    QString csyncErrorToString( CSYNC_ERROR_CODE, const char * );
+    static QString csyncErrorToString( CSYNC_ERROR_CODE, const char * );
 
     Q_INVOKABLE void startSync();
 
@@ -50,24 +52,26 @@ signals:
     void csyncUnavailable();
     void treeWalkResult(const SyncFileItemVector&);
 
+    void transmissionProgress( const Progress::Info& progress );
     void csyncStateDbFile( const QString& );
     void wipeDb();
 
     void finished();
     void started();
 
+    void aboutToRemoveAllFiles(SyncFileItem::Direction direction, bool *cancel);
+
 private:
     void handleSyncError(CSYNC *ctx, const char *state);
-    static void progress(const char *remote_url,
+
-                    enum csync_notify_type_e kind,
+    static void cb_progress( CSYNC_PROGRESS *progress, void *userdata );
-                    long long o1, long long o2,
-                    void *userdata);
 
     static int treewalkLocal( TREE_WALK_FILE*, void *);
     static int treewalkRemote( TREE_WALK_FILE*, void *);
     int treewalkFile( TREE_WALK_FILE*, bool );
     int treewalkError( TREE_WALK_FILE* );
 
+    Progress::Kind csyncToProgressKind( enum csync_notify_type_e kind );
     static int walkFinalize(TREE_WALK_FILE*, void* );
 
 
@@ -79,7 +83,9 @@ private:
     CSYNC *_csync_ctx;
     bool _needsUpdate;
 
-    friend class CSyncRunScopeHelper;
+    bool _hasFiles; // true if there is at least one file that is not ignored or removed
+
+    friend struct CSyncRunScopeHelper;
 };
 }
 

src/mirall/fileitemdialog.cpp

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

src/mirall/fileutils.h

@@ -25,7 +25,7 @@ class FileUtils
 public:
     enum SubFolderListOption {
         SubFolderNoOptions = 0x0,
-        SubFolderRecursive = 0x1,
+        SubFolderRecursive = 0x1
     };
     Q_DECLARE_FLAGS(SubFolderListOptions, SubFolderListOption)
 

src/mirall/folder.cpp

@@ -1,5 +1,7 @@
 /*
  * Copyright (C) by Duncan Mac-Vicar P. <duncan@kde.org>
+ * Copyright (C) by Daniel Molkentin <danimo@owncloud.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
@@ -17,66 +19,108 @@
 #include "mirall/folderwatcher.h"
 #include "mirall/mirallconfigfile.h"
 #include "mirall/syncresult.h"
+#include "mirall/logger.h"
+#include "mirall/owncloudinfo.h"
+#include "mirall/utility.h"
+#include "folderman.h"
+#include "creds/abstractcredentials.h"
 
 #include <QDebug>
 #include <QTimer>
 #include <QUrl>
 #include <QFileSystemWatcher>
 #include <QDir>
+#include <QMessageBox>
+#include <QPushButton>
 
 namespace Mirall {
 
+void csyncLogCatcher(CSYNC */*ctx*/,
+                     int /*verbosity*/,
+                     const char */*function*/,
+                     const char *buffer,
+                     void */*userdata*/)
+{
+  Logger::instance()->csyncLog( QString::fromUtf8(buffer) );
+}
+
 Folder::Folder(const QString &alias, const QString &path, const QString& secondPath, QObject *parent)
-    : QObject(parent),
+    : QObject(parent)
-      _errorCount(0),
+      , _path(path)
-      _path(path),
+      , _secondPath(secondPath)
-      _secondPath(secondPath),
+      , _alias(alias)
-      _pollTimer(new QTimer(this)),
+      , _enabled(true)
-      _alias(alias),
+      , _thread(0)
-      _onlyOnlineEnabled(false),
+      , _csync(0)
-      _onlyThisLANEnabled(false),
+      , _csyncError(false)
-      _online(false),
+      , _csyncUnavail(false)
-      _enabled(true)
+      , _csync_ctx(0)
 {
     qsrand(QTime::currentTime().msec());
-    MirallConfigFile cfgFile;
+    _timeSinceLastSync.start();
 
-    _pollTimer->setSingleShot(true);
+    _watcher = new FolderWatcher(path, this);
-    int polltime = cfgFile.remotePollInterval()- 2000 + (int)( 4000.0*qrand()/(RAND_MAX+1.0));
-    qDebug() << "setting remote poll timer interval to" << polltime << "msec for folder " << alias;
-    _pollTimer->setInterval( polltime );
-
-    QObject::connect(_pollTimer, SIGNAL(timeout()), this, SLOT(slotPollTimerTimeout()));
-    _pollTimer->start();
-
-    _watcher = new Mirall::FolderWatcher(path, this);
 
     MirallConfigFile cfg;
-
+    _watcher->addIgnoreListFile( cfg.excludeFile(MirallConfigFile::SystemScope) );
-    _watcher->setIgnoreListFile( cfg.excludeFile() );
+    _watcher->addIgnoreListFile( cfg.excludeFile(MirallConfigFile::UserScope) );
 
     QObject::connect(_watcher, SIGNAL(folderChanged(const QStringList &)),
                      SLOT(slotChanged(const QStringList &)));
-    QObject::connect(this, SIGNAL(syncStarted()),
-                     SLOT(slotSyncStarted()));
-    QObject::connect(this, SIGNAL(syncFinished(const SyncResult &)),
-                     SLOT(slotSyncFinished(const SyncResult &)));
-
-#if QT_VERSION >= 0x040700
-    _online = _networkMgr.isOnline();
-    QObject::connect(&_networkMgr, SIGNAL(onlineStateChanged(bool)), SLOT(slotOnlineChanged(bool)));
-#else
-    _online = true;
-#endif
 
     _syncResult.setStatus( SyncResult::NotYetStarted );
 
     // check if the local path exists
     checkLocalPath();
+
+    int polltime = cfg.remotePollInterval();
+    qDebug() << "setting remote poll timer interval to" << polltime << "msec";
+    _pollTimer.setInterval( polltime );
+    QObject::connect(&_pollTimer, SIGNAL(timeout()), this, SLOT(slotPollTimerTimeout()));
+    _pollTimer.start();
+
+    _syncResult.setFolder(alias);
 }
 
+bool Folder::init()
+{
+    QString url = Utility::toCSyncScheme(ownCloudInfo::instance()->webdavUrl() + secondPath());
+    QString localpath = path();
+
+    if( csync_create( &_csync_ctx, localpath.toUtf8().data(), url.toUtf8().data() ) < 0 ) {
+        qDebug() << "Unable to create csync-context!";
+        slotCSyncError(tr("Unable to create csync-context"));
+        _csync_ctx = 0;
+    } else {
+        csync_set_log_callback(   _csync_ctx, csyncLogCatcher );
+        csync_set_log_verbosity(_csync_ctx, 11);
+
+        MirallConfigFile cfgFile;
+        csync_set_config_dir( _csync_ctx, cfgFile.configPath().toUtf8() );
+
+        csync_enable_conflictcopys(_csync_ctx);
+        setIgnoredFiles();
+        cfgFile.getCredentials()->syncContextPreInit(_csync_ctx);
+
+        if( csync_init( _csync_ctx ) < 0 ) {
+            qDebug() << "Could not initialize csync!" << csync_get_error(_csync_ctx) << csync_get_error_string(_csync_ctx);
+            slotCSyncError(CSyncThread::csyncErrorToString(csync_get_error(_csync_ctx), csync_get_error_string(_csync_ctx)));
+            csync_destroy(_csync_ctx);
+            _csync_ctx = 0;
+        }
+    }
+    return _csync_ctx;
+}
 Folder::~Folder()
 {
+    if( _thread ) {
+        _thread->quit();
+        csync_request_abort(_csync_ctx);
+        _thread->wait();
+    }
+    delete _csync;
+    // Destroy csync here.
+    csync_destroy(_csync_ctx);
 }
 
 void Folder::checkLocalPath()
@@ -129,6 +173,11 @@ QString Folder::path() const
     return p;
 }
 
+bool Folder::isBusy() const
+{
+    return ( _thread && _thread->isRunning() );
+}
+
 QString Folder::secondPath() const
 {
     return _secondPath;
@@ -148,9 +197,6 @@ void Folder::setSyncEnabled( bool doit )
 {
   _enabled = doit;
   _watcher->setEventsEnabled( doit );
-  if( doit && ! _pollTimer->isActive() ) {
-      _pollTimer->start();
-  }
 
   qDebug() << "setSyncEnabled - ############################ " << doit;
   if( doit ) {
@@ -159,89 +205,26 @@ void Folder::setSyncEnabled( bool doit )
       _syncResult.clearErrors();
       evaluateSync( QStringList() );
   } else {
-      // disable folder. Done through the _enabled-flag set above
+      _pollTimer.stop();
   }
 }
 
-bool Folder::onlyOnlineEnabled() const
-{
-    return _onlyOnlineEnabled;
-}
-
-void Folder::setOnlyOnlineEnabled(bool enabled)
-{
-    _onlyOnlineEnabled = enabled;
-}
-
-bool Folder::onlyThisLANEnabled() const
-{
-    return _onlyThisLANEnabled;
-}
-
-void Folder::setOnlyThisLANEnabled(bool enabled)
-{
-    _onlyThisLANEnabled = enabled;
-}
-
-int Folder::pollInterval() const
-{
-    return _pollTimer->interval();
-}
-
 void Folder::setSyncState(SyncResult::Status state)
 {
     _syncResult.setStatus(state);
 }
 
-void Folder::setPollInterval(int milliseconds)
-{
-    _pollTimer->setInterval( milliseconds );
-}
-
-int Folder::errorCount()
-{
-  return _errorCount;
-}
-
-void Folder::resetErrorCount()
-{
-  _errorCount = 0;
-}
-
-void Folder::incrementErrorCount()
-{
-  // if the error count gets higher than three, the interval timer
-  // of the watcher is doubled.
-  _errorCount++;
-  if( _errorCount > 1 ) {
-    int interval = _watcher->eventInterval();
-    int newInt = 2*interval;
-    qDebug() << "Set new watcher interval to " << newInt;
-    _watcher->setEventInterval( newInt );
-    _errorCount = 0;
-  }
-}
-
 SyncResult Folder::syncResult() const
 {
   return _syncResult;
 }
 
-void Folder::evaluateSync(const QStringList &pathList)
+void Folder::evaluateSync(const QStringList &/*pathList*/)
 {
   if( !_enabled ) {
     qDebug() << "*" << alias() << "sync skipped, disabled!";
     return;
   }
-  if (!_online && onlyOnlineEnabled()) {
-    qDebug() << "*" << alias() << "sync skipped, not online";
-    return;
-  }
-
-  // stop the poll timer here. Its started again in the slot of
-  // sync finished.
-  qDebug() << "* " << alias() << "Poll timer disabled";
-  _pollTimer->stop();
 
   _syncResult.setStatus( SyncResult::NotYetStarted );
   emit scheduleToSync( alias() );
@@ -250,15 +233,36 @@ void Folder::evaluateSync(const QStringList &pathList)
 
 void Folder::slotPollTimerTimeout()
 {
-    qDebug() << "* Polling" << alias() << "for changes. Ignoring all pending events until now";
+    qDebug() << "* Polling" << alias() << "for changes. (time since next sync:" << (_timeSinceLastSync.elapsed() / 1000) << "s)";
-    _watcher->clearPendingEvents();
+
-    evaluateSync(QStringList());
+    if (quint64(_timeSinceLastSync.elapsed()) > MirallConfigFile().forceSyncInterval()) {
+        qDebug() << "* Force Sync now";
+        evaluateSync(QStringList());
+    } else {
+        RequestEtagJob* job = new RequestEtagJob(secondPath(), this);
+        // check if the etag is different
+        QObject::connect(job, SIGNAL(etagRetreived(QString)), this, SLOT(etagRetreived(QString)));
+        QObject::connect(job, SIGNAL(networkError()), this, SLOT(slotNetworkUnavailable()));
+    }
 }
 
-void Folder::slotOnlineChanged(bool online)
+void Folder::etagRetreived(const QString& etag)
 {
-    qDebug() << "* " << alias() << "is" << (online ? "now online" : "no longer online");
+    qDebug() << "* Compare etag  with previous etag: " << (_lastEtag != etag);
-    _online = online;
+
+    // re-enable sync if it was disabled because network was down
+    FolderMan::instance()->setSyncEnabled(true);
+
+    if (_lastEtag != etag) {
+        _lastEtag = etag;
+        evaluateSync(QStringList());
+    }
+}
+
+void Folder::slotNetworkUnavailable()
+{
+    _syncResult.setStatus(SyncResult::Unavailable);
+    emit syncStateChange();
 }
 
 void Folder::slotChanged(const QStringList &pathList)
@@ -267,36 +271,112 @@ void Folder::slotChanged(const QStringList &pathList)
     evaluateSync(pathList);
 }
 
-void Folder::slotSyncStarted()
+void Folder::bubbleUpSyncResult()
 {
-    // disable events until syncing is done
+    // count new, removed and updated items
-    _watcher->setEventsEnabled(false);
+    int newItems = 0;
-}
+    int removedItems = 0;
+    int updatedItems = 0;
+    int ignoredItems = 0;
 
-void Folder::slotSyncFinished(const SyncResult &result)
+    SyncFileItem firstItemNew;
-{
+    SyncFileItem firstItemDeleted;
-    _watcher->setEventsEnabledDelayed(2000);
+    SyncFileItem firstItemUpdated;
 
-    qDebug() << "OO folder slotSyncFinished: result: " << int(result.status());
+    Logger *logger = Logger::instance();
-    emit syncStateChange();
 
-    // reenable the poll timer if folder is sync enabled
+    foreach (const SyncFileItem &item, _syncResult.syncFileItemVector() ) {
-    if( syncEnabled() ) {
+        if( item._instruction == CSYNC_INSTRUCTION_ERROR ) {
-        qDebug() << "* " << alias() << "Poll timer enabled with " << _pollTimer->interval() << "milliseconds";
+            slotCSyncError( tr("File %1: %2").arg(item._file).arg(item._errorString) );
-        _pollTimer->start();
+            logger->postGuiLog(tr("File %1").arg(item._file), item._errorString);
-    } else {
+
-        qDebug() << "* Not enabling poll timer for " << alias();
+        } else {
-        _pollTimer->stop();
+            if (item._dir == SyncFileItem::Down) {
+                switch (item._instruction) {
+                case CSYNC_INSTRUCTION_NEW:
+                    newItems++;
+                    if (firstItemNew.isEmpty())
+                        firstItemNew = item;
+
+                    if (item._type == SyncFileItem::Directory) {
+                        _watcher->addPath(path() + item._file);
+                    }
+
+                    break;
+                case CSYNC_INSTRUCTION_REMOVE:
+                    removedItems++;
+                    if (firstItemDeleted.isEmpty())
+                        firstItemDeleted = item;
+
+                    if (item._type == SyncFileItem::Directory) {
+                        _watcher->removePath(path() + item._file);
+                    }
+
+                    break;
+                case CSYNC_INSTRUCTION_UPDATED:
+                    updatedItems++;
+                    if (firstItemUpdated.isEmpty())
+                        firstItemUpdated = item;
+                    break;
+                case CSYNC_INSTRUCTION_ERROR:
+                    qDebug() << "Got Instruction ERROR. " << _syncResult.errorString();
+                    break;
+                default:
+                    // nothing.
+                    break;
+                }
+            } else if( item._dir == SyncFileItem::None ) { // ignored files counting.
+                if( item._instruction == CSYNC_INSTRUCTION_IGNORE ) {
+                    ignoredItems++;
+                }
+            }
+        }
+    }
+
+    _syncResult.setWarnCount(ignoredItems);
+
+    qDebug() << "OO folder slotSyncFinished: result: " << int(_syncResult.status());
+    if (newItems > 0) {
+        QString file = QDir::toNativeSeparators(firstItemNew._file);
+        if (newItems == 1)
+            logger->postGuiLog(tr("New file available"), tr("'%1' has been synced to this machine.").arg(file));
+        else
+            logger->postGuiLog(tr("New files available"), tr("'%1' and %n other file(s) have been synced to this machine.",
+                                                             "", newItems-1).arg(file));
+    }
+    if (removedItems > 0) {
+        QString file = QDir::toNativeSeparators(firstItemDeleted._file);
+        if (removedItems == 1)
+            logger->postGuiLog(tr("File removed"), tr("'%1' has been removed.").arg(file));
+        else
+            logger->postGuiLog(tr("Files removed"), tr("'%1' and %n other file(s) have been removed.",
+                                                        "", removedItems-1).arg(file));
+    }
+    if (updatedItems > 0) {
+        QString file = QDir::toNativeSeparators(firstItemUpdated._file);
+        if (updatedItems == 1)
+            logger->postGuiLog(tr("File updated"), tr("'%1' has been updated.").arg(file));
+        else
+            logger->postGuiLog(tr("Files updated"), tr("'%1' and %n other file(s) have been updated.",
+                                                       "", updatedItems-1).arg(file));
     }
 }
 
 void Folder::slotLocalPathChanged( const QString& dir )
 {
     QDir notifiedDir(dir);
-    QDir localPath(_path );
+    QDir localPath( path() );
 
-    if( notifiedDir == localPath ) {
+    if( notifiedDir.absolutePath() == localPath.absolutePath() ) {
         if( !localPath.exists() ) {
+            qDebug() << "XXXXXXX The sync folder root was removed!!";
+            if( _thread && _thread->isRunning() ) {
+                qDebug() << "CSync currently running, set wipe flag!!";
+            } else {
+                qDebug() << "CSync not running, wipe it now!!";
+                wipe();
+            }
+
             qDebug() << "ALARM: The local path was DELETED!";
         }
     }
@@ -312,20 +392,307 @@ QString Folder::configFile()
     return _configFile;
 }
 
-void Folder::setBackend( const QString& b )
+void Folder::slotThreadTreeWalkResult(const SyncFileItemVector& items)
 {
-  _backend = b;
+    _syncResult.setSyncFileItemVector(items);
 }
 
-QString Folder::backend() const
+void Folder::slotCatchWatcherError(const QString& error)
 {
-  return _backend;
+    Logger::instance()->postGuiLog(tr("Error"), error);
 }
 
+void Folder::slotTerminateSync()
+{
+    qDebug() << "folder " << alias() << " Terminating!";
+    MirallConfigFile cfg;
+    QString configDir = cfg.configPath();
+    qDebug() << "csync's Config Dir: " << configDir;
+
+    if( _thread && _csync ) {
+        csync_request_abort(_csync_ctx);
+        _thread->quit();
+        _thread->wait();
+        _csync->deleteLater();
+        delete _thread;
+        _csync = 0;
+        _thread = 0;
+        csync_resume(_csync_ctx);
+    }
+
+    if( ! configDir.isEmpty() ) {
+        QFile file( configDir + QLatin1String("/lock"));
+        if( file.exists() ) {
+            qDebug() << "After termination, lock file exists and gets removed.";
+            file.remove();
+        }
+    }
+
+    _errors.append( tr("The CSync thread terminated.") );
+    _csyncError = true;
+    qDebug() << "-> CSync Terminated!";
+    slotCSyncFinished();
+}
+
+// This removes the csync File database if the sync folder definition is removed
+// permanentely. This is needed to provide a clean startup again in case another
+// local folder is synced to the same ownCloud.
+// See http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-788
 void Folder::wipe()
 {
+    QString stateDbFile = path()+QLatin1String(".csync_journal.db");
 
+    QFile file(stateDbFile);
+    if( file.exists() ) {
+        if( !file.remove()) {
+            qDebug() << "WRN: Failed to remove existing csync StateDB " << stateDbFile;
+        } else {
+            qDebug() << "wipe: Removed csync StateDB " << stateDbFile;
+        }
+    } else {
+        qDebug() << "WRN: statedb is empty, can not remove.";
+    }
+    // Check if the tmp database file also exists
+    QString ctmpName = path() + QLatin1String(".csync_journal.db.ctmp");
+    QFile ctmpFile( ctmpName );
+    if( ctmpFile.exists() ) {
+        ctmpFile.remove();
+    }
 }
 
+void Folder::setIgnoredFiles()
+{
+    MirallConfigFile cfgFile;
+    csync_clear_exclude_list( _csync_ctx );
+    QString excludeList = cfgFile.excludeFile( MirallConfigFile::SystemScope );
+    if( !excludeList.isEmpty() ) {
+        qDebug() << "==== added system ignore list to csync:" << excludeList.toUtf8();
+        csync_add_exclude_list( _csync_ctx, excludeList.toUtf8() );
+    }
+    excludeList = cfgFile.excludeFile( MirallConfigFile::UserScope );
+    if( !excludeList.isEmpty() ) {
+        qDebug() << "==== added user defined ignore list to csync:" << excludeList.toUtf8();
+        csync_add_exclude_list( _csync_ctx, excludeList.toUtf8() );
+    }
+}
+
+void Folder::setProxy()
+{
+    if( _csync_ctx ) {
+        /* Store proxy */
+        QUrl proxyUrl(ownCloudInfo::instance()->webdavUrl());
+        QList<QNetworkProxy> proxies = QNetworkProxyFactory::proxyForQuery(proxyUrl);
+        // We set at least one in Application
+        Q_ASSERT(proxies.count() > 0);
+        QNetworkProxy proxy = proxies.first();
+        if (proxy.type() == QNetworkProxy::NoProxy) {
+            qDebug() << "Passing NO proxy to csync for" << proxyUrl;
+        } else {
+            qDebug() << "Passing" << proxy.hostName() << "of proxy type " << proxy.type()
+                     << " to csync for" << proxyUrl;
+        }
+        int proxyPort = proxy.port();
+
+        csync_set_module_property(_csync_ctx, "proxy_type", (char*) proxyTypeToCStr(proxy.type()) );
+        csync_set_module_property(_csync_ctx, "proxy_host", proxy.hostName().toUtf8().data() );
+        csync_set_module_property(_csync_ctx, "proxy_port", &proxyPort );
+        csync_set_module_property(_csync_ctx, "proxy_user", proxy.user().toUtf8().data()     );
+        csync_set_module_property(_csync_ctx, "proxy_pwd" , proxy.password().toUtf8().data() );
+
+        FolderMan::instance()->setDirtyProxy(false);
+    }
+}
+
+
+const char* Folder::proxyTypeToCStr(QNetworkProxy::ProxyType type)
+{
+    switch (type) {
+    case QNetworkProxy::NoProxy:
+        return "NoProxy";
+    case QNetworkProxy::DefaultProxy:
+        return "DefaultProxy";
+    case QNetworkProxy::Socks5Proxy:
+        return "Socks5Proxy";
+    case QNetworkProxy::HttpProxy:
+        return "HttpProxy";
+    case QNetworkProxy::HttpCachingProxy:
+        return "HttpCachingProxy";
+    case QNetworkProxy::FtpCachingProxy:
+        return "FtpCachingProxy";
+    default:
+        return "NoProxy";
+    }
+}
+
+void Folder::startSync(const QStringList &pathList)
+{
+    Q_UNUSED(pathList)
+    if (!_csync_ctx) {
+        // no _csync_ctx yet,  initialize it.
+        init();
+        setProxy();
+
+        if (!_csync_ctx) {
+            qDebug() << Q_FUNC_INFO << "init failed.";
+            // the error should already be set
+            QMetaObject::invokeMethod(this, "slotCSyncFinished", Qt::QueuedConnection);
+            return;
+        }
+    } else if (FolderMan::instance()->isDirtyProxy()) {
+        setProxy();
+    }
+
+    if (_thread && _thread->isRunning()) {
+        qCritical() << "* ERROR csync is still running and new sync requested.";
+        return;
+    }
+    if (_thread)
+        _thread->quit();
+    delete _csync;
+    delete _thread;
+    _errors.clear();
+    _csyncError = false;
+    _csyncUnavail = false;
+
+    _syncResult.clearErrors();
+    _syncResult.setStatus( SyncResult::SyncPrepare );
+    emit syncStateChange();
+
+
+    qDebug() << "*** Start syncing";
+    _thread = new QThread(this);
+    _thread->setPriority(QThread::LowPriority);
+    setIgnoredFiles();
+    _csync = new CSyncThread( _csync_ctx );
+    _csync->moveToThread(_thread);
+
+
+    qRegisterMetaType<SyncFileItemVector>("SyncFileItemVector");
+    qRegisterMetaType<SyncFileItem::Direction>("SyncFileItem::Direction");
+
+    connect( _csync, SIGNAL(treeWalkResult(const SyncFileItemVector&)),
+              this, SLOT(slotThreadTreeWalkResult(const SyncFileItemVector&)), Qt::QueuedConnection);
+
+    connect(_csync, SIGNAL(started()),  SLOT(slotCSyncStarted()), Qt::QueuedConnection);
+    connect(_csync, SIGNAL(finished()), SLOT(slotCSyncFinished()), Qt::QueuedConnection);
+    connect(_csync, SIGNAL(csyncError(QString)), SLOT(slotCSyncError(QString)), Qt::QueuedConnection);
+    connect(_csync, SIGNAL(csyncUnavailable()), SLOT(slotCsyncUnavailable()), Qt::QueuedConnection);
+
+    //blocking connection so the message box happens in this thread, but block the csync thread.
+    connect(_csync, SIGNAL(aboutToRemoveAllFiles(SyncFileItem::Direction,bool*)),
+                    SLOT(slotAboutToRemoveAllFiles(SyncFileItem::Direction,bool*)), Qt::BlockingQueuedConnection);
+    connect(_csync, SIGNAL(transmissionProgress(Progress::Info)), this, SLOT(slotTransmissionProgress(Progress::Info)));
+
+    _thread->start();
+    QMetaObject::invokeMethod(_csync, "startSync", Qt::QueuedConnection);
+
+    // disable events until syncing is done
+    _watcher->setEventsEnabled(false);
+    _pollTimer.stop();
+    emit syncStarted();
+}
+
+void Folder::slotCSyncError(const QString& err)
+{
+    _errors.append( err );
+    _csyncError = true;
+}
+
+void Folder::slotCSyncStarted()
+{
+    qDebug() << "    * csync thread started";
+    _syncResult.setStatus(SyncResult::SyncRunning);
+    emit syncStateChange();
+}
+
+void Folder::slotCsyncUnavailable()
+{
+    _csyncUnavail = true;
+}
+
+void Folder::slotCSyncFinished()
+{
+    qDebug() << "-> CSync Finished slot with error " << _csyncError;
+    _watcher->setEventsEnabledDelayed(2000);
+    _pollTimer.start();
+    _timeSinceLastSync.restart();
+
+    bubbleUpSyncResult();
+
+    if (_csyncError) {
+        _syncResult.setStatus(SyncResult::Error);
+        qDebug() << "  ** error Strings: " << _errors;
+        _syncResult.setErrorStrings( _errors );
+        qDebug() << "    * owncloud csync thread finished with error";
+    } else if (_csyncUnavail) {
+        _syncResult.setStatus(SyncResult::Unavailable);
+    } else if( _syncResult.warnCount() > 0 ) {
+        // there have been warnings on the way.
+        _syncResult.setStatus(SyncResult::Problem);
+    } else {
+        _syncResult.setStatus(SyncResult::Success);
+    }
+
+    if( _thread && _thread->isRunning() ) {
+        _thread->quit();
+    }
+    emit syncStateChange();
+    ownCloudInfo::instance()->getQuotaRequest("/");
+    emit syncFinished( _syncResult );
+}
+
+void Folder::slotTransmissionProgress(const Progress::Info& progress)
+{
+    Progress::Info newInfo = progress;
+    newInfo.folder = alias();
+
+    if(newInfo.current_file.startsWith(QLatin1String("ownclouds://")) ||
+            newInfo.current_file.startsWith(QLatin1String("owncloud://")) ) {
+        // rip off the whole ownCloud URL.
+        QString remotePathUrl = ownCloudInfo::instance()->webdavUrl() + secondPath();
+        newInfo.current_file.remove(Utility::toCSyncScheme(remotePathUrl));
+    }
+    QString localPath = path();
+    if( newInfo.current_file.startsWith(localPath) ) {
+        // remove the local dir.
+        newInfo.current_file = newInfo.current_file.right( newInfo.current_file.length() - localPath.length());
+    }
+
+    // remember problems happening to set the correct Sync status in slot slotCSyncFinished.
+    if( newInfo.kind == Progress::StartSync ) {
+        _syncResult.setWarnCount(0);
+    }
+    if( newInfo.kind == Progress::Error ) {
+        _syncResult.setWarnCount( _syncResult.warnCount()+1 );
+    }
+
+    ProgressDispatcher::instance()->setProgressInfo(alias(), newInfo);
+}
+
+void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction direction, bool *cancel)
+{
+    QString msg = direction == SyncFileItem::Down ?
+        tr("This sync would remove all the files in the local sync folder '%1'.\n"
+           "If you or your administrator have reset your account on the server, choose "
+           "\"Keep files\". If you want your data to be removed, choose \"Remove all files\".") :
+        tr("This sync would remove all the files in the sync folder '%1'.\n"
+           "This might be because the folder was silently reconfigured, or that all "
+           "the file were manually removed.\n"
+           "Are you sure you want to perform this operation?");
+    QMessageBox msgBox(QMessageBox::Warning, tr("Remove All Files?"),
+                       msg.arg(alias()));
+    msgBox.addButton(tr("Remove all files"), QMessageBox::DestructiveRole);
+    QPushButton* keepBtn = msgBox.addButton(tr("Keep files"), QMessageBox::ActionRole);
+    if (msgBox.exec() == -1) {
+        *cancel = true;
+        return;
+    }
+    *cancel = msgBox.clickedButton() == keepBtn;
+    if (*cancel) {
+        wipe();
+    }
+}
+
+
 } // namespace Mirall
 

src/mirall/folder.h

@@ -1,5 +1,7 @@
 /*
  * Copyright (C) by Duncan Mac-Vicar P. <duncan@kde.org>
+ * Copyright (C) by Daniel Molkentin <danimo@owncloud.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
@@ -15,38 +17,61 @@
 #ifndef MIRALL_FOLDER_H
 #define MIRALL_FOLDER_H
 
-
-#include <QObject>
-#include <QString>
-#include <QStringList>
-#include <QHash>
-#include <QTimer>
-
-#if QT_VERSION >= 0x040700
-#include <QNetworkConfigurationManager>
-#endif
-
 #include "mirall/syncresult.h"
+#include "mirall/progressdispatcher.h"
+#include "mirall/csyncthread.h"
+
+#include <QDir>
+#include <QHash>
+#include <QNetworkAccessManager>
+#include <QNetworkProxy>
+#include <QObject>
+#include <QStringList>
+
+#include <QDebug>
+#include <QTimer>
+#include <qelapsedtimer.h>
 
-class QAction;
-class QIcon;
 class QFileSystemWatcher;
+class QThread;
 
 namespace Mirall {
 
 class FolderWatcher;
 
+typedef enum SyncFileStatus_s {
+    STATUS_NONE,
+    STATUS_EVAL,
+    STATUS_REMOVE,
+    STATUS_RENAME,
+    STATUS_NEW,
+    STATUS_CONFLICT,
+    STATUS_IGNORE,
+    STATUS_SYNC,
+    STATUS_STAT_ERROR,
+    STATUS_ERROR,
+    STATUS_UPDATED
+} SyncFileStatus;
+
 class Folder : public QObject
 {
     Q_OBJECT
 
-public:
+protected:
+    friend class FolderMan;
     Folder(const QString&, const QString&, const QString& , QObject*parent = 0L);
-    virtual ~Folder();
+
+public:
+    ~Folder();
 
     typedef QHash<QString, Folder*> Map;
     typedef QHashIterator<QString, Folder*> MapIterator;
 
+    /**
+     * Get status about a single file.
+     */
+    SyncFileStatus fileStatus( const QString& );
+
     /**
      * alias or nickname
      */
@@ -56,12 +81,16 @@ public:
      * local folder path
      */
     QString path() const;
-    virtual QString secondPath() const;
+    /**
+     * remote folder path
+     */
+    QString secondPath() const;
 
     /**
      * local folder path with native separators
      */
     QString nativePath() const;
+
     /**
      * switch sync on or off
      * If the sync is switched off, the startSync method is not going to
@@ -71,69 +100,17 @@ public:
 
      bool syncEnabled() const;
 
-    /**
-     * Starts a sync operation
-     *
-     * If the list of changed files is known, it is passed.
-     *
-     * If the list of changed files is empty, the folder
-     * implementation should figure it by itself of
-     * perform a full scan of changes
-     */
-    virtual void startSync(const QStringList &pathList) = 0;
-
     /**
      * True if the folder is busy and can't initiate
      * a synchronization
      */
-    virtual bool isBusy() const = 0;
+    virtual bool isBusy() const;
-
-    /**
-     * only sync when online in the network
-     */
-    bool onlyOnlineEnabled() const;
-
-    /**
-     * @see onlyOnlineEnabled
-     */
-    void setOnlyOnlineEnabled(bool enabled);
-
-    /**
-     * only sync when online in the same LAN
-     * as the one used during setup
-     */
-    bool onlyThisLANEnabled() const;
-
-    /**
-     * @see onlyThisLANEnabled
-     */
-    void setOnlyThisLANEnabled(bool enabled);
-
-
-    /**
-      * error counter, stop syncing after the counter reaches a certain
-      * number.
-      */
-    int errorCount();
-
-    void resetErrorCount();
-
-    void incrementErrorCount();
 
     /**
      * return the last sync result with error message and status
      */
      SyncResult syncResult() const;
 
-     /**
-     * set the backend description string.
-     */
-     void setBackend( const QString& );
-     /**
-     * get the backend description string.
-     */
-     QString backend() const;
-
      /**
       * set the config file name.
       */
@@ -145,9 +122,6 @@ public:
       */
      virtual void wipe();
 
-     QIcon icon( int size ) const;
-     QTimer   *_pollTimer;
-
 signals:
     void syncStateChange();
     void syncStarted();
@@ -155,7 +129,6 @@ signals:
     void scheduleToSync( const QString& );
 
 public slots:
-     void slotSyncFinished(const SyncResult &);
 
      /**
        *
@@ -165,48 +138,47 @@ public slots:
      /**
        * terminate the current sync run
        */
-     virtual void slotTerminateSync() = 0;
+     void slotTerminateSync();
+
+     void slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool*);
+
 
      /**
-      * Sets minimum amounts of milliseconds that will separate
+      * Starts a sync operation
-      * poll intervals
+      *
+      * If the list of changed files is known, it is passed.
       */
-     void setPollInterval( int );
+      void startSync(const QStringList &pathList = QStringList());
 
-     /**
+private slots:
-      * If folder is network-based, reimplement to react to proxy changes
+    void slotCSyncStarted();
-      */
+    void slotCSyncError(const QString& );
-     virtual void setProxy() {}
+    void slotCsyncUnavailable();
+    void slotCSyncFinished();
 
-protected:
+    void slotTransmissionProgress(const Progress::Info& progress);
-    /**
-     * The minimum amounts of seconds to wait before
-     * doing a full sync to see if the remote changed
-     */
-    int pollInterval() const;
-    void setSyncState(SyncResult::Status state);
-
-    FolderWatcher *_watcher;
-    int _errorCount;
-    SyncResult _syncResult;
-
-protected slots:
-
-    void slotOnlineChanged(bool online);
 
     void slotPollTimerTimeout();
-
+    void etagRetreived(const QString &);
-    /* called when the watcher detect a list of changed
+    void slotNetworkUnavailable();
-       paths */
-
-    void slotSyncStarted();
 
     /**
      * Triggered by a file system watcher on the local sync dir
      */
-    virtual void slotLocalPathChanged( const QString& );
+    void slotLocalPathChanged( const QString& );
+    void slotThreadTreeWalkResult(const SyncFileItemVector& );
+    void slotCatchWatcherError( const QString& );
 
-private:
+protected:
+    bool init();
+
+    void setSyncState(SyncResult::Status state);
+
+    void setIgnoredFiles();
+    void setProxy();
+    const char* proxyTypeToCStr(QNetworkProxy::ProxyType type);
+
+    void bubbleUpSyncResult();
 
     /**
      * Starts a sync (calling startSync)
@@ -214,23 +186,28 @@ private:
      */
     void evaluateSync(const QStringList &pathList);
 
-    virtual void checkLocalPath();
+    void checkLocalPath();
 
     QString   _path;
     QString   _secondPath;
     QString   _alias;
-    bool      _onlyOnlineEnabled;
-    bool      _onlyThisLANEnabled;
     QString   _configFile;
-
     QFileSystemWatcher *_pathWatcher;
-
-#if QT_VERSION >= 0x040700
-    QNetworkConfigurationManager _networkMgr;
-#endif
-    bool       _online;
     bool       _enabled;
-    QString    _backend;
+    FolderWatcher *_watcher;
+    SyncResult _syncResult;
+    QThread     *_thread;
+    CSyncThread *_csync;
+    QStringList  _errors;
+    bool         _csyncError;
+    bool         _csyncUnavail;
+    bool         _wipeDb;
+    Progress::Kind _progressKind;
+    QTimer        _pollTimer;
+    QString       _lastEtag;
+    QElapsedTimer _timeSinceLastSync;
+
+    CSYNC *_csync_ctx;
 
 };
 

src/mirall/folderman.cpp

@@ -14,10 +14,11 @@
 
 #include "mirall/folderman.h"
 #include "mirall/mirallconfigfile.h"
-#include "mirall/owncloudfolder.h"
+#include "mirall/folder.h"
 #include "mirall/syncresult.h"
 #include "mirall/inotify.h"
 #include "mirall/theme.h"
+#include "owncloudinfo.h"
 
 #ifdef Q_OS_MAC
 #include <CoreServices/CoreServices.h>
@@ -27,13 +28,17 @@
 #endif
 
 #include <QDesktopServices>
+#include <QMessageBox>
 #include <QtCore>
 
 namespace Mirall {
 
+FolderMan* FolderMan::_instance = 0;
+
 FolderMan::FolderMan(QObject *parent) :
     QObject(parent),
-    _syncEnabled( true )
+    _syncEnabled( true ),
+    _dirtyProxy( true )
 {
     // if QDir::mkpath would not be so stupid, I would not need to have this
     // duplication of folderConfigPath() here
@@ -47,11 +52,17 @@ FolderMan::FolderMan(QObject *parent) :
             this, SIGNAL(folderSyncStateChange(const QString &)));
 }
 
+FolderMan *FolderMan::instance()
+{
+    if(!_instance)
+        _instance = new FolderMan;
+
+    return _instance;
+}
+
 FolderMan::~FolderMan()
 {
-    foreach (Folder *folder, _folderMap) {
+    qDeleteAll(_folderMap);
-        delete folder;
-    }
 }
 
 Mirall::Folder::Map FolderMan::map()
@@ -63,15 +74,7 @@ Mirall::Folder::Map FolderMan::map()
 int FolderMan::setupFolders()
 {
     // setup a handler to look for configuration changes
-#ifdef CHECK_FOR_SETUP_CHANGES
+    return setupKnownFolders();
-    _configFolderWatcher = new FolderWatcher( _folderConfigPath );
-    _configFolderWatcher->setEventInterval(20000);
-    connect(_configFolderWatcher, SIGNAL(folderChanged(const QStringList &)),
-            this, SLOT( slotReparseConfiguration()) );
-#endif
-    int cnt = setupKnownFolders();
-
-    return cnt;
 }
 
 void FolderMan::slotReparseConfiguration()
@@ -79,20 +82,25 @@ void FolderMan::slotReparseConfiguration()
     setupKnownFolders();
 }
 
+int FolderMan::unloadAllFolders()
+{
+    int cnt = 0;
+
+    // clear the list of existing folders.
+    Folder::MapIterator i(_folderMap);
+    while (i.hasNext()) {
+        i.next();
+        delete _folderMap.take( i.key() );
+        cnt++;
+    }
+    return cnt;
+}
 
 int FolderMan::setupKnownFolders()
 {
   qDebug() << "* Setup folders from " << _folderConfigPath;
 
-  // first terminate sync jobs.
+  unloadAllFolders();
-  terminateCurrentSync();
-
-  // clear the list of existing folders.
-  Folder::MapIterator i(_folderMap);
-  while (i.hasNext()) {
-      i.next();
-      delete _folderMap.take( i.key() );
-  }
 
   QDir dir( _folderConfigPath );
   dir.setFilter(QDir::Files);
@@ -117,6 +125,25 @@ void FolderMan::wipeAllJournals()
     }
 }
 
+bool FolderMan::ensureJournalGone(const QString &localPath)
+{
+
+    // remove old .csync_journal file
+    QString stateDbFile = localPath+QLatin1String("/.csync_journal.db");
+    while (QFile::exists(stateDbFile) && !QFile::remove(stateDbFile)) {
+        int ret = QMessageBox::warning(0, tr("Could not reset folder state"),
+                                       tr("An old sync journal '%1' was found, "
+                                          "but could not be removed. Please make sure "
+                                          "that no application is currently using it.")
+                                       .arg(QDir::fromNativeSeparators(QDir::cleanPath(stateDbFile))),
+                                       QMessageBox::Retry|QMessageBox::Abort);
+        if (ret == QMessageBox::Abort) {
+            return false;
+        }
+    }
+    return true;
+}
+
 void FolderMan::terminateCurrentSync()
 {
     if( !_currentSyncFolder.isEmpty() ) {
@@ -218,43 +245,28 @@ Folder* FolderMan::setupFolderFromConfigFile(const QString &file) {
     // QString connection = settings.value( QLatin1String("connection") ).toString();
     QString alias = unescapeAlias( escapedAlias );
 
-    if (!backend.isEmpty()) {
+    if (backend.isEmpty() || backend != QLatin1String("owncloud")) {
-
+        qWarning() << "obsolete configuration of type" << backend;
-        if( backend == QLatin1String("owncloud") ) {
+        return 0;
-            MirallConfigFile cfgFile;
-
-            // assemble the owncloud url to pass to csync, incl. webdav
-            QString oCUrl = cfgFile.ownCloudUrl( QString::null, true );
-
-            // cut off the leading slash, oCUrl always has a trailing.
-            if( targetPath.startsWith(QLatin1Char('/')) ) {
-                targetPath.remove(0,1);
-            }
-
-            folder = new ownCloudFolder( alias, path, oCUrl + targetPath, this );
-            folder->setConfigFile(file);
-        } else {
-            qWarning() << "unknown backend" << backend;
-            return NULL;
-        }
     }
 
-    if( folder ) {
+    // cut off the leading slash, oCUrl always has a trailing.
-        folder->setBackend( backend );
+    if( targetPath.startsWith(QLatin1Char('/')) ) {
-        // folder->setOnlyOnlineEnabled(settings.value("folder/onlyOnline", false).toBool());
+        targetPath.remove(0,1);
-        folder->setOnlyThisLANEnabled(settings.value(QLatin1String("folder/onlyThisLAN"), false).toBool());
-
-        _folderMap[alias] = folder;
-
-        qDebug() << "Adding folder to Folder Map " << folder;
-        /* Use a signal mapper to connect the signals to the alias */
-        connect(folder, SIGNAL(scheduleToSync(const QString&)), SLOT(slotScheduleSync(const QString&)));
-        connect(folder, SIGNAL(syncStateChange()), _folderChangeSignalMapper, SLOT(map()));
-        connect(folder, SIGNAL(syncStarted()), SLOT(slotFolderSyncStarted()));
-        connect(folder, SIGNAL(syncFinished(SyncResult)), SLOT(slotFolderSyncFinished(SyncResult)));
-
-        _folderChangeSignalMapper->setMapping( folder, folder->alias() );
     }
+
+    folder = new Folder( alias, path, targetPath, this );
+    folder->setConfigFile(file);
+    qDebug() << "Adding folder to Folder Map " << folder;
+    _folderMap[alias] = folder;
+
+    /* Use a signal mapper to connect the signals to the alias */
+    connect(folder, SIGNAL(scheduleToSync(const QString&)), SLOT(slotScheduleSync(const QString&)));
+    connect(folder, SIGNAL(syncStateChange()), _folderChangeSignalMapper, SLOT(map()));
+    connect(folder, SIGNAL(syncStarted()), SLOT(slotFolderSyncStarted()));
+    connect(folder, SIGNAL(syncFinished(SyncResult)), SLOT(slotFolderSyncFinished(SyncResult)));
+
+    _folderChangeSignalMapper->setMapping( folder, folder->alias() );
     return folder;
 }
 
@@ -275,12 +287,18 @@ void FolderMan::slotEnableFolder( const QString& alias, bool enable )
 // csync still remains in a stable state, regardless of that.
 void FolderMan::terminateSyncProcess( const QString& alias )
 {
-    Folder *f = _folderMap[alias];
+    QString folderAlias = alias;
-    if( f ) {
+    if( alias.isEmpty() ) {
-        f->slotTerminateSync();
+        folderAlias = _currentSyncFolder;
+    }
+    if( ! folderAlias.isEmpty() ) {
+        Folder *f = _folderMap[folderAlias];
+        if( f ) {
+            f->slotTerminateSync();
 
-        if(_currentSyncFolder == alias )
+            if(_currentSyncFolder == folderAlias )
-            _currentSyncFolder = QString::null;
+                _currentSyncFolder.clear();
+        }
     }
 }
 
@@ -296,19 +314,21 @@ Folder *FolderMan::folder( const QString& alias )
 
 SyncResult FolderMan::syncResult( const QString& alias )
 {
-    SyncResult res;
     Folder *f = folder( alias );
+    return syncResult(f);
+}
 
-    if( f ) {
+SyncResult FolderMan::syncResult( Folder *f )
-        res = f->syncResult();
+{
-    }
+   return f ? f->syncResult() : SyncResult();
-    return res;
 }
 
 void FolderMan::slotScheduleAllFolders()
 {
     foreach( Folder *f, _folderMap.values() ) {
-        slotScheduleSync( f->alias() );
+        if (f->syncEnabled()) {
+            slotScheduleSync( f->alias() );
+        }
     }
 }
 
@@ -327,17 +347,19 @@ void FolderMan::slotScheduleSync( const QString& alias )
     }
 
     if( ! _scheduleQueue.contains(alias )) {
-        _scheduleQueue.append(alias);
+        _scheduleQueue.enqueue(alias);
     } else {
         qDebug() << " II> Sync for folder " << alias << " already scheduled, do not enqueue!";
     }
-
     slotScheduleFolderSync();
-
 }
 
 void FolderMan::setSyncEnabled( bool enabled )
 {
+    if (!_syncEnabled && enabled && !_scheduleQueue.isEmpty()) {
+        // We have things in our queue that were waiting the the connection to go back on.
+        QTimer::singleShot(200, this, SLOT(slotScheduleFolderSync()));
+    }
     _syncEnabled = enabled;
 }
 
@@ -360,11 +382,14 @@ void FolderMan::slotScheduleFolderSync()
 
     qDebug() << "XX slotScheduleFolderSync: folderQueue size: " << _scheduleQueue.count();
     if( ! _scheduleQueue.isEmpty() ) {
-        const QString alias = _scheduleQueue.takeFirst();
+        const QString alias = _scheduleQueue.dequeue();
         if( _folderMap.contains( alias ) ) {
+            ownCloudInfo::instance()->getQuotaRequest("/");
             Folder *f = _folderMap[alias];
             _currentSyncFolder = alias;
-            f->startSync( QStringList() );
+            if (f->syncEnabled()) {
+                f->startSync( QStringList() );
+            }
         }
     }
 }
@@ -386,28 +411,17 @@ void FolderMan::slotFolderSyncFinished( const SyncResult& )
     QTimer::singleShot(200, this, SLOT(slotScheduleFolderSync()));
 }
 
-/**
+void FolderMan::addFolderDefinition(const QString& alias, const QString& sourceFolder, const QString& targetPath )
-  * Add a folder definition to the config
-  * Params:
-  * QString backend
-  * QString alias
-  * QString sourceFolder on local machine
-  * QString targetPath on remote
-  * bool    onlyThisLAN, currently unused.
-  */
-void FolderMan::addFolderDefinition( const QString& backend, const QString& alias,
-                                     const QString& sourceFolder, const QString& targetPath,
-                                     bool onlyThisLAN )
 {
     QString escapedAlias = escapeAlias(alias);
     // Create a settings file named after the alias
     QSettings settings( _folderConfigPath + QLatin1Char('/') + escapedAlias, QSettings::IniFormat);
-
+    settings.beginGroup(escapedAlias);
-    settings.setValue(QString::fromLatin1("%1/localPath").arg(escapedAlias),   sourceFolder );
+    settings.setValue(QLatin1String("localPath"),   sourceFolder );
-    settings.setValue(QString::fromLatin1("%1/targetPath").arg(escapedAlias),  targetPath );
+    settings.setValue(QLatin1String("targetPath"),  targetPath );
-    settings.setValue(QString::fromLatin1("%1/backend").arg(escapedAlias),     backend );
+    // for compat reasons
-    settings.setValue(QString::fromLatin1("%1/connection").arg(escapedAlias),  Theme::instance()->appName());
+    settings.setValue(QLatin1String("backend"),     "owncloud" );
-    settings.setValue(QString::fromLatin1("%1/onlyThisLAN").arg(escapedAlias), onlyThisLAN );
+    settings.setValue(QLatin1String("connection"),  Theme::instance()->appName());
     settings.sync();
 }
 
@@ -437,6 +451,8 @@ void FolderMan::removeFolder( const QString& alias )
 {
     Folder *f = 0;
 
+    _scheduleQueue.removeAll(alias);
+
     if( _folderMap.contains( alias )) {
         qDebug() << "Removing " << alias;
         f = _folderMap.take( alias );
@@ -464,7 +480,7 @@ QString FolderMan::getBackupName( const QString& fullPathName ) const
      int cnt = 1;
      do {
          if( fi.exists() ) {
-             newName += fullPathName + QString( ".oC_bak_%1").arg(cnt++);
+             newName = fullPathName + QString( ".oC_bak_%1").arg(cnt++);
              fi.setFile(newName);
          }
      } while( fi.exists() );
@@ -479,6 +495,13 @@ bool FolderMan::startFromScratch( const QString& localFolder )
     QFileInfo fi( localFolder );
     if( fi.exists() && fi.isDir() ) {
         QDir file = fi.dir();
+
+        // check if there are files in the directory.
+        if( file.count() == 0 ) {
+            // directory is existing, but its empty. Use it.
+            qDebug() << "startFromScratch: Directory is empty!";
+            return true;
+        }
         QString newName = getBackupName( fi.absoluteFilePath() );
 
         if( file.rename( fi.absoluteFilePath(), newName )) {
@@ -490,11 +513,89 @@ bool FolderMan::startFromScratch( const QString& localFolder )
     return false;
 }
 
-void FolderMan::setProxy()
+SyncResult FolderMan::accountStatus(const QList<Folder*> &folders)
 {
-    foreach( Folder *f, _folderMap.values() ) {
+    SyncResult overallResult(SyncResult::Undefined);
-        f->setProxy();
+
+    foreach ( Folder *folder, folders ) {
+        SyncResult folderResult = folder->syncResult();
+        SyncResult::Status syncStatus = folderResult.status();
+
+        switch( syncStatus ) {
+        case SyncResult::Undefined:
+            if ( overallResult.status() != SyncResult::Error )
+                overallResult.setStatus(SyncResult::Error);
+            break;
+        case SyncResult::NotYetStarted:
+            overallResult.setStatus( SyncResult::NotYetStarted );
+            break;
+        case SyncResult::SyncPrepare:
+            overallResult.setStatus( SyncResult::SyncPrepare );
+            break;
+        case SyncResult::SyncRunning:
+            overallResult.setStatus( SyncResult::SyncRunning );
+            break;
+        case SyncResult::Unavailable:
+            overallResult.setStatus( SyncResult::Unavailable );
+            break;
+        case SyncResult::Success:
+            if( overallResult.status() == SyncResult::Undefined )
+                overallResult.setStatus( SyncResult::Success );
+            break;
+        case SyncResult::Error:
+            overallResult.setStatus( SyncResult::Error );
+            break;
+        case SyncResult::SetupError:
+            if ( overallResult.status() != SyncResult::Error )
+                overallResult.setStatus( SyncResult::SetupError );
+            break;
+        case SyncResult::Problem:
+            if ( overallResult.status() != SyncResult::Problem )
+                overallResult.setStatus( SyncResult::Problem );
+            break;
+        // no default case on purpose, check compiler warnings
+        }
     }
+    return overallResult;
 }
 
+QString FolderMan::statusToString( SyncResult syncStatus, bool enabled ) const
+{
+    QString folderMessage;
+    switch( syncStatus.status() ) {
+    case SyncResult::Undefined:
+        folderMessage = tr( "Undefined State." );
+        break;
+    case SyncResult::NotYetStarted:
+        folderMessage = tr( "Waits to start syncing." );
+        break;
+    case SyncResult::SyncPrepare:
+        folderMessage = tr( "Preparing for sync." );
+        break;
+    case SyncResult::SyncRunning:
+        folderMessage = tr( "Sync is running." );
+        break;
+    case SyncResult::Unavailable:
+        folderMessage = tr( "Server is currently not available." );
+        break;
+    case SyncResult::Success:
+        folderMessage = tr( "Last Sync was successful." );
+        break;
+    case SyncResult::Error:
+        break;
+    case SyncResult::Problem:
+        folderMessage = tr( "Last Sync was successful, but with warnings on individual files.");
+        break;
+    case SyncResult::SetupError:
+        folderMessage = tr( "Setup Error." );
+        break;
+    // no default case on purpose, check compiler warnings
+    }
+    if( !enabled ) {
+        // sync is disabled.
+        folderMessage = tr( "%1 (Sync is paused)" ).arg(folderMessage);
+    }
+    return folderMessage;
 }
+
+} // namespace Mirall

src/mirall/folderman.h

@@ -18,6 +18,7 @@
 
 #include <QObject>
 #include <QQueue>
+#include <QList>
 
 #include "mirall/folder.h"
 #include "mirall/folderwatcher.h"
@@ -25,15 +26,15 @@
 
 class QSignalMapper;
 
-namespace Mirall {
-
 class SyncResult;
 
+namespace Mirall {
+
 class FolderMan : public QObject
 {
     Q_OBJECT
 public:
-    explicit FolderMan(QObject *parent = 0);
+    static FolderMan* instance();
     ~FolderMan();
 
     int setupFolders();
@@ -43,48 +44,43 @@ public:
     /**
       * Add a folder definition to the config
       * Params:
-      * QString backend
       * QString alias
       * QString sourceFolder on local machine
       * QString targetPath on remote
-      * bool    onlyThisLAN, currently unused.
       */
-    void addFolderDefinition( const QString&, const QString&, const QString&, const QString&, bool );
+    void addFolderDefinition(const QString&, const QString&, const QString& );
 
-    /**
+    /** Returns the folder by alias or NULL if no folder with the alias exists. */
-      * return the folder by alias or NULL if no folder with the alias exists.
-      */
     Folder *folder( const QString& );
 
-    /**
+    /** Returns the last sync result by alias */
-      * return the last sync result by alias
-      */
     SyncResult syncResult( const QString& );
 
-    /**
+    /** Returns the last sync result by Folder */
-      * creates a folder for a specific configuration, identified by alias.
+    SyncResult syncResult( Folder* );
-      */
+
+    /** Creates a folder for a specific configuration, identified by alias. */
     Folder* setupFolderFromConfigFile(const QString & );
 
-    /**
+    /** Wipes all folder defintions. No way back! */
-     * wipes all folder defintions. No way back!
-     */
     void removeAllFolderDefinitions();
 
-    /**
+    /** Removes csync journals from all folders. */
-     * Removes csync journals from all folders.
-     */
     void wipeAllJournals();
 
     /**
-     * Creates a new and empty local directory.
+     * Ensures that a given directory does not contain a .csync_journal.
+     *
+     * @returns false if the journal could not be removed, true otherwise.
      */
+    static bool ensureJournalGone(const QString &path);
+
+    /** Creates a new and empty local directory. */
     bool startFromScratch( const QString& );
 
-    /**
+    QString statusToString( SyncResult, bool enabled ) const;
-     *  called whenever proxy configuration changes
+
-     */
+    static SyncResult accountStatus( const QList<Folder*> &folders );
-    void setProxy();
 
 signals:
     /**
@@ -102,7 +98,10 @@ public slots:
 
     void slotReparseConfiguration();
 
-    void terminateSyncProcess( const QString& );
+    void terminateSyncProcess( const QString& alias = QString::null );
+
+    /* delete all folder objects */
+    int unloadAllFolders();
 
     // if enabled is set to false, no new folders will start to sync.
     // the current one will finish.
@@ -110,6 +109,9 @@ public slots:
 
     void slotScheduleAllFolders();
 
+    bool isDirtyProxy() { return _dirtyProxy; }
+    void setDirtyProxy(bool value = true) { _dirtyProxy = value; }
+
 private slots:
     // slot to add a folder to the syncing queue
     void slotScheduleSync( const QString & );
@@ -131,14 +133,18 @@ private:
 
     void removeFolder( const QString& );
 
-    FolderWatcher *_configFolderWatcher;
     Folder::Map    _folderMap;
     QString        _folderConfigPath;
     QSignalMapper *_folderChangeSignalMapper;
     QString        _currentSyncFolder;
-    QStringList    _scheduleQueue;
     bool           _syncEnabled;
+    QQueue<QString> _scheduleQueue;
+    bool            _dirtyProxy; // If the proxy need to be re-configured
+
+    explicit FolderMan(QObject *parent = 0);
+    static FolderMan *_instance;
+
 };
 
-}
+} // namespace Mirall
 #endif // FOLDERMAN_H

src/mirall/folderstatusmodel.cpp

@@ -0,0 +1,306 @@
+/*
+ * Copyright (C) by Klaas Freitag <freitag@kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "mirall/folderstatusmodel.h"
+#include "mirall/utility.h"
+
+#include <QtCore>
+#include <QtGui>
+
+namespace Mirall {
+
+FolderStatusModel::FolderStatusModel()
+    :QStandardItemModel()
+{
+
+}
+
+Qt::ItemFlags FolderStatusModel::flags ( const QModelIndex&  ) const
+{
+    return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+}
+
+QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid())
+        return QVariant();
+
+    if (role == Qt::EditRole)
+        return QVariant();
+    else
+        return QStandardItemModel::data(index,role);
+}
+
+// ====================================================================================
+
+FolderStatusDelegate::FolderStatusDelegate()
+    :QStyledItemDelegate()
+{
+
+}
+
+FolderStatusDelegate::~FolderStatusDelegate()
+{
+  // TODO Auto-generated destructor stub
+}
+
+//alocate each item size in listview.
+QSize FolderStatusDelegate::sizeHint(const QStyleOptionViewItem & option ,
+                                   const QModelIndex & index) const
+{
+  Q_UNUSED(option)
+  QFont aliasFont = option.font;
+  QFont font = option.font;
+  aliasFont.setPointSize( font.pointSize() +2 );
+
+  QFontMetrics fm(font);
+  QFontMetrics aliasFm(aliasFont);
+
+  int aliasMargin = aliasFm.height()/2;
+  int margin = fm.height()/4;
+
+  // calc height
+
+  int h = aliasMargin;         // margin to top
+  h += aliasFm.height();       // alias
+  h += margin;                 // between alias and local path
+  h += fm.height();            // local path
+  h += margin;                 // between local and remote path
+  h += fm.height();            // remote path
+  h += aliasMargin;            // bottom margin
+
+  // add some space to show an error condition.
+  if( ! qvariant_cast<QString>(index.data(FolderErrorMsg)).isEmpty() ) {
+      h += aliasMargin*2+fm.height();
+  }
+
+  if( qvariant_cast<bool>(index.data(AddProgressSpace)) ) {
+      int margin = fm.height()/4;
+      h += (5 * margin); // All the margins
+      h += 2* fm.boundingRect(tr("File")).height();
+  }
+
+  return QSize( 0, h);
+}
+
+void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
+                                 const QModelIndex &index) const
+{
+  QStyledItemDelegate::paint(painter,option,index);
+
+  painter->save();
+
+  QFont aliasFont = option.font;
+  QFont subFont   = option.font;
+  QFont errorFont = subFont;
+  QFont progressFont = subFont;
+
+  progressFont.setPointSize( subFont.pointSize()-1);
+  //font.setPixelSize(font.weight()+);
+  aliasFont.setBold(true);
+  aliasFont.setPointSize( subFont.pointSize()+2 );
+
+  QFontMetrics subFm( subFont );
+  QFontMetrics aliasFm( aliasFont );
+  QFontMetrics progressFm( progressFont );
+
+  int aliasMargin = aliasFm.height()/2;
+  int margin = subFm.height()/4;
+
+  QIcon statusIcon      = qvariant_cast<QIcon>(index.data(FolderStatusIconRole));
+  QString aliasText     = qvariant_cast<QString>(index.data(FolderAliasRole));
+  QString pathText      = qvariant_cast<QString>(index.data(FolderPathRole));
+  QString remotePath    = qvariant_cast<QString>(index.data(FolderSecondPathRole));
+  QString errorText     = qvariant_cast<QString>(index.data(FolderErrorMsg));
+
+  int overallPercent    = qvariant_cast<int>(index.data(SyncProgressOverallPercent));
+  QString overallString = qvariant_cast<QString>(index.data(SyncProgressOverallString));
+  QString itemString    = qvariant_cast<QString>(index.data(SyncProgressItemString));
+  int warningCount      = qvariant_cast<int>(index.data(WarningCount));
+  bool syncOngoing      = qvariant_cast<bool>(index.data(SyncRunning));
+  // QString statusText = qvariant_cast<QString>(index.data(FolderStatus));
+  bool syncEnabled = index.data(FolderSyncEnabled).toBool();
+  // QString syncStatus = syncEnabled? tr( "Enabled" ) : tr( "Disabled" );
+
+  QRect iconRect = option.rect;
+  QRect aliasRect = option.rect;
+
+  iconRect.setLeft( aliasMargin );
+  iconRect.setTop( iconRect.top() + aliasMargin ); // (iconRect.height()-iconsize.height())/2);
+
+  // alias box
+  aliasRect.setTop(aliasRect.top() + aliasMargin );
+  aliasRect.setBottom(aliasRect.top() + aliasFm.height());
+  aliasRect.setRight(aliasRect.right() - aliasMargin );
+
+  // remote directory box
+  QRect remotePathRect = aliasRect;
+  remotePathRect.setTop(aliasRect.bottom() + margin );
+  remotePathRect.setBottom(remotePathRect.top() + subFm.height());
+
+  // local directory box
+  QRect localPathRect = remotePathRect;
+  localPathRect.setTop( remotePathRect.bottom() + margin );
+  localPathRect.setBottom( localPathRect.top() + subFm.height());
+
+  iconRect.setBottom(localPathRect.bottom());
+  iconRect.setWidth(iconRect.height());
+
+  int nextToIcon = iconRect.right()+aliasMargin;
+  aliasRect.setLeft(nextToIcon);
+  localPathRect.setLeft(nextToIcon);
+  remotePathRect.setLeft(nextToIcon);
+
+  int iconSize = iconRect.width();
+
+  QPixmap pm = statusIcon.pixmap(iconSize, iconSize, syncEnabled ? QIcon::Normal : QIcon::Disabled );
+  painter->drawPixmap(QPoint(iconRect.left(), iconRect.top()), pm);
+
+  // only show the warning icon if the sync is running. Otherwise its
+  // encoded in the status icon.
+  if( warningCount > 0 && syncOngoing) {
+      QRect warnRect;
+      warnRect.setLeft(iconRect.left());
+      warnRect.setTop(iconRect.bottom()-17);
+      warnRect.setWidth(16);
+      warnRect.setHeight(16);
+
+      QIcon warnIcon(":/mirall/resources/warning-16");
+      QPixmap pm = warnIcon.pixmap(16,16, syncEnabled ? QIcon::Normal : QIcon::Disabled );
+      painter->drawPixmap(QPoint(warnRect.left(), warnRect.top()),pm );
+  }
+
+  if ((option.state & QStyle::State_Selected)
+          && (option.state & QStyle::State_Active)
+          // Hack: Windows Vista's light blue is not contrasting enough for white
+          && !qApp->style()->inherits("QWindowsVistaStyle")) {
+      painter->setPen(option.palette.color(QPalette::HighlightedText));
+  } else {
+      painter->setPen(option.palette.color(QPalette::Text));
+  }
+  QString elidedAlias = aliasFm.elidedText(aliasText, Qt::ElideRight, aliasRect.width());
+  painter->setFont(aliasFont);
+  painter->drawText(aliasRect, elidedAlias);
+
+  painter->setFont(subFont);
+  QString elidedRemotePathText;
+
+  if (remotePath.isEmpty() || remotePath == QLatin1String("/")) {
+      elidedRemotePathText = subFm.elidedText(tr("Syncing all files in your account with"),
+                                              Qt::ElideRight, remotePathRect.width());
+  } else {
+      elidedRemotePathText = subFm.elidedText(tr("Remote path: %1").arg(remotePath),
+                                              Qt::ElideMiddle, remotePathRect.width());
+  }
+  painter->drawText(remotePathRect, elidedRemotePathText);
+
+  QString elidedPathText = subFm.elidedText(pathText, Qt::ElideMiddle, localPathRect.width());
+  painter->drawText(localPathRect, elidedPathText);
+
+  // paint an error overlay if there is an error string
+
+  int h = iconRect.bottom();
+  if( !errorText.isEmpty() ) {
+      h += aliasMargin;
+      QRect errorRect = localPathRect;
+      errorRect.setLeft( iconRect.left());
+      errorRect.setTop( h );
+      errorRect.setHeight(subFm.height()+aliasMargin);
+      errorRect.setRight( option.rect.right()-aliasMargin );
+
+      painter->setBrush( QColor(0xbb, 0x4d, 0x4d) );
+      painter->setPen( QColor(0xaa, 0xaa, 0xaa));
+      painter->drawRoundedRect( errorRect, 4, 4 );
+
+      painter->setPen( Qt::white );
+      painter->setFont(errorFont);
+      QRect errorTextRect = errorRect;
+      errorTextRect.setLeft( errorTextRect.left()+aliasMargin +16);
+      errorTextRect.setTop( errorTextRect.top()+aliasMargin/2 );
+
+      int linebreak = errorText.indexOf(QLatin1String("<br"));
+      QString eText = errorText;
+      if(linebreak) {
+          eText = errorText.left(linebreak);
+      }
+      painter->drawText(errorTextRect, eText);
+
+      h = errorRect.bottom();
+  }
+  h += aliasMargin;
+
+  // Sync File Progress Bar: Show it if syncFile is not empty.
+  if( !overallString.isEmpty()) {
+      int fileNameTextHeight = subFm.boundingRect(tr("File")).height();
+      int barHeight = qMax(fileNameTextHeight, aliasFm.height()+2); ;
+      int overallWidth = option.rect.width()-2*aliasMargin;
+
+      painter->save();
+
+      // Sizes-Text
+      QRect octetRect = subFm.boundingRect( overallString );
+      int progressTextWidth = octetRect.width();
+
+      // Overall Progress Bar.
+      QRect pBRect;
+      pBRect.setTop( h );
+      pBRect.setLeft( iconRect.left());
+      pBRect.setHeight(barHeight);
+      pBRect.setWidth( overallWidth - progressTextWidth - margin );
+
+      QStyleOptionProgressBarV2 pBarOpt;
+
+      pBarOpt.state    = option.state | QStyle::State_Horizontal;
+      pBarOpt.minimum  = 0;
+      pBarOpt.maximum  = 100;
+      pBarOpt.progress = overallPercent;
+      pBarOpt.orientation = Qt::Horizontal;
+      pBarOpt.palette = option.palette;
+      pBarOpt.rect = pBRect;
+
+      QApplication::style()->drawControl( QStyle::CE_ProgressBar, &pBarOpt, painter );
+
+      // Overall Progress Text
+      QRect overallProgressRect;
+      overallProgressRect.setTop( pBRect.top() );
+      overallProgressRect.setHeight( pBRect.height() );
+      overallProgressRect.setLeft( pBRect.right()+margin);
+      overallProgressRect.setWidth( progressTextWidth );
+      painter->setFont(progressFont);
+
+      QString elidedText = progressFm.elidedText(overallString, Qt::ElideLeft, overallProgressRect.width());
+      painter->drawText( overallProgressRect, Qt::AlignRight+Qt::AlignVCenter, elidedText);
+    // painter->drawRect(overallProgressRect);
+
+      // Individual File Progress
+      QRect fileRect;
+      fileRect.setTop( pBRect.bottom() + margin);
+      fileRect.setLeft( iconRect.left());
+      fileRect.setWidth(overallWidth);
+      fileRect.setHeight(fileNameTextHeight);
+      elidedText = progressFm.elidedText(itemString, Qt::ElideLeft, fileRect.width());
+
+      painter->drawText( fileRect, Qt::AlignLeft+Qt::AlignVCenter, elidedText);
+
+      painter->restore();
+  }
+  painter->restore();
+}
+
+bool FolderStatusDelegate::editorEvent ( QEvent * /*event*/, QAbstractItemModel * /*model*/, const QStyleOptionViewItem & /*option*/, const QModelIndex & /*index*/ )
+{
+    return false;
+}
+
+} // namespace Mirall

src/mirall/folderstatusmodel.h

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) by Klaas Freitag <freitag@kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#ifndef FOLDERSTATUSMODEL_H
+#define FOLDERSTATUSMODEL_H
+
+#include <QStyledItemDelegate>
+#include <QStandardItemModel>
+
+namespace Mirall {
+
+class FolderStatusModel : public QStandardItemModel
+{
+public:
+    FolderStatusModel();
+    virtual Qt::ItemFlags flags( const QModelIndex& ) const;
+    QVariant data(const QModelIndex &index, int role) const;
+
+};
+
+class FolderStatusDelegate : public QStyledItemDelegate
+{
+    Q_OBJECT
+    public:
+    FolderStatusDelegate();
+    virtual ~FolderStatusDelegate();
+
+    enum datarole { FolderAliasRole = Qt::UserRole + 100,
+                    FolderPathRole,
+                    FolderSecondPathRole,
+                    FolderRemotePath,
+                    FolderStatus,
+                    FolderErrorMsg,
+                    FolderSyncEnabled,
+                    FolderStatusIconRole,
+
+                    SyncProgressOverallPercent,
+                    SyncProgressOverallString,
+                    SyncProgressItemString,
+                    AddProgressSpace,
+                    WarningCount,
+                    SyncRunning
+                  };
+    void paint( QPainter*, const QStyleOptionViewItem&, const QModelIndex& ) const;
+    QSize sizeHint( const QStyleOptionViewItem&, const QModelIndex& ) const;
+    bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option,
+                      const QModelIndex& index );
+
+private:
+    bool _addProgressSpace;
+};
+
+} // namespace Mirall
+
+#endif // FOLDERSTATUSMODEL_H

src/mirall/folderwatcher.cpp

@@ -69,7 +69,7 @@ QString FolderWatcher::root() const
     return _root;
 }
 
-void FolderWatcher::setIgnoreListFile( const QString& file )
+void FolderWatcher::addIgnoreListFile( const QString& file )
 {
     if( file.isEmpty() ) return;
 
@@ -79,18 +79,12 @@ void FolderWatcher::setIgnoreListFile( const QString& file )
 
     while (!infile.atEnd()) {
         QString line = QString::fromLocal8Bit( infile.readLine() ).trimmed();
-        if( !line.startsWith( QLatin1Char('#') )) {
+        if( !line.startsWith( QLatin1Char('#') ) && line.isEmpty() ) {
-            addIgnore(line);
+            _ignores.append(line);
         }
     }
 }
 
-void FolderWatcher::addIgnore(const QString &pattern)
-{
-    if( pattern.isEmpty() ) return;
-    _ignores.append(pattern);
-}
-
 QStringList FolderWatcher::ignores() const
 {
     return _ignores;
@@ -178,5 +172,16 @@ void FolderWatcher::changeDetected(const QString& f)
     setProcessTimer();
 }
 
+void FolderWatcher::addPath(const QString &path )
+{
+    _d->addPath(path);
+}
+
+void FolderWatcher::removePath(const QString &path )
+{
+    _d->removePath(path);
+}
+
+
 } // namespace Mirall
 

src/mirall/folderwatcher.h

@@ -43,7 +43,7 @@ class FolderWatcherPrivate;
  */
 class FolderWatcher : public QObject
 {
-Q_OBJECT
+    Q_OBJECT
 public:
     /**
      * @param root Path of the root of the folder
@@ -58,16 +58,11 @@ public:
 
     /**
       * Set a file name to load a file with ignore patterns.
+      *
+      * Valid entries do not start with a hash sign (#)
+      * and may contain wildcards
       */
-    void setIgnoreListFile( const QString& );
+    void addIgnoreListFile( const QString& );
-
-    /**
-     * Add an ignore pattern that will not be
-     * notified
-     *
-     * You can use wildcards
-     */
-    void addIgnore(const QString &pattern);
 
     /**
      * If true, folderChanged() events are sent
@@ -93,6 +88,15 @@ public:
     void setEventInterval(int seconds);
 
     QStringList ignores() const;
+
+    /**
+     * Not all backends are recursive by default.
+     * Those need to be notified when a directory is added or removed while the watcher is disabled.
+     * This is a no-op for backend that are recursive
+     */
+    void addPath(const QString&);
+    void removePath(const QString&);
+
 public slots:
     /**
      * Enabled or disables folderChanged() events.
@@ -109,10 +113,10 @@ public slots:
     void setEventsEnabledDelayed( int );
 
 signals:
-    /**
+    /** Emitted when one of the paths is changed */
-     * Emitted when one of the paths is changed
-     */
     void folderChanged(const QStringList &pathList);
+    /** Emitted if an error occurs */
+    void error(const QString& error);
 
 protected:
     void setProcessTimer();

src/mirall/folderwatcher_inotify.cpp

@@ -38,10 +38,10 @@ FolderWatcherPrivate::FolderWatcherPrivate(FolderWatcher *p)
 
 {
     _inotify = new INotify(this, standard_event_mask);
-    slotAddFolderRecursive(_parent->root());
     QObject::connect(_inotify, SIGNAL(notifyEvent(int, int, const QString &)),
                      this, SLOT(slotINotifyEvent(int, int, const QString &)));
 
+    QMetaObject::invokeMethod(this, "slotAddFolderRecursive", Q_ARG(QString, _parent->root()));
 }
 
 void FolderWatcherPrivate::slotAddFolderRecursive(const QString &path)
@@ -49,7 +49,11 @@ void FolderWatcherPrivate::slotAddFolderRecursive(const QString &path)
     int subdirs = 0;
     qDebug() << "(+) Watcher:" << path;
 
-    _inotify->addPath(path);
+    if (!_inotify->addPath(path)) {
+        emit _parent->error(tr("Could not monitor directories due to system limitations.\n"
+                          "The application will not work reliably. Please check the\n"
+                          "documentation for possible fixes."));
+    }
     QStringList watchedFolders(_inotify->directories());
     // qDebug() << "currently watching " << watchedFolders;
     QStringListIterator subfoldersIt(FileUtils::subFoldersList(path, FileUtils::SubFolderRecursive));
@@ -78,7 +82,7 @@ void FolderWatcherPrivate::slotAddFolderRecursive(const QString &path)
         qDebug() << "    `-> and" << subdirs << "subdirectories";
 }
 
-void FolderWatcherPrivate::slotINotifyEvent(int mask, int cookie, const QString &path)
+void FolderWatcherPrivate::slotINotifyEvent(int mask, int /*cookie*/, const QString &path)
 {
     int lastMask = _lastMask;
     QString lastPath = _lastPath;
@@ -114,9 +118,8 @@ void FolderWatcherPrivate::slotINotifyEvent(int mask, int cookie, const QString
     }
     else if (mask & IN_DELETE) {
         //qDebug() << cookie << " DELETE: " << path;
-        if ( QFileInfo(path).isDir() && _inotify->directories().contains(path) ) {
+        if ( QFileInfo(path).isDir() ) {
-            qDebug() << "(-) Watcher:" << path;
+            removePath(path);
-            _inotify->removePath(path);
         }
     }
     else if (mask & IN_CLOSE_WRITE) {
@@ -155,4 +158,13 @@ void FolderWatcherPrivate::slotINotifyEvent(int mask, int cookie, const QString
     _parent->setProcessTimer();
 }
 
+void FolderWatcherPrivate::removePath(const QString &path )
+{
+    if (_inotify->directories().contains(path) ) {
+        qDebug() << "(-) Watcher:" << path;
+        _inotify->removePath(path);
+    }
+}
+
+
 } // namespace Mirall

src/mirall/folderwatcher_inotify.h

@@ -26,6 +26,10 @@ class FolderWatcherPrivate : public QObject {
     Q_OBJECT
 public:
     FolderWatcherPrivate(FolderWatcher *p);
+    void addPath(const QString &path) { slotAddFolderRecursive(path);  }
+    void removePath(const QString &);
+signals:
+    void error(const QString& error);
 private slots:
     void slotAddFolderRecursive(const QString &path);
     void slotINotifyEvent(int mask, int cookie, const QString &path);

src/mirall/folderwatcher_mac.h

@@ -31,6 +31,9 @@ public:
     FolderWatcherPrivate(FolderWatcher *p);
     ~FolderWatcherPrivate();
 
+    void addPath(const QString &) {}
+    void removePath(const QString &) {}
+
     void startWatching();
     void doNotifyParent();
 

src/mirall/folderwatcher_win.h

@@ -48,6 +48,10 @@ class FolderWatcherPrivate : public QObject {
 public:
     FolderWatcherPrivate(FolderWatcher *p);
     ~FolderWatcherPrivate();
+
+    void addPath(const QString &) {}
+    void removePath(const QString &) {}
+
 private:
     FolderWatcher *_parent;
     WatcherThread *_thread;

src/mirall/folderwizard.cpp

@@ -19,12 +19,15 @@
 
 #include <QDebug>
 #include <QDesktopServices>
+#include <QDir>
 #include <QFileDialog>
 #include <QFileInfo>
+#include <QFileIconProvider>
+#include <QInputDialog>
 #include <QUrl>
 #include <QValidator>
 #include <QWizardPage>
-#include <QDir>
+#include <QTreeWidget>
 
 #include <stdlib.h>
 
@@ -32,19 +35,16 @@ namespace Mirall
 {
 
 FolderWizardSourcePage::FolderWizardSourcePage()
-  :_folderMap(0)
+    : QWizardPage()
 {
     _ui.setupUi(this);
     registerField(QLatin1String("sourceFolder*"), _ui.localFolderLineEdit);
-    _ui.localFolderLineEdit->setText( QString::fromLatin1( "%1/%2").arg( QDir::homePath() ).arg(Theme::instance()->appName() ) );
+    QString defaultPath = QString::fromLatin1( "%1/%2").arg( QDir::homePath() ).arg(Theme::instance()->appName() );
+    _ui.localFolderLineEdit->setText( QDir::toNativeSeparators( defaultPath ) );
     registerField(QLatin1String("alias*"), _ui.aliasLineEdit);
     _ui.aliasLineEdit->setText( Theme::instance()->appNameGUI() );
 
     _ui.warnLabel->hide();
-#if QT_VERSION >= 0x040700
-    _ui.localFolderLineEdit->setPlaceholderText(QApplication::translate("FolderWizardSourcePage", "/home/local1", 0, QApplication::UnicodeUTF8));
-    _ui.aliasLineEdit->setPlaceholderText(QApplication::translate("FolderWizardSourcePage", "Music", 0, QApplication::UnicodeUTF8));
-#endif
 }
 
 FolderWizardSourcePage::~FolderWizardSourcePage()
@@ -64,22 +64,27 @@ void FolderWizardSourcePage::cleanupPage()
 
 bool FolderWizardSourcePage::isComplete() const
 {
-  QFileInfo selFile( _ui.localFolderLineEdit->text() );
+  QFileInfo selFile( QDir::fromNativeSeparators(_ui.localFolderLineEdit->text()) );
   QString   userInput = selFile.canonicalFilePath();
 
   QString warnString;
 
   bool isOk = selFile.isDir();
   if( !isOk ) {
-    warnString = tr("No local directory selected!");
+    warnString = tr("No local folder selected!");
   }
+
+  if (isOk && !selFile.isWritable()) {
+      isOk = false;
+      warnString += tr("You have no permission to write to the selected folder!");
+  }
+
   // check if the local directory isn't used yet in another ownCloud sync
-  Folder::Map *map = _folderMap;
+  Folder::Map map = _folderMap;
-  if( ! map ) return false;
 
   if( isOk ) {
-    Folder::Map::const_iterator i = map->constBegin();
+    Folder::Map::const_iterator i = map.constBegin();
-    while( isOk && i != map->constEnd() ) {
+    while( isOk && i != map.constEnd() ) {
       Folder *f = static_cast<Folder*>(i.value());
       QString folderDir = QDir( f->path() ).canonicalPath();
       if( folderDir.isEmpty() )
@@ -94,7 +99,8 @@ bool FolderWizardSourcePage::isComplete() const
       qDebug() << "Checking local path: " << folderDir << " <-> " << userInput;
       if( QFileInfo( f->path() ) == userInput ) {
         isOk = false;
-        warnString.append( tr("The local path %1 is already an upload folder.<br/>Please pick another one!").arg(userInput) );
+        warnString.append( tr("The local path %1 is already an upload folder.<br/>Please pick another one!")
+                           .arg(QDir::toNativeSeparators(userInput)) );
       }
       if( isOk && folderDir.startsWith( userInput )) {
         qDebug() << "A already configured folder is child of the current selected";
@@ -117,10 +123,10 @@ bool FolderWizardSourcePage::isComplete() const
     isOk = false;
   }
 
-  Folder::Map::const_iterator i = map->constBegin();
+  Folder::Map::const_iterator i = map.constBegin();
   bool goon = true;
-  while( goon && i != map->constEnd() ) {
+  while( goon && i != map.constEnd() ) {
-    Folder *f = static_cast<Folder*>(i.value());
+    Folder *f = i.value();
     qDebug() << "Checking local alias: " << f->alias();
     if( f ) {
       if( f->alias() == alias ) {
@@ -148,7 +154,7 @@ void FolderWizardSourcePage::on_localFolderChooseBtn_clicked()
                                                     tr("Select the source folder"),
                                                     QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
     if (!dir.isEmpty()) {
-        _ui.localFolderLineEdit->setText(dir);
+        _ui.localFolderLineEdit->setText(QDir::toNativeSeparators(dir));
     }
 }
 
@@ -160,64 +166,38 @@ void FolderWizardSourcePage::on_localFolderLineEdit_textChanged()
 
 // =================================================================================
 FolderWizardTargetPage::FolderWizardTargetPage()
-: _dirChecked( false ),
+: _warnWasVisible(false)
-  _warnWasVisible(false)
 {
     _ui.setupUi(this);
     _ui.warnFrame->hide();
 
-    registerField(QLatin1String("OCFolderLineEdit"),    _ui.OCFolderLineEdit);
+    connect(_ui.addFolderButton, SIGNAL(clicked()), SLOT(slotAddRemoteFolder()));
-
+    connect(_ui.refreshButton, SIGNAL(clicked()), SLOT(slotRefreshFolders()));
-    connect( _ui.OCFolderLineEdit, SIGNAL(textChanged(QString)),
+    connect(_ui.folderTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), SIGNAL(completeChanged()));
-             SLOT(slotFolderTextChanged(QString)));
+    connect(_ui.folderTreeWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), SIGNAL(completeChanged()));
-
-    _timer = new QTimer(this);
-    _timer->setSingleShot( true );
-    connect( _timer, SIGNAL(timeout()), SLOT(slotTimerFires()));
 }
 
-void FolderWizardTargetPage::slotFolderTextChanged( const QString& t)
+void FolderWizardTargetPage::slotAddRemoteFolder()
 {
-  _dirChecked = false;
+    QTreeWidgetItem *current = _ui.folderTreeWidget->currentItem();
-  emit completeChanged();
 
-  if( t.isEmpty() ) {
+    QString parent('/');
-    _timer->stop();
+    if (current) {
-    return;
+        parent = current->data(0, Qt::UserRole).toString();
-  }
-
-  if( _timer->isActive() ) _timer->stop();
-  _timer->start(500);
-}
-
-void FolderWizardTargetPage::slotTimerFires()
-{
-    const QString folder = _ui.OCFolderLineEdit->text();
-    qDebug() << "Querying folder " << folder;
-    ownCloudInfo::instance()->getWebDAVPath( folder );
-}
-
-void FolderWizardTargetPage::slotDirCheckReply(const QString &url, QNetworkReply *reply)
-{
-    qDebug() << "Got reply from owncloud dir check: " << url << " :" << reply->error();
-    _dirChecked = (reply->error() == QNetworkReply::NoError);
-    if( _dirChecked ) {
-        showWarn();
-    } else {
-        showWarn( tr("The folder is not available on your %1.<br/>Click to create it." )
-                  .arg( Theme::instance()->appNameGUI() ), true );
     }
 
-    emit completeChanged();
+    QInputDialog *dlg = new QInputDialog(this);
+
+    dlg->setWindowTitle(tr("Add Remote Folder"));
+    dlg->setLabelText(tr("Enter the name of the new folder:"));
+    dlg->setTextValue(parent);
+    dlg->open(this, SLOT(slotCreateRemoteFolder(QString)));
+    dlg->setAttribute(Qt::WA_DeleteOnClose);
 }
 
-void FolderWizardTargetPage::slotCreateRemoteFolder()
+void FolderWizardTargetPage::slotCreateRemoteFolder(QString folder)
 {
-    const QString folder = _ui.OCFolderLineEdit->text();
     if( folder.isEmpty() ) return;
-
-    _ui.OCFolderLineEdit->setEnabled( false );
-    qDebug() << "creating folder on ownCloud: " << folder;
     ownCloudInfo::instance()->mkdirRequest( folder );
 }
 
@@ -225,32 +205,105 @@ void FolderWizardTargetPage::slotCreateRemoteFolderFinished( QNetworkReply::Netw
 {
   qDebug() << "** webdav mkdir request finished " << error;
 
-  _ui.OCFolderLineEdit->setEnabled( true );
   // the webDAV server seems to return a 202 even if mkdir was successful.
   if( error == QNetworkReply::NoError ||
           error == QNetworkReply::ContentOperationNotPermittedError) {
-    showWarn( tr("Folder was successfully created on %1.").arg( Theme::instance()->appNameGUI() ), false );
+    showWarn( tr("Folder was successfully created on %1.").arg( Theme::instance()->appNameGUI() ) );
-    slotTimerFires();
+    slotRefreshFolders();
   } else {
-    showWarn( tr("Failed to create the folder on %1.<br/>Please check manually.").arg( Theme::instance()->appNameGUI() ), false );
+    showWarn( tr("Failed to create the folder on %1.<br/>Please check manually.").arg( Theme::instance()->appNameGUI() ) );
   }
 }
 
+static QTreeWidgetItem* findFirstChild(QTreeWidgetItem *parent, const QString& text)
+{
+    for (int i = 0; i < parent->childCount(); ++i) {
+        QTreeWidgetItem *child = parent->child(i);
+        if (child->text(0) == text) {
+            return child;
+        }
+    }
+    return 0;
+}
+
+static void recursiveInsert(QTreeWidgetItem *parent, QStringList pathTrail, QString path)
+{
+    QFileIconProvider prov;
+    QIcon folderIcon = prov.icon(QFileIconProvider::Folder);
+    if (pathTrail.size() == 0) {
+        if (path.endsWith('/')) {
+            path.chop(1);
+        }
+        parent->setToolTip(0, path);
+        parent->setData(0, Qt::UserRole, path);
+    } else {
+        QTreeWidgetItem *item = findFirstChild(parent, pathTrail.first());
+        if (!item) {
+            item = new QTreeWidgetItem(parent);
+            item->setIcon(0, folderIcon);
+            item->setText(0, pathTrail.first());
+            item->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator);
+        }
+
+        pathTrail.removeFirst();
+        recursiveInsert(item, pathTrail, path);
+    }
+}
+
+void FolderWizardTargetPage::slotUpdateDirectories(QStringList list)
+{
+    QFileIconProvider prov;
+    QIcon folderIcon = prov.icon(QFileIconProvider::Folder);
+
+    QString webdavFolder = QUrl(ownCloudInfo::instance()->webdavUrl()).path();
+    connect(_ui.folderTreeWidget, SIGNAL(itemExpanded(QTreeWidgetItem*)), SLOT(slotItemExpanded(QTreeWidgetItem*)));
+
+    QTreeWidgetItem *root = _ui.folderTreeWidget->topLevelItem(0);
+    if (!root) {
+        root = new QTreeWidgetItem(_ui.folderTreeWidget);
+        root->setText(0, tr("Root (\"/\")", "root folder"));
+        root->setIcon(0, folderIcon);
+        root->setToolTip(0, tr("Choose this to sync the entire account"));
+        root->setData(0, Qt::UserRole, "/");
+    }
+    foreach (QString path, list) {
+        path.remove(webdavFolder);
+        QStringList paths = path.split('/');
+        if (paths.last().isEmpty()) paths.removeLast();
+        recursiveInsert(root, paths, path);
+    }
+    root->setExpanded(true);
+}
+
+void FolderWizardTargetPage::slotRefreshFolders()
+{
+    ownCloudInfo::instance()->getDirectoryListing("/");
+    _ui.folderTreeWidget->clear();
+}
+
+void FolderWizardTargetPage::slotItemExpanded(QTreeWidgetItem *item)
+{
+    ownCloudInfo::instance()->getDirectoryListing(item->text(0));
+}
+
 FolderWizardTargetPage::~FolderWizardTargetPage()
 {
 }
 
 bool FolderWizardTargetPage::isComplete() const
 {
-    QString dir = _ui.OCFolderLineEdit->text();
+    if (!_ui.folderTreeWidget->currentItem())
-    if( dir.isEmpty() || dir == QLatin1String("/") ) {
+        return false;
-        showWarn( tr("If you sync the root folder, you can <b>not</b> configure another sync directory."), false);
+
+    QString dir = _ui.folderTreeWidget->currentItem()->data(0, Qt::UserRole).toString();
+    wizard()->setProperty("targetPath", dir);
+
+    if( dir == QLatin1String("/") ) {
+        showWarn( tr("If you sync the root folder, you can <b>not</b> configure another sync directory."));
         return true;
     } else {
-        if( _dirChecked ) {
+        showWarn();
-            showWarn();
+        return true;
-        }
-        return _dirChecked;
     }
 }
 
@@ -266,53 +319,19 @@ void FolderWizardTargetPage::initializePage()
     /* check the owncloud configuration file and query the ownCloud */
     ownCloudInfo *ocInfo = ownCloudInfo::instance();
     if( ocInfo->isConfigured() ) {
-        connect( ocInfo, SIGNAL(ownCloudInfoFound(QString,QString,QString,QString)),
-                 SLOT(slotOwnCloudFound(QString,QString,QString,QString)));
-        connect( ocInfo, SIGNAL(noOwncloudFound(QNetworkReply*)),
-                 SLOT(slotNoOwnCloudFound(QNetworkReply*)));
         connect( ocInfo, SIGNAL(ownCloudDirExists(QString,QNetworkReply*)),
                  SLOT(slotDirCheckReply(QString,QNetworkReply*)));
         connect( ocInfo, SIGNAL(webdavColCreated(QNetworkReply::NetworkError)),
                  SLOT(slotCreateRemoteFolderFinished( QNetworkReply::NetworkError )));
+        connect( ocInfo, SIGNAL(directoryListingUpdated(QStringList)),
+                 SLOT(slotUpdateDirectories(QStringList)));
 
-        connect(_ui._buttCreateFolder, SIGNAL(clicked()), SLOT(slotCreateRemoteFolder()));
+        slotRefreshFolders();
-        ocInfo->checkInstallation();
-
-        _ui.OCFolderLineEdit->setEnabled( false );
-
-        QString dir = _ui.OCFolderLineEdit->text();
-        if( !dir.isEmpty() ) {
-            slotFolderTextChanged( dir );
-        }
-    }
-}
-void FolderWizardTargetPage::slotOwnCloudFound( const QString& url, const QString& infoStr, const QString& version, const QString& edition)
-{
-    Q_UNUSED(version);
-    Q_UNUSED(edition);
-
-    if( infoStr.isEmpty() ) {
-    } else {
-//        _ui.OCLabel->setText( tr("to your <a href=\"%1\">%2</a> (version %3)").arg(url)
-//                              .arg(Theme::instance()->appNameGUI()).arg(infoStr));
-        _ui.OCFolderLineEdit->setEnabled( true );
-        qDebug() << "ownCloud found on " << url << " with version: " << infoStr;
     }
 }
 
-void FolderWizardTargetPage::slotNoOwnCloudFound( QNetworkReply* error )
+void FolderWizardTargetPage::showWarn( const QString& msg ) const
 {
-  qDebug() << "No ownCloud configured: " << error->error();
-//  _ui.OCLabel->setText( tr("no configured %1 found!").arg(Theme::instance()->appNameGUI()) );
-  showWarn( tr("%1 could not be reached:<br/><tt>%2</tt>")
-            .arg(Theme::instance()->appNameGUI()).arg(error->errorString()));
-  _ui.OCFolderLineEdit->setEnabled( false );
-}
-
-void FolderWizardTargetPage::showWarn( const QString& msg, bool showCreateButton ) const
-{
-    _ui._buttCreateFolder->setVisible( showCreateButton && !msg.isEmpty() );
-
   if( msg.isEmpty() ) {
     _ui.warnFrame->hide();
 
@@ -330,34 +349,27 @@ void FolderWizardTargetPage::showWarn( const QString& msg, bool showCreateButton
 
 FolderWizard::FolderWizard( QWidget *parent )
     : QWizard(parent),
-    _folderWizardSourcePage(0),
+    _folderWizardSourcePage(new FolderWizardSourcePage),
     _folderWizardTargetPage(0)
 {
-    _folderWizardSourcePage = new FolderWizardSourcePage();
+    setPage(Page_Source, _folderWizardSourcePage );
-    setPage(Page_Source,   _folderWizardSourcePage );
     if (!Theme::instance()->singleSyncFolder()) {
         _folderWizardTargetPage = new FolderWizardTargetPage();
         setPage(Page_Target, _folderWizardTargetPage );
     }
 
-    setWindowTitle( tr( "%1 Folder Wizard" ).arg( Theme::instance()->appNameGUI() ) );
+    setWindowTitle( tr("Add Folder") );
-#ifdef Q_WS_MAC
+    setOptions(QWizard::CancelButtonOnLeft);
-    setWizardStyle( QWizard::ModernStyle );
+    setButtonText(QWizard::FinishButton, tr("Add Folder"));
-#endif
 }
 
 FolderWizard::~FolderWizard()
 {
-  delete _folderWizardSourcePage;
-  if( _folderWizardTargetPage )
-    delete _folderWizardTargetPage;
 }
 
-void FolderWizard::setFolderMap( Folder::Map *fm)
+void FolderWizard::setFolderMap( const Folder::Map& fm)
 {
-  if( _folderWizardSourcePage ) {
     _folderWizardSourcePage->setFolderMap( fm );
-  }
 }
 
 } // end namespace