Update Dockerfile

update app icon

.github/AUTHORS.md

@@ -12,7 +12,7 @@ Code:
 	Chris Magee <chris.magee@gametheworld.com>
 	Gabriel Burt <gabriel.burt@gmail.com>
 	Garrett LeSage <garrett@novell.com>
-	Hylke Bons <hylkebons@gmail.com>
+	Hylke Bons <hi@planetpeanut.uk>
 	Jonathan Haines <jonno.haines@gmail.com>
 	Kristi Tsukida <kristi.tsukida@gmail.com>
 	Konstantinos Vaggelakos <kozze89@gmail.com>
@@ -20,6 +20,7 @@ Code:
 	Luis Cordova <cordoval@gmail.com>
 	Łukasz Jernaś <deejay1@srem.org>
 	Markus Stoll <post@mstoll.de>
+    Malte Kiefer <malte.kiefer@mailgermania.de>
 	Michael Monreal <michael.monreal@gmail.com>
 	Nick Richards <nick@nickr.org>
 	Oleg Khlystov <pktfag@gmail.com>
@@ -39,7 +40,7 @@ Design:
 
 	Andreas Nilsson <andreasn@gnome.org>
 	Jakub Steiner <jimmac@redhat.com>
-	Hylke Bons <hylkebons@gmail.com>
+	Hylke Bons <hi@planetpeanut.uk>
 	Lapo Calamandrei <calamandrei@gmail.com>
 	Sam Hewitt <hewittsamuel@gmail.com>
 

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hi@planetpeanut.uk. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

.github/CONTRIBUTING.md

@@ -0,0 +1,14 @@
+Hey there!
+
+I'm Hylke, the creator of this project. It's about time I wrote something up about how to contribute to SparkleShare, so here goes...
+
+Contributions to SparkleShare are always welcome! I'm not a great coder. I like to design icons and interfaces, so there are always bugs or things that can be done better. Take a look at the [list of open issues](https://github.com/hbons/SparkleShare/issues). Smaller issues or places where refactoring is needed are marked with `FIXME` or `TODO` in the source code. If you have a fix for SparkleShare, simply open a pull request against the master branch (keeping in mind the [[coding style]]) and if you think your change is significant enough to be copyrighted, feel free to add your name and email to the `AUTHORS` file. Releases are done at least once a month, so there won't be long waits for bug fixes.
+
+SparkleShare tries to keep things simple and to stay out of people's way. Features are only added if they are essential and helpful to a majority of users. If you have a feature that you'd like to be added, please open an issue first, so there can be a discussion whether the feature is actually needed (or it may be it can be done in some other way); do not waste work on a feature that isn't actually desired. By limiting the amount of features, we can spend more time on making the core features solid in order to help people get things done.
+
+Often requests come in to add preferences. I'm very pleased that we've been able to solve most problems reported and features requested without adding a "preference". Currently SparkleShare has only one preference: enabling/disabling notifications. Hopefully it will stay this way and we can withhold from adding a preference panel of some kind (but I can't rule it out). Figuring out how things can be done without burdening people with a preference is much more challenging and rewarding in my opinion. [Free Software UI](http://ometer.com/free-software-ui.html) is a great article about this topic and I recommend reading it.
+
+Looking forward to your contributions! :)
+
+Hylke
+

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: hbons

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,20 @@
+You can find session logs by date and version information in:
+~/.config/org.sparkleshare.SparkleShare/logs/ on Linux and macOS
+C:\Users\YOUR_USERNAME\AppData\Roaming\org.sparkleshare.SparkleShare\logs\ on Windows
+
+To help us help you, please include the logs from around the time the issue occurred, as well as the SparkleShare version and info about your OS (displayed at the top of the log files). Then, tell us roughly in these steps what went wrong:
+
+
+### What happened:
+…
+
+### What I expected to happen:
+…
+
+### This happens when:
+1. …
+2. …
+3. …
+
+
+Thanks for reporting your issue or feature request, it helps lots!

.gitignore

@@ -12,31 +12,14 @@
 *.sln.cache
 *.user
 *.resources
-Makefile.in
-Makefile
-intltool-*
-configure
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-aclocal.m4
-autom4te.cache/
 bin/
+build/
 obj/
-install-sh
-libtool
-ltmain.sh
-missing
-build/m4/shave/shave
-build/m4/*.m4
-build/m4/shave/shave-libtool
-SparkleLib/Defines.cs
+git-*
+Sparkles/InstallationInfo.Directory.cs
 SparkleShare/Linux/sparkleshare
 SparkleShare/Mac/git*
-gnome-doc-utils.make
+SparkleShare/Mac/*.tar.gz
 /sparkleshare-*
 desktop.ini
 _ReSharper.*
@@ -45,4 +28,13 @@ _ReSharper.*
 *.wixpdb
 *.wxs
 *.dotCover
+SparkleShare/Windows/build/
+.vs/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
 

.travis.yml

@@ -0,0 +1,34 @@
+language: csharp
+
+matrix:
+  include:
+    - os: linux
+      services:
+        - docker
+    - os: osx
+      sudo: required
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull ubuntu:xenial ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then wget https://dl.xamarin.com/XamarinforMac/Mac/xamarin.mac-3.0.0.393.pkg ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then sudo installer -pkg xamarin.mac*.pkg -target / ; fi
+
+script:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build --file scripts/ci/Dockerfile --tag sparkleshare:nightly . ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then msbuild /p:Configuration=ReleaseMac SparkleShare.sln ; fi
+
+before_deploy:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DEPLOY_FILE=`docker run --name container sparkleshare:nightly find / -name sparkleshare*.tar.gz` ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker cp container:${DEPLOY_FILE} ./ ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mv sparkleshare*.tar.gz sparkleshare-linux-nightly-${TRAVIS_COMMIT}.tar.gz ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then mv SparkleShare/Mac/bin/ReleaseMac/SparkleShare.app . ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then zip --recurse-paths sparkleshare-mac-nightly-${TRAVIS_COMMIT}.zip SparkleShare.app ; fi
+
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/f1a1178baa78d1162385
+    on_success: change
+    on_failure: always
+    on_start: never
+

Makefile.am

@@ -1,23 +0,0 @@
-basedirs = build SparkleLib SparkleLib/Git
-
-SUBDIRS = $(basedirs) $(GUISUBDIRS)
-DIST_SUBDIRS = $(basedirs) SparkleShare
-
-EXTRA_DIST = \
-	News.txt \
-        README.md \
-	legal/License_for_SparkleShare.txt \
-	legal/License_for_SparkleLib.txt \
-	legal/Trademark.txt \
-	legal/Authors.txt \
-	SparkleShare/Linux/README.md \
-	SparkleShare/Linux/sparkleshare.appdata.xml
-
-DISTCLEANFILES = \
-	intltool-extract        \
-	intltool-merge          \
-	intltool-update		\
-	gnome-doc-utils.make
-
-clean-local:
-	rm -rf $(top_builddir)/bin

README.md

@@ -1,34 +1,54 @@
-# SparkleShare
+# [SparkleShare](https://www.sparkleshare.org/)
 
-SparkleShare is an Open Source collaboration and sharing tool that is designed to keep things simple and to stay out of your way. It's available for Linux distributions, Mac, and Windows.
+[SparkleShare](https://www.sparkleshare.org/) is a file sharing and collaboration app. It works just like Dropbox, and you can run it on your own server. It's available for Linux distributions, macOS, and Windows.
 
-![Banner](https://raw.githubusercontent.com/hbons/SparkleShare/master/SparkleShare/Common/Pixmaps/tutorial-slide-2%402x.png)
+![Banner](https://raw.githubusercontent.com/hbons/SparkleShare/master/SparkleShare/Common/Images/readme-banner.png)
 
+You can support this project through [💕 GitHub Sponsors](https://github.com/sponsors/hbons).
 
 ## How does it work?
 
 SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or "projects") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes or edits a file.
 
+## Install on Ubuntu or Fedora
 
-## Setting up a host
+You can install the package from your distribution (likely old and not updated often), but we recommend to get our Flatpak with automatic updates to always enjoy the latest and greatest:
 
-SparkleShare uses the version control system [Git](https://git-scm.com/) under the hood, so setting up a host yourself is relatively easy. Using your own host gives you more privacy and control, as well as lots of cheap storage space and higher transfer speeds. We've made a simple [script](https://github.com/hbons/Dazzle) that does the hard work for you. If you need to manage a lot of projects and/or users it may be worth setting up a [GitLab](https://www.gitlabhq.com) instance.
+```bash
+flatpak remote-add flathub https://flathub.org/repo/flathub.flatpakrepo
+flatpak install flathub org.sparkleshare.SparkleShare
+```
+
+Now you can run SparkleShare from the apps menu.
+
+**Note:** by default SparkleShare uses an AppIndicator status icon on Linux. If you use GNOME on a distribution other than Ubuntu, please install the [AppIndicator extension](https://extensions.gnome.org/extension/615/appindicator-support/). If you don't use GNOME, you can start SparkleShare with `--status-icon=gtk`.
 
 
-## Free and Open Source
-`SparkleShare` is Free and Open Source software and licensed under the [GNU General Public License version 3 or later](legal/License_for_SparkleShare.txt). You are welcome to change and redistribute it under certain conditions. Its library `SparkleLib` is licensed under the [GNU Lesser General Public License version 3 or later](legal/License_for_SparkleLib.txt).
+## Install on macOS
+
+Download the app from the [releases page](https://github.com/hbons/SparkleShare/releases).
 
 
-## Compiling from source
+## Set up a host
 
-Here are instructions to build SparkleShare on [Linux distributions](SparkleShare/Linux/README.md), [Mac](SparkleShare/Mac/README.md), and [Windows](SparkleShare/Windows/README.md). Make sure to have the `git` package installed when you're building on Linux.
+Under the hood SparkleShare uses the version control system [Git](https://git-scm.com/) and the large files extension [Git LFS](https://git-lfs.github.com), so setting up a host yourself is relatively easy. Using your own host gives you more privacy and control, as well as lots of cheap storage space and higher transfer speeds. We've made a simple [script](https://github.com/hbons/Dazzle) that does the hard work for you. If you need to manage a lot of projects and/or users we recommend hosting a [GitLab Community Edition](https://about.gitlab.com/installation/) instance.
 
 
+## Build from source
+`SparkleShare` is Free and Open Source software and licensed under the [GNU GPLv3 or later](LICENSE.md). You are welcome to change and redistribute it under certain conditions. Its library `Sparkles` is licensed under the [GNU LGPLv3 or later](LICENSE_Sparkles.md).
+
+Here are instructions to build SparkleShare on [Linux distributions](SparkleShare/Linux/README.md), [macOS](SparkleShare/Mac/README.md), and [Windows](SparkleShare/Windows/README.md).
+
+
+[![Build Status](https://travis-ci.org/hbons/SparkleShare.svg?branch=master)](https://travis-ci.org/hbons/SparkleShare)
+[![Join the chat at https://gitter.im/hbons/SparkleShare](https://badges.gitter.im/hbons/SparkleShare.svg)](https://gitter.im/hbons/SparkleShare?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 ## Useful links
-[Website](http://www.sparkleshare.org/), [Twitter](https://www.twitter.com/SparkleShare), [Wiki](https://www.github.com/hbons/SparkleShare/wiki), and [Source Code](https://www.github.com/hbons/SparkleShare). Join the chat: #sparkleshare on irc.gnome.org.
+- [sparkleshare.org](https://www.sparkleshare.org/)
+- [@SparkleShare](https://www.twitter.com/SparkleShare), [@hbons](https://www.twitter.com/hbons)
+- Community chatroom on [Gitter](https://www.gitter.im/hbons/SparkleShare)
+- [Wiki](https://www.github.com/hbons/SparkleShare/wiki)
 
 
-## Finally
-
 Have fun, make awesome. :)
 

RELEASE_NOTES.txt

@@ -1,3 +1,66 @@
+3.38.0 (Sun 29 Nov, 2020):
+
+    - Added support for LibRAavatar
+    - Updated Gravatar cert fingerprint
+    - Removed planio from supported presets
+    - Support default branches that are not named 'master'
+    - Added support for nightly Flatpak builds
+
+
+3.28.0 (Sat 14 Jul, 2018):
+
+    Fixed a bunch of crashes and lots of under-the-hood improvements.
+    SparkleShare will now follow the GNOME release schedule and version 
+    number scheme as much as possible.
+
+    Please make sure to install the AppIndicator Support GNOME Shell extension
+    (https://extensions.gnome.org/extension/615/appindicator-support/) to display
+    status icons in GNOME 3.26 or later. Or start with --status-icon=gtk.
+
+    Linux:
+    - Use the Meson build system
+    - Use appindicator as the default status icon
+    - Fix event log parsing for newer versions of Git
+    - Flatpak improvements
+
+    macOS:
+    - Fix the system font in eventlog and related crash
+    - Fix hang when quitting the app
+
+    Special thanks to Thiago Santos and Renpytom for supporting the project on Patreon.
+
+
+2.0.1 (Tue 19 Dec, 2017):
+
+    - Fix files created by conflict resolution being moved to the root folder
+    - On conflicts, both diverging versions plus the original version are kept
+    - New app icon on Mac
+
+
+2.0.0 for Linux, Mac and Windows (Sun Sep 10, 2017):
+
+    SparkleShare 2.0 is a clean break and will be incompatible with 
+    the 1.x series. Repositories added using 1.0 will likely not work
+    and will have to be re-synced to take advantage of 2.0 features.
+
+    Hylke:
+    - Flatpak version now available
+    - Support for Git LFS managed repositories
+    - Updated Linux app icon by Sam Hewitt
+    - Projects are now grouped by host/organisation
+    - Prefer to use the "SparkleShare" branch if it exists remotely
+    - Added a GitLab preset
+    - Add an entry to GNOME's System Settings to manage notifications
+    - Encrypt names and emails in history of encrypted projects
+    - When conflicts are resolved "SparkleShare" is now the author and 
+      merge commits will be hidden from the log
+    - Fix conflict resolution on encrypted files
+    - Use a standalone SSH configuration instead of ssh-agent
+    - Use SHA256 instead of MD5 for SSH fingerprinting
+    - Dropped limited HTTPS support
+    - Dropped insecure DSA key support
+
+
 1.5.0 for Linux, Mac and Windows (Tue Dec 22, 2015):
 
      Hylke:

SparkleLib/Git/Makefile.am

@@ -1,22 +0,0 @@
-ASSEMBLY = SparkleLib.Git
-TARGET = library
-
-LINK = -r:$(DIR_BIN)/SparkleLib.dll
-
-SOURCES =  \
-	SparkleGit.cs \
-	SparkleFetcherGit.cs \
-	SparkleRepoGit.cs
-
-
-install-data-hook:
-	for ASM in $(EXTRA_BUNDLE); do \
-		$(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
-	done;
-
-uninstall-hook:
-	for ASM in $(EXTRA_BUNDLE); do \
-		rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
-	done;
-
-include $(top_srcdir)/build/build.mk

SparkleLib/Git/SparkleFetcherGit.cs

@@ -1,450 +0,0 @@
-//   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
-//
-//   This program is free software: you can redistribute it and/or modify
-//   it under the terms of the GNU Lesser General Public License as
-//   published by the Free Software Foundation, either version 3 of the
-//   License, or (at your option) any later version.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Text.RegularExpressions;
-using System.Threading;
-using SparkleLib;
-
-namespace SparkleLib.Git {
-
-    public class SparkleFetcher : SparkleFetcherSSH {
-
-        private SparkleGit git;
-        private bool use_git_bin;
-        private string cached_salt;
-
-        private Regex progress_regex = new Regex (@"([0-9]+)%", RegexOptions.Compiled);
-        private Regex speed_regex    = new Regex (@"([0-9\.]+) ([KM])iB/s", RegexOptions.Compiled);
-
-        private bool crypto_password_is_hashed = true;
-
-        private string crypto_salt {
-            get {
-                if (!string.IsNullOrEmpty (this.cached_salt))
-                    return this.cached_salt;
-
-                // Check if the repo's salt is stored in a branch...
-                SparkleGit git   = new SparkleGit (TargetFolder, "ls-remote --heads");
-                string branches  = git.StartAndReadStandardOutput ();
-                Regex salt_regex = new Regex ("refs/heads/salt-([0-9a-f]+)");
-				Match salt_match = salt_regex.Match (branches);
-
-				if (salt_match.Success)
-					this.cached_salt = salt_match.Groups [1].Value;
-
-                // ...if not, create a new salt for the repo
-                if (string.IsNullOrEmpty (this.cached_salt)) {
-                    this.cached_salt      = GenerateCryptoSalt ();
-                    string salt_file_path = new string [] { TargetFolder, ".git", "salt" }.Combine ();
-
-                    // Temporarily store the salt in a file, so the Repo object can
-                    // push it to a branch on the host later
-                    File.WriteAllText (salt_file_path, this.cached_salt);
-                }
-
-                return this.cached_salt;
-            }
-        }
-
-
-        public SparkleFetcher (SparkleFetcherInfo info) : base (info)
-        {
-            if (RemoteUrl.ToString ().StartsWith ("ssh+"))
-                RemoteUrl = new Uri ("ssh" + RemoteUrl.ToString ().Substring (RemoteUrl.ToString ().IndexOf ("://")));
-
-            Uri uri = RemoteUrl;
-
-            if (!uri.Scheme.Equals ("ssh") && !uri.Scheme.Equals ("https") &&
-                !uri.Scheme.Equals ("http") && !uri.Scheme.Equals ("git")) {
-
-                uri = new Uri ("ssh://" + uri);
-            }
-
-            if (uri.Host.Equals ("gitorious.org") && !uri.Scheme.StartsWith ("http")) {
-                if (!uri.AbsolutePath.Equals ("/") &&
-                    !uri.AbsolutePath.EndsWith (".git")) {
-
-                    uri = new Uri ("ssh://git@gitorious.org" + uri.AbsolutePath + ".git");
-
-                } else {
-                    uri = new Uri ("ssh://git@gitorious.org" + uri.AbsolutePath);
-                }
-
-            } else if (uri.Host.Equals ("github.com") && !uri.Scheme.StartsWith ("http")) {
-                uri = new Uri ("ssh://git@github.com" + uri.AbsolutePath);
-
-            } else if (uri.Host.Equals ("bitbucket.org") && !uri.Scheme.StartsWith ("http")) {
-                // Nothing really
-
-            } else {
-                if (string.IsNullOrEmpty (uri.UserInfo) && !uri.Scheme.StartsWith ("http")) {
-                    if (uri.Port == -1)
-                        uri = new Uri (uri.Scheme + "://storage@" + uri.Host + uri.AbsolutePath);
-                    else
-                        uri = new Uri (uri.Scheme + "://storage@" + uri.Host + ":" + uri.Port + uri.AbsolutePath);
-                }
-
-                this.use_git_bin = false; // TODO
-            }
-
-            RemoteUrl = uri;
-        }
-
-
-        public override bool Fetch ()
-        {
-            if (!base.Fetch ())
-                return false;
-
-            if (FetchPriorHistory) {
-                this.git = new SparkleGit (SparkleConfig.DefaultConfig.TmpPath,
-                    "clone --progress --no-checkout \"" + RemoteUrl + "\" \"" + TargetFolder + "\"");
-
-            } else {
-                this.git = new SparkleGit (SparkleConfig.DefaultConfig.TmpPath,
-                    "clone --progress --no-checkout --depth=1 \"" + RemoteUrl + "\" \"" + TargetFolder + "\"");
-            }
-
-            this.git.StartInfo.RedirectStandardError = true;
-            this.git.Start ();
-
-            double percentage = 1.0;
-
-            DateTime last_change     = DateTime.Now;
-            TimeSpan change_interval = new TimeSpan (0, 0, 0, 1);
-
-            try {
-                while (!this.git.StandardError.EndOfStream) {
-                    string line = this.git.StandardError.ReadLine ();
-                    Match match = this.progress_regex.Match (line);
-
-                    double number = 0.0;
-                    double speed  = 0.0;
-                    if (match.Success) {
-                        try {
-                            number = double.Parse (match.Groups [1].Value, new CultureInfo ("en-US"));
-
-                        } catch (FormatException) {
-                            SparkleLogger.LogInfo ("Git", "Error parsing progress: \"" + match.Groups [1] + "\"");
-                        }
-
-                        // The pushing progress consists of two stages: the "Compressing
-                        // objects" stage which we count as 20% of the total progress, and
-                        // the "Writing objects" stage which we count as the last 80%
-                        if (line.Contains ("Compressing")) {
-                            // "Compressing objects" stage
-                            number = (number / 100 * 20);
-
-                        } else {
-                            // "Writing objects" stage
-                            number = (number / 100 * 80 + 20);
-                            Match speed_match = this.speed_regex.Match (line);
-
-                            if (speed_match.Success) {
-                                try {
-                                    speed = double.Parse (speed_match.Groups [1].Value, new CultureInfo ("en-US")) * 1024;
-
-                                } catch (FormatException) {
-                                    SparkleLogger.LogInfo ("Git", "Error parsing speed: \"" + speed_match.Groups [1] + "\"");
-                                }
-
-                                if (speed_match.Groups [2].Value.Equals ("M"))
-                                    speed = speed * 1024;
-                            }
-                        }
-
-                    } else {
-                        SparkleLogger.LogInfo ("Fetcher", line);
-                        line = line.Trim (new char [] {' ', '@'});
-
-                        if (line.StartsWith ("fatal:", StringComparison.InvariantCultureIgnoreCase) ||
-                            line.StartsWith ("error:", StringComparison.InvariantCultureIgnoreCase)) {
-
-                            base.errors.Add (line);
-
-                        } else if (line.StartsWith ("WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!")) {
-                            base.errors.Add ("warning: Remote host identification has changed!");
-
-                        } else if (line.StartsWith ("WARNING: POSSIBLE DNS SPOOFING DETECTED!")) {
-                            base.errors.Add ("warning: Possible DNS spoofing detected!");
-                        }
-                    }
-
-                    if (number >= percentage) {
-                        percentage = number;
-
-                        if (DateTime.Compare (last_change, DateTime.Now.Subtract (change_interval)) < 0) {
-                            base.OnProgressChanged (percentage, speed);
-                            last_change = DateTime.Now;
-                        }
-                    }
-                }
-
-            } catch (Exception) {
-                IsActive = false;
-                return false;
-            }
-
-            this.git.WaitForExit ();
-
-            if (this.git.ExitCode == 0) {
-                while (percentage < 100) {
-                    percentage += 25;
-
-                    if (percentage >= 100)
-                        break;
-
-                    Thread.Sleep (500);
-                    base.OnProgressChanged (percentage, 0);
-                }
-
-                base.OnProgressChanged (100, 0);
-
-                InstallConfiguration ();
-                InstallExcludeRules ();
-                InstallAttributeRules ();
-
-                return true;
-
-            } else {
-                return false;
-            }
-        }
-
-
-        public override bool IsFetchedRepoEmpty {
-            get {
-                SparkleGit git = new SparkleGit (TargetFolder, "rev-parse HEAD");
-                git.StartAndWaitForExit ();
-
-                return (git.ExitCode != 0);
-            }
-        }
-
-
-        public override void EnableFetchedRepoCrypto (string password)
-        {
-            // Set up the encryption filter
-            SparkleGit git_config_smudge = new SparkleGit (TargetFolder,
-                "config filter.encryption.smudge \"openssl enc -d -aes-256-cbc -base64 -S " + this.crypto_salt +
-                " -pass file:.git/info/encryption_password\"");
-
-            SparkleGit git_config_clean = new SparkleGit (TargetFolder,
-                "config filter.encryption.clean  \"openssl enc -e -aes-256-cbc -base64 -S " + this.crypto_salt +
-                " -pass file:.git/info/encryption_password\"");
-
-            git_config_smudge.StartAndWaitForExit ();
-            git_config_clean.StartAndWaitForExit ();
-
-            // Pass all files through the encryption filter
-            string git_attributes_file_path = new string [] { TargetFolder, ".git", "info", "attributes" }.Combine ();
-            File.WriteAllText (git_attributes_file_path, "\n* filter=encryption");
-
-            // Store the password
-            string password_file_path = new string [] { TargetFolder, ".git", "info", "encryption_password" }.Combine ();
-
-            if (this.crypto_password_is_hashed)
-                File.WriteAllText (password_file_path, password.SHA256 (this.crypto_salt));
-            else
-                File.WriteAllText (password_file_path, password);
-        }
-
-
-        public override bool IsFetchedRepoPasswordCorrect (string password)
-        {
-            string password_check_file_path = Path.Combine (TargetFolder, ".sparkleshare");
-
-            if (!File.Exists (password_check_file_path)) {
-                SparkleGit git = new SparkleGit (TargetFolder, "show HEAD:.sparkleshare");
-                string output = git.StartAndReadStandardOutput ();
-
-                if (git.ExitCode == 0)
-                    File.WriteAllText (password_check_file_path, output);
-                else
-                    return false;
-            }
-
-            Process process = new Process ();
-            process.EnableRaisingEvents              = true;
-            process.StartInfo.FileName               = "openssl";
-            process.StartInfo.WorkingDirectory       = TargetFolder;
-            process.StartInfo.UseShellExecute        = false;
-            process.StartInfo.RedirectStandardOutput = true;
-            process.StartInfo.CreateNoWindow         = true;
-
-            string [] possible_passwords = new string [] {
-                password.SHA256 (this.crypto_salt),
-                password
-            };
-
-            int i = 0;
-            foreach (string possible_password in possible_passwords) {
-                process.StartInfo.Arguments = "enc -d -aes-256-cbc -base64 -pass pass:\"" + possible_password + "\"" +
-                    " -in \"" + password_check_file_path + "\"";
-
-                SparkleLogger.LogInfo ("Cmd | " + System.IO.Path.GetFileName (process.StartInfo.WorkingDirectory),
-                    System.IO.Path.GetFileName (process.StartInfo.FileName) + " " + process.StartInfo.Arguments);
-
-                process.Start ();
-                process.WaitForExit ();
-
-                if (process.ExitCode == 0) {
-                    if (i > 0)
-                        this.crypto_password_is_hashed = false;
-
-                    File.Delete (password_check_file_path);
-                    return true;
-                }
-
-                i++;
-            }
-
-            return false;
-        }
-
-
-        public override void Stop ()
-        {
-            try {
-                if (this.git != null && !this.git.HasExited) {
-                    this.git.Kill ();
-                    this.git.Dispose ();
-                }
-
-            } catch (Exception e) {
-                SparkleLogger.LogInfo ("Fetcher", "Failed to dispose properly", e);
-            }
-
-            if (Directory.Exists (TargetFolder)) {
-                try {
-                    Directory.Delete (TargetFolder, true /* Recursive */ );
-                    SparkleLogger.LogInfo ("Fetcher", "Deleted '" + TargetFolder + "'");
-
-                } catch (Exception e) {
-                    SparkleLogger.LogInfo ("Fetcher", "Failed to delete '" + TargetFolder + "'", e);
-                }
-            }
-        }
-
-
-        public override void Complete ()
-        {
-            if (!IsFetchedRepoEmpty) {
-                SparkleGit git = new SparkleGit (TargetFolder, "checkout --quiet HEAD");
-                git.StartAndWaitForExit ();
-            }
-
-            base.Complete ();
-        }
-
-
-        private void InstallConfiguration ()
-        {
-            string [] settings = new string [] {
-                "core.autocrlf input",
-                "core.quotepath false", // Don't quote "unusual" characters in path names
-                "core.ignorecase false", // Be case sensitive explicitly to work on Mac
-                "core.filemode false", // Ignore permission changes
-                "core.precomposeunicode true", // Use the same Unicode form on all filesystems
-                "core.safecrlf false",
-                "core.excludesfile \"\"",
-                "core.packedGitLimit 128m", // Some memory limiting options
-                "core.packedGitWindowSize 128m",
-                "pack.deltaCacheSize 128m",
-                "pack.packSizeLimit 128m",
-                "pack.windowMemory 128m",
-                "push.default matching"
-            };
-
-            if (SparkleBackend.Platform == PlatformID.Win32NT)
-                settings [0] = "core.autocrlf true";
-
-            foreach (string setting in settings) {
-                SparkleGit git_config = new SparkleGit (TargetFolder, "config " + setting);
-                git_config.StartAndWaitForExit ();
-            }
-
-            if (this.use_git_bin)
-                InstallGitBinConfiguration ();
-        }
-
-
-        public void InstallGitBinConfiguration ()
-        {
-            string [] settings = new string [] {
-                "core.bigFileThreshold 1024g",
-                "filter.bin.clean \"git bin clean %f\"",
-                "filter.bin.smudge \"git bin smudge\""
-            };
-
-            foreach (string setting in settings) {
-                SparkleGit git_config = new SparkleGit (TargetFolder, "config " + setting);
-                git_config.StartAndWaitForExit ();
-            }
-        }
-
-
-        // Add a .gitignore file to the repo
-        private void InstallExcludeRules ()
-        {
-            string git_info_path = new string [] { TargetFolder, ".git", "info" }.Combine ();
-
-            if (!Directory.Exists (git_info_path))
-                Directory.CreateDirectory (git_info_path);
-
-            string exclude_rules           = string.Join (Environment.NewLine, ExcludeRules);
-            string exclude_rules_file_path = new string [] { git_info_path, "exclude" }.Combine ();
-
-            File.WriteAllText (exclude_rules_file_path, exclude_rules);
-        }
-
-
-        private void InstallAttributeRules ()
-        {
-            string attribute_rules_file_path = new string [] { TargetFolder, ".git", "info", "attributes" }.Combine ();
-            TextWriter writer                = new StreamWriter (attribute_rules_file_path);
-
-            if (this.use_git_bin) {
-                writer.WriteLine ("* filter=bin binary");
-
-            } else {
-                // Compile a list of files we don't want Git to compress.
-                // Not compressing already compressed files decreases memory usage and increases speed
-                string [] extensions = new string [] {
-                    "jpg", "jpeg", "png", "tiff", "gif", // Images
-                    "flac", "mp3", "ogg", "oga", // Audio
-                    "avi", "mov", "mpg", "mpeg", "mkv", "ogv", "ogx", "webm", // Video
-                    "zip", "gz", "bz", "bz2", "rpm", "deb", "tgz", "rar", "ace", "7z", "pak", "tc", "iso", ".dmg" // Archives
-                };
-
-                foreach (string extension in extensions) {
-                    writer.WriteLine ("*." + extension + " -delta");
-                    writer.WriteLine ("*." + extension.ToUpper () + " -delta");
-                }
-
-                writer.WriteLine ("*.txt text");
-                writer.WriteLine ("*.TXT text");
-            }
-
-            writer.Close ();
-        }
-    }
-}

SparkleLib/Git/SparkleGit.cs

@@ -1,166 +0,0 @@
-//   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
-//
-//   This program is free software: you can redistribute it and/or modify
-//   it under the terms of the GNU Lesser General Public License as 
-//   published by the Free Software Foundation, either version 3 of the 
-//   License, or (at your option) any later version.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-using System;
-using System.IO;
-using System.Diagnostics;
-using SparkleLib;
-
-namespace SparkleLib.Git {
-
-    public abstract class SparkleProcess : Process {
-
-        public SparkleProcess (string path, string args) : base ()
-        {
-            StartInfo.FileName  = path;
-            StartInfo.Arguments = args;
-        }
-
-
-        new public void Start ()
-        {
-            SparkleLogger.LogInfo ("Cmd | " + System.IO.Path.GetFileName (StartInfo.WorkingDirectory),
-                System.IO.Path.GetFileName (StartInfo.FileName) + " " + StartInfo.Arguments);
-
-            try {
-                base.Start ();
-
-            } catch (Exception e) {
-                SparkleLogger.LogInfo ("Cmd", "Couldn't execute command: " + e.Message);
-                Environment.Exit (-1);
-            }
-        }
-
-
-        public void StartAndWaitForExit ()
-        {
-            Start ();
-            WaitForExit ();
-        }
-
-
-        public string StartAndReadStandardOutput ()
-        {
-            Start ();
-            
-            // Reading the standard output HAS to go before
-            // WaitForExit, or it will hang forever on output > 4096 bytes
-            string output = StandardOutput.ReadToEnd ();
-            WaitForExit ();
-            
-            return output.TrimEnd ();
-        }
-
-
-        public string StartAndReadStandardError ()
-        {
-            StartInfo.RedirectStandardError = true;
-            Start ();
-            
-            // Reading the standard output HAS to go before
-            // WaitForExit, or it will hang forever on output > 4096 bytes
-            string output = StandardError.ReadToEnd ();
-            WaitForExit ();
-            
-            return output.TrimEnd ();
-        }
-
-
-        protected string LocateCommand (string name)
-        {
-            string [] possible_command_paths = new string [] {
-                Environment.GetFolderPath (Environment.SpecialFolder.Personal) + "/bin/" + name,
-                Defines.INSTALL_DIR + "/bin/" + name,
-                "/usr/local/bin/" + name,
-                "/usr/bin/" + name,
-                "/opt/local/bin/" + name
-            };
-
-            foreach (string path in possible_command_paths) {
-                if (File.Exists (path))
-                    return path;
-            }
-
-            return name;
-        }
-    }
-
-
-    public class SparkleGit : SparkleProcess {
-
-        public static string ExecPath;
-        public static string GitPath;
-        public static string SSHPath;
-
-
-        public SparkleGit (string path, string args) : base (path, args)
-        {
-            if (string.IsNullOrEmpty (GitPath))
-                GitPath = LocateCommand ("git");
-
-            EnableRaisingEvents              = true;
-            StartInfo.FileName               = GitPath;
-            StartInfo.RedirectStandardOutput = true;
-            StartInfo.UseShellExecute        = false;
-            StartInfo.WorkingDirectory       = path;
-            StartInfo.CreateNoWindow         = true;
-
-            if (StartInfo.EnvironmentVariables.ContainsKey ("LANG"))
-                StartInfo.EnvironmentVariables ["LANG"] = "en_US";
-            else
-                StartInfo.EnvironmentVariables.Add ("LANG", "en_US");
-
-            if (StartInfo.EnvironmentVariables.ContainsKey ("GIT_TERMINAL_PROMPT"))
-                StartInfo.EnvironmentVariables ["GIT_TERMINAL_PROMPT"] = "0";
-            else
-                StartInfo.EnvironmentVariables.Add ("GIT_TERMINAL_PROMPT", "0");
-
-            if (!string.IsNullOrEmpty (SSHPath)) {
-                if (StartInfo.EnvironmentVariables.ContainsKey ("GIT_SSH"))
-                    StartInfo.EnvironmentVariables ["GIT_SSH"] = SSHPath;
-                else
-                    StartInfo.EnvironmentVariables.Add ("GIT_SSH", SSHPath);
-            }
-
-            if (string.IsNullOrEmpty (ExecPath))
-                StartInfo.Arguments = args;
-            else
-                StartInfo.Arguments = "--exec-path=\"" + ExecPath + "\" " + args;
-        }
-    }
-
-
-    public class SparkleGitBin : SparkleProcess {
-
-        public static string GitBinPath;
-
-
-        public SparkleGitBin (string path, string args) : base (path, args)
-        {
-            if (string.IsNullOrEmpty (GitBinPath))
-                GitBinPath = LocateCommand ("git-bin");
-
-            EnableRaisingEvents              = true;
-            StartInfo.FileName               = GitBinPath;
-            StartInfo.RedirectStandardOutput = true;
-            StartInfo.UseShellExecute        = false;
-            StartInfo.WorkingDirectory       = path;
-            StartInfo.CreateNoWindow         = true;
-            StartInfo.Arguments              = args;
-        }
-    }
-}

SparkleLib/Makefile.am

@@ -1,32 +0,0 @@
-ASSEMBLY = SparkleLib
-TARGET = library
-
-ASSEMBLY_INFO_SOURCE = Defines.cs
-
-SOURCES =  \
-	SparkleBackend.cs \
-	SparkleConfig.cs \
-	SparkleExtensions.cs \
-	SparkleFetcherBase.cs \
-	SparkleFetcherSSH.cs \
-	SparkleListenerBase.cs \
-	SparkleListenerFactory.cs \
-	SparkleListenerTcp.cs \
-	SparkleLogger.cs \
-	SparkleRepoBase.cs \
-	SparkleUser.cs \
-	SparkleWatcher.cs \
-	SparkleWrappers.cs
-
-
-install-data-hook:
-	for ASM in $(EXTRA_BUNDLE); do \
-		$(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
-	done;
-
-uninstall-hook:
-	for ASM in $(EXTRA_BUNDLE); do \
-		rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
-	done;
-
-include $(top_srcdir)/build/build.mk

SparkleLib/SparkleBackend.cs

@@ -1,60 +0,0 @@
-//   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
-//
-//   This program is free software: you can redistribute it and/or modify
-//   it under the terms of the GNU Lesser General Public License as 
-//   published by the Free Software Foundation, either version 3 of the 
-//   License, or (at your option) any later version.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-namespace SparkleLib {
-
-    public static class SparkleBackend {
-
-        public static string Version {
-            get {
-                string version = "" + Assembly.GetExecutingAssembly ().GetName ().Version;
-                return version.Substring (0, version.Length - 2);
-            }
-        }
-
-
-        // This fixes the PlatformID enumeration for MacOSX in Environment.OSVersion.Platform,
-        // which is intentionally broken in Mono for historical reasons
-        public static PlatformID Platform {
-            get {
-                IntPtr buf = IntPtr.Zero;
-
-                try {
-                    buf = Marshal.AllocHGlobal (8192);
-
-                    if (uname (buf) == 0 && Marshal.PtrToStringAnsi (buf) == "Darwin")
-                        return PlatformID.MacOSX;
-
-                } catch {
-                } finally {
-                    if (buf != IntPtr.Zero)
-                        Marshal.FreeHGlobal (buf);
-                }
-
-                return Environment.OSVersion.Platform;
-            }
-        }
-
-
-        [DllImport ("libc")]
-        private static extern int uname (IntPtr buf);
-    }
-}

SparkleLib/SparkleFetcherSSH.cs

@@ -1,173 +0,0 @@
-//   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
-//
-//   This program is free software: you can redistribute it and/or modify
-//   it under the terms of the GNU Lesser General Public License as 
-//   published by the Free Software Foundation, either version 3 of the 
-//   License, or (at your option) any later version.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Security.Cryptography;
-using System.Threading;
-
-namespace SparkleLib {
-
-    public abstract class SparkleFetcherSSH : SparkleFetcherBase {
-
-        public SparkleFetcherSSH (SparkleFetcherInfo info) : base (info)
-        {
-        }
-
-
-        public override bool Fetch ()
-        {
-            if (RemoteUrl.Host.EndsWith (".onion")) {
-                // Tor has special domain names called ".onion addresses".  They can only be
-                // resolved by using a proxy via tor. While the rest of the openssh suite
-                // fully supports proxying, ssh-keyscan does not, so we can't use it for .onion
-                SparkleLogger.LogInfo ("Auth", "using tor .onion address skipping ssh-keyscan");
-
-            } else if (!RemoteUrl.Scheme.StartsWith ("http")) {
-                string host_key = FetchHostKey ();
-                
-                if (string.IsNullOrEmpty (RemoteUrl.Host) || host_key == null) {
-                    SparkleLogger.LogInfo ("Auth", "Could not fetch host key");
-                    this.errors.Add ("error: Could not fetch host key");
-                    
-                    return false;
-                }
-                
-                bool warn = true;
-                if (RequiredFingerprint != null) {
-                    string host_fingerprint;
-
-                    try {
-                        host_fingerprint = DeriveFingerprint (host_key);
-                    
-                    } catch (InvalidOperationException e) {
-                        // "Unapproved cryptographic algorithms" won't work when FIPS is enabled on Windows.
-                        // Software like Cisco AnyConnect can demand this feature is on, so we show an error
-                        SparkleLogger.LogInfo ("Auth", "Unable to derive fingerprint: ", e);
-                        this.errors.Add ("error: Can't check fingerprint due to FIPS being enabled");
-                        
-                        return false;
-                    }
-
-                    if (host_fingerprint == null || !RequiredFingerprint.Equals (host_fingerprint)) {
-                        SparkleLogger.LogInfo ("Auth", "Fingerprint doesn't match");
-                        this.errors.Add ("error: Host fingerprint doesn't match");
-                        
-                        return false;
-                    }
-                    
-                    warn = false;
-                    SparkleLogger.LogInfo ("Auth", "Fingerprint matches");
-                    
-                } else {
-                    SparkleLogger.LogInfo ("Auth", "Skipping fingerprint check");
-                }
-                
-                AcceptHostKey (host_key, warn);
-            }
-            
-            return true;
-        }
-
-
-        private string FetchHostKey ()
-        {
-            SparkleLogger.LogInfo ("Auth", "Fetching host key for " + RemoteUrl.Host);
-            
-            Process process = new Process ();
-            process.StartInfo.FileName               = "ssh-keyscan";
-            process.StartInfo.WorkingDirectory       = SparkleConfig.DefaultConfig.TmpPath;
-            process.StartInfo.UseShellExecute        = false;
-            process.StartInfo.RedirectStandardOutput = true;
-            process.StartInfo.CreateNoWindow         = true;
-            process.EnableRaisingEvents              = true;
-            
-            string [] key_types = {"rsa", "dsa", "ecdsa"};
-            
-            foreach (string key_type in key_types) {
-                if (RemoteUrl.Port < 1)
-                    process.StartInfo.Arguments = "-t " + key_type + " -p 22 " + RemoteUrl.Host;
-                else
-                    process.StartInfo.Arguments = "-t " + key_type + " -p " + RemoteUrl.Port + " " + RemoteUrl.Host;
-                
-                SparkleLogger.LogInfo ("Cmd", process.StartInfo.FileName + " " + process.StartInfo.Arguments);
-                
-                process.Start ();
-                string host_key = process.StandardOutput.ReadToEnd ().Trim ();
-                process.WaitForExit ();
-                
-                if (process.ExitCode == 0 && !string.IsNullOrWhiteSpace (host_key))
-                    return host_key;
-            }
-            
-            return null;
-        }
-        
-        
-        private string DeriveFingerprint (string public_key)
-        {
-            try {
-                MD5 md5            = new MD5CryptoServiceProvider ();
-                string key         = public_key.Split (" ".ToCharArray ()) [2];
-                byte [] b64_bytes  = Convert.FromBase64String (key);
-                byte [] md5_bytes  = md5.ComputeHash (b64_bytes);
-                string fingerprint = BitConverter.ToString (md5_bytes);
-                
-                return fingerprint.ToLower ().Replace ("-", ":");
-                
-            } catch (Exception e) {
-                SparkleLogger.LogInfo ("Fetcher", "Failed creating fingerprint: " + e.Message + " " + e.StackTrace);
-                return null;
-            }
-        }
-        
-        
-        private void AcceptHostKey (string host_key, bool warn)
-        {
-            string ssh_config_path       = Path.Combine (SparkleConfig.DefaultConfig.HomePath, ".ssh");
-            string known_hosts_file_path = Path.Combine (ssh_config_path, "known_hosts");
-            
-            if (!File.Exists (known_hosts_file_path)) {
-                if (!Directory.Exists (ssh_config_path))
-                    Directory.CreateDirectory (ssh_config_path);
-                
-                File.Create (known_hosts_file_path).Close ();
-            }
-            
-            string host                 = RemoteUrl.Host;
-            string known_hosts          = File.ReadAllText (known_hosts_file_path);
-            string [] known_hosts_lines = File.ReadAllLines (known_hosts_file_path);
-            
-            foreach (string line in known_hosts_lines) {
-                if (line.StartsWith (host + " "))
-                    return;
-            }
-            
-            if (known_hosts.EndsWith ("\n"))
-                File.AppendAllText (known_hosts_file_path, host_key + "\n");
-            else
-                File.AppendAllText (known_hosts_file_path, "\n" + host_key + "\n");
-            
-            SparkleLogger.LogInfo ("Auth", "Accepted host key for " + host);
-            
-            if (warn)
-                this.warnings.Add ("The following host key has been accepted:\n" + DeriveFingerprint (host_key));
-        }
-    }
-}

SparkleLib/SparkleLib.csproj

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2C914413-B31C-4362-93C7-1AE34F09112A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>SparkleLib</RootNamespace>
-    <AssemblyName>SparkleLib</AssemblyName>
-    <ReleaseVersion>
-    </ReleaseVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\bin</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Optimize>False</Optimize>
-    <OutputPath>..\bin</OutputPath>
-    <WarningLevel>4</WarningLevel>
-    <DebugSymbols>true</DebugSymbols>
-    <DefineConstants>DEBUG</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="SparkleRepoBase.cs" />
-    <Compile Include="SparkleFetcherBase.cs" />
-    <Compile Include="SparkleWrappers.cs" />
-    <Compile Include="SparkleListenerBase.cs" />
-    <Compile Include="SparkleListenerFactory.cs" />
-    <Compile Include="SparkleListenerTcp.cs" />
-    <Compile Include="SparkleBackend.cs" />
-    <Compile Include="SparkleConfig.cs" />
-    <Compile Include="SparkleWatcher.cs" />
-    <Compile Include="SparkleExtensions.cs" />
-    <Compile Include="SparkleUser.cs" />
-    <Compile Include="SparkleLogger.cs" />
-    <Compile Include="Defines.cs" />
-    <Compile Include="SparkleFetcherSSH.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>

SparkleLib/SparkleLib.sln

@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "SparkleLib.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = SparkleLib.csproj
-	EndGlobalSection
-EndGlobal

SparkleShare.sln

@@ -0,0 +1,89 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sparkles", "Sparkles\Sparkles.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sparkles.Git", "Sparkles\Git\Sparkles.Git.csproj", "{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Windows", "SparkleShare\Windows\SparkleShare.Windows.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Linux", "SparkleShare\Linux\SparkleShare.Linux.csproj", "{5714D3CA-88A6-4330-A29D-4CA90D1D193C}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SparkleShare", "SparkleShare\Common\SparkleShare.shproj", "{F16E3683-B622-4654-B799-99C8D68AA963}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Mac", "SparkleShare\Mac\SparkleShare.Mac.csproj", "{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Release|Any CPU = Release|Any CPU
+		Debug|Any CPU = Debug|Any CPU
+		ReleaseDist|Any CPU = ReleaseDist|Any CPU
+		ReleaseMac|Any CPU = ReleaseMac|Any CPU
+		DebugMac|Any CPU = DebugMac|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU
+		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU
+		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
+		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
+		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
+		{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
+		{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C914413-B31C-4362-93C7-1AE34F09112A}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU
+		{2C914413-B31C-4362-93C7-1AE34F09112A}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU
+		{2C914413-B31C-4362-93C7-1AE34F09112A}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
+		{2C914413-B31C-4362-93C7-1AE34F09112A}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
+		{2C914413-B31C-4362-93C7-1AE34F09112A}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
+		{2C914413-B31C-4362-93C7-1AE34F09112A}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
+		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU
+		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU
+		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
+		{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
+		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU
+		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU
+		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
+		{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
+		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.ReleaseDist|Any CPU.ActiveCfg = ReleaseDist|Any CPU
+		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.ReleaseDist|Any CPU.Build.0 = ReleaseDist|Any CPU
+		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
+		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
+		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
+		{8FCDF699-E2C3-4CB3-AF98-44198972AFC0}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.DotNetNamingPolicy = $1
+		$1.DirectoryNamespaceAssociation = None
+		$1.ResourceNamePolicy = FileFormatDefault
+		$0.TextStylePolicy = $2
+		$2.FileWidth = 120
+		$2.inheritsSet = VisualStudio
+		$2.inheritsScope = text/plain
+		$2.scope = text/plain
+		$0.CSharpFormattingPolicy = $3
+		$3.inheritsSet = Mono
+		$3.inheritsScope = text/x-csharp
+		$3.scope = text/x-csharp
+		version = 
+	EndGlobalSection
+EndGlobal
+

SparkleShare/Common/AboutController.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
 //
 //   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
@@ -19,9 +19,11 @@ using System;
 using System.Net;
 using System.Threading;
 
+using Sparkles;
+
 namespace SparkleShare {
 
-    public class SparkleAboutController {
+    public class AboutController {
 
         public event Action ShowWindowEvent = delegate { };
         public event Action HideWindowEvent = delegate { };
@@ -29,21 +31,21 @@ namespace SparkleShare {
         public event UpdateLabelEventDelegate UpdateLabelEvent = delegate { };
         public delegate void UpdateLabelEventDelegate (string text);
 
-        public readonly string WebsiteLinkAddress       = "http://www.sparkleshare.org/";
-        public readonly string CreditsLinkAddress       = "http://github.com/hbons/SparkleShare/blob/master/legal/Authors.txt";
-        public readonly string ReportProblemLinkAddress = "http://www.github.com/hbons/SparkleShare/issues";
-        public readonly string DebugLogLinkAddress      = "file://" + Program.Controller.Config.LogFilePath;
+        public readonly string WebsiteLinkAddress       = "https://www.sparkleshare.org/";
+        public readonly string CreditsLinkAddress       = "https://github.com/hbons/SparkleShare/blob/master/.github/AUTHORS.md";
+        public readonly string ReportProblemLinkAddress = "https://www.github.com/hbons/SparkleShare/issues";
+        public readonly string DebugLogLinkAddress      = "file://" + SparkleShare.Controller.Config.LogFilePath;
 
         public string RunningVersion;
 
 
-        public SparkleAboutController ()
+        public AboutController ()
         {
-            RunningVersion = SparkleLib.SparkleBackend.Version;
+            RunningVersion = InstallationInfo.Version;
 
-            Program.Controller.ShowAboutWindowEvent += delegate {
+            SparkleShare.Controller.ShowAboutWindowEvent += delegate {
                 ShowWindowEvent ();
-                new Thread (() => CheckForNewVersion ()).Start ();
+                new Thread (CheckForNewVersion).Start ();
             };
         }
 
@@ -54,24 +56,28 @@ namespace SparkleShare {
         }
 
 
-        private void CheckForNewVersion ()
+        void CheckForNewVersion ()
         {
-            UpdateLabelEvent ("Checking for updates...");
+            UpdateLabelEvent ("Checking for updates…");
             Thread.Sleep (500);
 
-            WebClient web_client = new WebClient ();
-            Uri uri = new Uri ("http://www.sparkleshare.org/version");
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+
+            var web_client = new WebClient ();
+            var uri = new Uri ("https://www.sparkleshare.org/version");
 
             try {
-                string latest_version = web_client.DownloadString (uri).Trim ();
+                string latest_version = web_client.DownloadString (uri);
+                latest_version = latest_version.Trim ();
             
                 if (new Version (latest_version) > new Version (RunningVersion))
-                    UpdateLabelEvent ("A newer version (" + latest_version + ") is available!");
+                    UpdateLabelEvent ("An update (version " + latest_version + ") is available!");
                 else
-                    UpdateLabelEvent ("You are running the latest version.");
+                    UpdateLabelEvent ("✓ You are running the latest version");
 
-            } catch {
-                UpdateLabelEvent ("Version check failed.");
+            } catch (Exception e) {
+                Logger.LogInfo ("UI", "Failed to download " + uri , e);
+                UpdateLabelEvent ("Couldn’t check for updates\t");
             }
         }
     }

SparkleShare/Common/Avatars.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
 //
 //   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
@@ -23,28 +23,28 @@ using System.Net.Mime;
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 
-using SparkleLib;
+using Sparkles;
 
 namespace SparkleShare
 {
-    public static class SparkleAvatars
+    public static class Avatars
     {
-        private static List<string> skipped_avatars = new List<string> ();
+        static List<string> skipped_avatars = new List<string> ();
 
 
-        public static string GetAvatar (string email, int size, string target_path)
+        public static string GetAvatar (string email, int size, string target_path, string provider)
         {
             #if __MonoCS__
-            ServicePointManager.ServerCertificateValidationCallback = GetAvatarValidationCallBack;
+                if (provider == "gravatar")
+                    ServicePointManager.ServerCertificateValidationCallback = GetGravatarValidationCallBack;
             #endif
 
             email = email.ToLower ();
-            
+
             if (skipped_avatars.Contains (email))
                 return null;
-            
-            string avatars_path = new string [] { Path.GetDirectoryName (target_path),
-                "avatars", size + "x" + size }.Combine ();
+
+            string avatars_path = Path.Combine (Path.GetDirectoryName (target_path), "avatars", size + "x" + size);
 
             // Search avatars by file name, ignore extension
             // Delete files over a day old
@@ -64,13 +64,18 @@ namespace SparkleShare
                 avatar_file_path = Path.Combine (avatars_path, email.MD5 ());
 
             } catch (InvalidOperationException e) {
-                SparkleLogger.LogInfo ("Avatars", "Error fetching avatar for " + email, e);
+                Logger.LogInfo ("Avatars", "Error fetching avatar for " + email, e);
                 return null;
             }
-            
-            WebClient client = new WebClient ();
-            string url =  "https://gravatar.com/avatar/" + email.MD5 () + ".png?s=" + size + "&d=404";
-            
+
+            var client = new WebClient ();
+            string url = "";
+
+            if (provider == "libravatar")
+                url =  "https://seccdn.libravatar.org/avatar/" + email.MD5 () + ".png?s=" + size + "&d=404";
+            else
+                url =  "https://secure.gravatar.com/avatar/" + email.MD5 () + ".png?s=" + size + "&d=404";
+
             try {
                 byte [] buffer = client.DownloadData (url);
 
@@ -79,52 +84,53 @@ namespace SparkleShare
 
                 } else if (client.ResponseHeaders ["content-type"].Equals (MediaTypeNames.Image.Gif, StringComparison.InvariantCultureIgnoreCase)) {
                     avatar_file_path += ".gif";
-                
+
                 } else {
                     avatar_file_path += ".png";
                 }
-                
+
                 if (buffer.Length > 255) {
                     if (!Directory.Exists (avatars_path)) {
                         Directory.CreateDirectory (avatars_path);
-                        SparkleLogger.LogInfo ("Avatars", "Created '" + avatars_path + "'");
+                        Logger.LogInfo ("Avatars", "Created '" + avatars_path + "'");
                     }
-                    
+
                     File.WriteAllBytes (avatar_file_path, buffer);
-                    SparkleLogger.LogInfo ("Avatars", "Fetched " + size + "x" + size + " avatar for " + email);
-                    
+                    Logger.LogInfo ("Avatars", "Fetched " + size + "x" + size + " avatar for " + email);
+
                     return avatar_file_path;
-                    
+
                 } else {
                     return null;
                 }
-                
+
             } catch (Exception e) {
-                SparkleLogger.LogInfo ("Avatars", "Error fetching avatar for " + email, e);
+                Logger.LogInfo ("Avatars", "Error fetching avatar for " + email, e);
                 skipped_avatars.Add (email);
-                
+
                 return null;
             }
         }
 
 
-        private static bool GetAvatarValidationCallBack (Object sender,
+        private static bool GetGravatarValidationCallBack (Object sender,
             X509Certificate certificate, X509Chain chain, SslPolicyErrors errors)
         {
             X509Certificate2 certificate2 = new X509Certificate2 (certificate.GetRawCertData ());
-            
+
             // On some systems (mostly Linux) we can't assume the needed certificates are
             // available, so we have to check the certificate's SHA-1 fingerprint manually.
             //
-            // SHA1 fingerprinter obtained from https://www.gravatar.com/ on Oct 16 2015 
-            // Set to expire on Oct 14 2018
-            string gravatar_cert_fingerprint = "1264B3F00814C6077D3853238771EE67FB6321C9";
+            // SHA1 fingerprinter obtained from https://www.gravatar.com/ on Oct 23 2020
+            // Set to expire on Nov 16 2022
+            
+            string gravatar_cert_fingerprint = "846963703FD297724E91BDF47FFE4BC19E93EA15";
 
             if (!certificate2.Thumbprint.Equals (gravatar_cert_fingerprint)) {
-                SparkleLogger.LogInfo ("Avatars", "Invalid certificate for https://www.gravatar.com/");
+                Logger.LogInfo ("Avatars", "Invalid certificate for https://www.gravatar.com/");
                 return false;
             }
-            
+
             return true;
         }
     }

SparkleShare/Common/BaseController.cs

@@ -0,0 +1,763 @@
+//   SparkleShare, a collaboration and sharing tool.
+//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//
+//   This program is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
+using Sparkles;
+
+namespace SparkleShare {
+
+    public abstract class BaseController {
+
+        public BaseRepository [] Repositories {
+            get {
+                lock (this.repo_lock)
+                    return this.repositories.GetRange (0, this.repositories.Count).ToArray ();
+            }
+        }
+
+
+        void AddRepository (BaseRepository repo)
+        {
+            lock (this.repo_lock) {
+                this.repositories.Add (repo);
+                this.repositories.Sort ((x, y) => string.Compare (x.Name, y.Name));
+            }
+        }
+
+
+        void RemoveRepository (BaseRepository repo)
+        {
+            lock (this.repo_lock)
+                this.repositories.Remove (repo);
+        }
+
+
+        public BaseRepository GetRepoByName (string name)
+        {
+            lock (this.repo_lock) {
+                foreach (BaseRepository repo in this.repositories)
+                    if (repo.Name.Equals (name))
+                        return repo;
+            }
+
+            return null;
+        }
+
+
+        public Configuration Config { get; private set; }
+        public bool RepositoriesLoaded { get; private set; }
+        public string FoldersPath { get; private set; }
+
+        public double ProgressPercentage  = 0.0;
+        public double ProgressSpeedUp     = 0.0;
+        public double ProgressSpeedDown   = 0.0;
+        public string ProgressInformation = "";
+
+
+        public event ShowSetupWindowEventHandler ShowSetupWindowEvent = delegate { };
+        public delegate void ShowSetupWindowEventHandler (PageType page_type);
+
+        public event ShowNoteWindowEventHandler ShowNoteWindowEvent = delegate { };
+        public delegate void ShowNoteWindowEventHandler (string project);
+
+        public event Action ShowAboutWindowEvent = delegate { };
+        public event Action ShowEventLogWindowEvent = delegate { };
+
+        public event FolderFetchedEventHandler FolderFetched = delegate { };
+        public delegate void FolderFetchedEventHandler (string remote_url, string [] warnings);
+
+        public event FolderFetchErrorHandler FolderFetchError = delegate { };
+        public delegate void FolderFetchErrorHandler (string remote_url, string [] errors);
+
+        public event FolderFetchingHandler FolderFetching = delegate { };
+        public delegate void FolderFetchingHandler (double percentage, double speed, string information);
+
+
+        public event Action FolderListChanged = delegate { };
+        public event Action OnIdle = delegate { };
+        public event Action OnSyncing = delegate { };
+        public event Action OnError = delegate { };
+
+
+        public event InviteReceivedHandler InviteReceived = delegate { };
+        public delegate void InviteReceivedHandler (SparkleInvite invite);
+
+        public event NotificationRaisedEventHandler NotificationRaised = delegate { };
+        public delegate void NotificationRaisedEventHandler (ChangeSet change_set);
+
+        public event AlertNotificationRaisedEventHandler AlertNotificationRaised = delegate { };
+        public delegate void AlertNotificationRaisedEventHandler (string title, string message);
+
+
+        public bool FirstRun {
+            get { return Config.User.Email.Equals ("Unknown"); }
+        }
+
+        public List<string> Folders {
+            get {
+                List<string> folders = Config.Folders;
+                return folders;
+            }
+        }
+
+
+        public User CurrentUser {
+            get { return Config.User; }
+            set { Config.User = value; }
+        }
+
+        public SSHAuthenticationInfo UserAuthenticationInfo;
+
+
+        public bool NotificationsEnabled {
+            get {
+                string notifications_enabled = Config.GetConfigOption ("notifications");
+
+                if (string.IsNullOrEmpty (notifications_enabled)) {
+                    Config.SetConfigOption ("notifications", bool.TrueString);
+                    return true;
+
+                } else {
+                    return notifications_enabled.Equals (bool.TrueString);
+                }
+            }
+        }
+
+        public bool AvatarsEnabled {
+            get {
+                string fetch_avatars_option = Config.GetConfigOption ("fetch_avatars");
+
+                if (fetch_avatars_option == null || fetch_avatars_option.Equals (bool.FalseString))
+                    return false;
+
+                return true;
+            }
+        }
+
+        public string AvatarsProvider {
+            get {
+                string avatars_provider_string = Config.GetConfigOption ("avatars_provider");
+
+                if (avatars_provider_string == null)
+                    return "gravatar";
+
+                return avatars_provider_string;
+            }
+        }
+
+        // Path where the plugins are kept
+        public abstract string PresetsPath { get; }
+
+        // Enables SparkleShare to start automatically at login
+        public abstract void CreateStartupItem ();
+
+        // Installs the sparkleshare:// protocol handler
+        public abstract void InstallProtocolHandler ();
+
+        // Installs the sparkleshare:// protocol handler
+        public abstract void SetFolderIcon ();
+
+        // Creates the SparkleShare folder in the user's home folder
+        public abstract void CreateSparkleShareFolder ();
+
+        // Opens the SparkleShare folder or an (optional) subfolder
+        public abstract void OpenFolder (string path);
+
+        // Opens a file with the appropriate application
+        public abstract void OpenFile (string path);
+
+        // Opens a file with the appropriate application
+        public virtual void OpenWebsite (string url) { }
+
+        // Copies text to the clipboard
+        public abstract void CopyToClipboard (string text);
+
+        // Allows for platform-specific quit and cleanup methods to be called on exit
+        public abstract void PlatformQuit ();
+
+        public abstract string EventLogHTML { get; }
+        public abstract string DayEntryHTML { get; }
+        public abstract string EventEntryHTML { get; }
+
+
+        BaseFetcher fetcher;
+        FileSystemWatcher watcher;
+        object repo_lock = new object ();
+        object check_repos_lock = new object ();
+        List<BaseRepository> repositories = new List<BaseRepository> ();
+        bool lost_folders_path = false;
+
+
+        public BaseController (Configuration config)
+        {
+            Config = config;
+            FoldersPath = Config.FoldersPath;
+        }
+
+
+        public virtual void Initialize ()
+        {
+            string version = InstallationInfo.Version;
+
+            if (InstallationInfo.IsFlatpak)
+                version += " (Flatpak)";
+
+            Logger.LogInfo ("Environment", "SparkleShare " + version);
+            Logger.LogInfo ("Environment", "Git LFS " + Sparkles.Git.GitCommand.GitLFSVersion);
+            Logger.LogInfo ("Environment", "Git " + Sparkles.Git.GitCommand.GitVersion);
+            Logger.LogInfo ("Environment", InstallationInfo.OperatingSystem + " " + InstallationInfo.OperatingSystemVersion);
+
+            UserAuthenticationInfo = new SSHAuthenticationInfo ();
+            SSHAuthenticationInfo.DefaultAuthenticationInfo = UserAuthenticationInfo;
+
+            Preset.PresetsPath = PresetsPath;
+            InstallProtocolHandler ();
+
+            try {
+                CreateSparkleShareFolder ();
+
+            } catch (DirectoryNotFoundException) {
+                this.lost_folders_path = true;
+            }
+
+            SetFolderIcon ();
+
+            // Watch the SparkleShare folder
+            this.watcher = new FileSystemWatcher () {
+                Filter                = "*",
+                IncludeSubdirectories = false,
+                Path                  = FoldersPath
+            };
+
+            watcher.Created += OnFolderActivity;
+            watcher.EnableRaisingEvents = true;
+        }
+
+
+        int reopen_attempt_counts = 0;
+
+        public void HandleReopen ()
+        {
+            if (Repositories.Length > 0) {
+                ShowEventLogWindow ();
+
+            } else if (reopen_attempt_counts > 1) {
+                AlertNotificationRaised ("Hello!", "SparkleShare sits right here, as a status icon.");
+                reopen_attempt_counts = 0;
+
+            } else {
+                reopen_attempt_counts++;
+            }
+        }
+
+
+        public void UIHasLoaded ()
+        {
+            if (this.lost_folders_path) {
+                SparkleShare.UI.Bubbles.Controller.ShowBubble ("Where's your SparkleShare folder?",
+                                                          "Did you put it on a detached drive?", null);
+
+                Environment.Exit (-1);
+            }
+
+            if (FirstRun) {
+                ShowSetupWindow (PageType.Setup);
+
+            } else {
+                new Thread (() => {
+                    StartupInviteScan ();
+                    CheckRepositories ();
+                    RepositoriesLoaded = true;
+                    UpdateState ();
+
+                }).Start ();
+            }
+        }
+
+
+        public void ShowSetupWindow (PageType page_type)
+        {
+            ShowSetupWindowEvent (page_type);
+        }
+
+
+        public void ShowAboutWindow ()
+        {
+            ShowAboutWindowEvent ();
+        }
+
+
+        public void ShowNoteWindow (string project)
+        {
+            ShowNoteWindowEvent (project);
+        }
+
+
+        public void ShowEventLogWindow ()
+        {
+            ShowEventLogWindowEvent ();
+        }
+
+
+        public void OpenSparkleShareFolder ()
+        {
+            OpenFolder (Config.FoldersPath);
+        }
+
+
+        public void OpenSparkleShareFolder (string name)
+        {
+            OpenFolder (new SparkleFolder (name).FullPath);
+        }
+
+
+        public void ToggleNotifications ()
+        {
+            bool notifications_enabled = Config.GetConfigOption ("notifications").Equals (bool.TrueString);
+            Config.SetConfigOption ("notifications", (!notifications_enabled).ToString ());
+        }
+
+
+        void CheckRepositories ()
+        {
+            lock (this.check_repos_lock) {
+                DetectRepositoryRenames ();
+                RemoveDeletedRepositories ();
+            }
+
+            FolderListChanged ();
+        }
+
+
+        void DetectRepositoryRenames ()
+        {
+            foreach (string group_path in Directory.GetDirectories (Config.FoldersPath)) {
+                foreach (string folder_path in Directory.GetDirectories (group_path)) {
+                    string folder_name = Path.GetFileName (folder_path);
+
+                    if (Config.IdentifierByName (folder_name) != null)
+                        continue;
+
+                    string identifier_file_path = Path.Combine (folder_path, ".sparkleshare");
+
+                    if (!File.Exists (identifier_file_path))
+                        continue;
+
+                    string identifier = File.ReadAllText (identifier_file_path).Trim ();
+
+                    if (!Config.IdentifierExists (identifier))
+                        continue;
+
+                    RemoveRepository (GetRepoByName (folder_name));
+                    Config.RenameFolder (identifier, folder_name);
+
+                    string new_folder_path = Path.Combine (group_path, folder_name);
+                    AddRepository (new_folder_path);
+
+                    Logger.LogInfo ("Controller",
+                        "Renamed folder with identifier " + identifier + " to '" + folder_name + "'");
+                }
+            }
+        }
+
+
+        void RemoveDeletedRepositories ()
+        {
+            foreach (string folder_name in Config.Folders) {
+                string folder_path = new SparkleFolder (folder_name).FullPath;
+
+                if (!Directory.Exists (folder_path)) {
+                    Config.RemoveFolder (folder_name);
+                    RemoveRepository (GetRepoByName (folder_name));
+
+                    Logger.LogInfo ("Controller", "Removed folder '" + folder_name + "' from config");
+
+                } else {
+                    AddRepository (folder_path);
+                }
+            }
+        }
+
+
+        void AddRepository (string folder_path)
+        {
+            BaseRepository repo = null;
+            string folder_name = Path.GetFileName (folder_path);
+            string backend = Config.BackendByName (folder_name);
+
+            try {
+                repo = (BaseRepository) Activator.CreateInstance (
+                    Type.GetType ("Sparkles." + backend + "." + backend + "Repository, Sparkles." + backend),
+                        new object [] { folder_path, Config, SSHAuthenticationInfo.DefaultAuthenticationInfo });
+
+            } catch (Exception e) {
+                Logger.LogInfo ("Controller", "Failed to load backend '" + backend + "' for '" + folder_name + "': ", e);
+                return;
+            }
+
+            repo.ChangesDetected += delegate {
+                UpdateState ();
+            };
+
+            repo.SyncStatusChanged += delegate (SyncStatus status) {
+                if (status == SyncStatus.Idle) {
+                    ProgressPercentage  = 0.0;
+                    ProgressSpeedUp     = 0.0;
+                    ProgressSpeedDown   = 0.0;
+                    ProgressInformation = "";
+                }
+
+                UpdateState ();
+            };
+
+            repo.ProgressChanged += delegate {
+                ProgressPercentage  = 0.0;
+                ProgressSpeedUp     = 0.0;
+                ProgressSpeedDown   = 0.0;
+                ProgressInformation = "";
+
+                double percentage = 0.0;
+                int repo_count    = 0;
+
+                foreach (BaseRepository rep in Repositories) {
+                    if (rep.ProgressPercentage > 0) {
+                        percentage += rep.ProgressPercentage;
+                        repo_count++;
+                    }
+
+                    if (rep.Status == SyncStatus.SyncUp)
+                        ProgressSpeedUp += rep.ProgressSpeed;
+
+                    if (rep.Status == SyncStatus.SyncDown)
+                        ProgressSpeedDown += rep.ProgressSpeed;
+                }
+
+                if (repo_count == 1)
+                    ProgressInformation = repo.ProgressInformation;
+
+                if (repo_count > 0)
+                    ProgressPercentage = percentage / repo_count;
+
+                UpdateState ();
+            };
+
+            repo.NewChangeSet += delegate (ChangeSet change_set) {
+                if (AvatarsEnabled) {
+                    string provider = "gravatar";
+
+                    if (AvatarsProvider == "libravatar")
+                        provider = AvatarsProvider;
+
+
+                    change_set.User.AvatarFilePath = Avatars.GetAvatar (change_set.User.Email, 48, Config.DirectoryPath, provider);
+
+                }
+
+                NotificationRaised (change_set);
+            };
+
+            repo.ConflictResolved += delegate {
+                AlertNotificationRaised ("Resolved a file collision", "Local and server versions were kept.");
+            };
+
+            AddRepository (repo);
+            repo.Initialize ();
+        }
+
+
+        void OnFolderActivity (object o, FileSystemEventArgs args)
+        {
+            if (args != null && args.FullPath.EndsWith (".xml") &&
+                args.ChangeType == WatcherChangeTypes.Created) {
+
+                HandleInvite (args);
+                return;
+            }
+        }
+
+
+        void StartupInviteScan ()
+        {
+            foreach (string invite in Directory.GetFiles (FoldersPath, "*.xml"))
+                HandleInvite (invite);
+        }
+
+
+        void HandleInvite (FileSystemEventArgs args)
+        {
+            HandleInvite (args.FullPath);
+        }
+
+
+        void HandleInvite (string path)
+        {
+            if (this.fetcher != null &&
+                this.fetcher.IsActive) {
+
+                AlertNotificationRaised ("SparkleShare Setup seems busy", "Please wait for it to finish");
+
+            } else {
+                SparkleInvite invite = new SparkleInvite (path);
+
+                // It may be that the invite we received a path to isn't
+                // fully downloaded yet, so we try to read it several times
+                int tries = 0;
+                while (!invite.IsValid) {
+                    Thread.Sleep (100);
+                    invite = new SparkleInvite (path);
+                    tries++;
+
+                    if (tries > 10) {
+                        AlertNotificationRaised ("Oh noes!", "This invite seems screwed up...");
+                        break;
+                    }
+                }
+
+                if (invite.IsValid)
+                    InviteReceived (invite);
+
+                File.Delete (path);
+            }
+        }
+
+
+        // Fires events for the current syncing state
+        void UpdateState ()
+        {
+            bool has_unsynced_repos = false;
+            bool has_syncing_repos  = false;
+
+            foreach (BaseRepository repo in Repositories) {
+                if (repo.Status == SyncStatus.SyncDown || repo.Status == SyncStatus.SyncUp || repo.IsBuffering) {
+                    has_syncing_repos = true;
+                    break;
+
+                } else if (repo.Status == SyncStatus.Idle && repo.HasUnsyncedChanges) {
+                    has_unsynced_repos = true;
+                }
+            }
+
+            if (has_syncing_repos)
+                OnSyncing ();
+            else if (has_unsynced_repos)
+                OnError ();
+            else
+                OnIdle ();
+        }
+
+
+        public List<StorageTypeInfo> FetcherAvailableStorageTypes {
+            get {
+                return this.fetcher.AvailableStorageTypes;
+            }
+        }
+
+
+        public void StartFetcher (SparkleFetcherInfo info)
+        {
+            string canonical_name = Path.GetFileName (info.RemotePath);
+            string backend        = info.Backend;
+
+            if (string.IsNullOrEmpty (backend))
+                backend = BaseFetcher.GetBackend (info.Address);
+
+            info.TargetDirectory = Path.Combine (Config.TmpPath, canonical_name);
+
+            if (Directory.Exists (info.TargetDirectory))
+                Directory.Delete (info.TargetDirectory, recursive: true);
+
+            try {
+                this.fetcher = (BaseFetcher) Activator.CreateInstance (
+                    Type.GetType ("Sparkles." + backend + "." + backend + "Fetcher, Sparkles." + backend),
+                        new object [] { info, UserAuthenticationInfo});
+
+            } catch (Exception e) {
+                Logger.LogInfo ("Controller",
+                    "Failed to load '" + backend + "' backend for '" + canonical_name + "' " + e.Message);
+
+                FolderFetchError (Path.Combine (info.Address, info.RemotePath).Replace (@"\", "/"),
+                                  new string [] {"Failed to load \"" + backend + "\" backend for \"" + canonical_name + "\""});
+
+                return;
+            }
+
+            this.fetcher.Finished += FetcherFinishedDelegate;
+            this.fetcher.Failed += FetcherFailedDelegate;
+            this.fetcher.ProgressChanged += FetcherProgressChangedDelgate;
+
+            this.fetcher.Start ();
+        }
+
+
+        void FetcherFinishedDelegate (StorageType storage_type, string [] warnings)
+        {
+            if (storage_type == StorageType.Unknown) {
+                ShowSetupWindow (PageType.StorageSetup);
+                return;
+            }
+
+            if (storage_type == StorageType.Encrypted) {
+                ShowSetupWindowEvent (PageType.CryptoPassword);
+                return;
+            }
+
+            FinishFetcher (storage_type);
+        }
+
+
+        void FetcherFailedDelegate ()
+        {
+            FolderFetchError (this.fetcher.RemoteUrl.ToString (), this.fetcher.Errors);
+            StopFetcher ();
+        }
+
+
+        void FetcherProgressChangedDelgate (double percentage, double speed, string information)
+        {
+            FolderFetching (percentage, speed, information);
+        }
+
+
+        public void StopFetcher ()
+        {
+            this.fetcher.Stop ();
+            this.fetcher.Dispose ();
+
+            this.fetcher = null;
+            this.watcher.EnableRaisingEvents = true;
+        }
+
+
+        public bool CheckPassword (string password)
+        {
+            return this.fetcher.IsFetchedRepoPasswordCorrect (password);
+        }
+
+
+        public void FinishFetcher (StorageType selected_storage_type, string password)
+        {
+            this.fetcher.EnableFetchedRepoCrypto (password);
+            FinishFetcher (StorageType.Encrypted);
+        }
+
+
+        public void FinishFetcher (StorageType selected_storage_type)
+        {
+            this.watcher.EnableRaisingEvents = false;
+            string identifier = this.fetcher.Complete (selected_storage_type);
+
+            string target_folder_path = DetermineFolderPath ();
+            string target_folder_name = Path.GetFileName (target_folder_path);
+
+            try {
+                Directory.Move (this.fetcher.TargetFolder, target_folder_path);
+
+            } catch (Exception e) {
+                Logger.LogInfo ("Controller", "Error moving directory, trying again...", e);
+
+                try {
+                    ClearDirectoryAttributes (this.fetcher.TargetFolder);
+                    Directory.Move (this.fetcher.TargetFolder, target_folder_path);
+
+                } catch (Exception x) {
+                    Logger.LogInfo ("Controller", "Error moving directory", x);
+
+                    this.fetcher.Dispose ();
+                    this.fetcher = null;
+                    this.watcher.EnableRaisingEvents = true;
+                    return;
+                }
+            }
+
+            string backend = BaseFetcher.GetBackend (this.fetcher.RemoteUrl.ToString ());
+
+            Config.AddFolder (target_folder_name, identifier, this.fetcher.RemoteUrl.ToString (), backend);
+
+            if (this.fetcher.FetchedRepoStorageType != StorageType.Plain) {
+                Config.SetFolderOptionalAttribute (target_folder_name,
+                    "storage_type", this.fetcher.FetchedRepoStorageType.ToString ());
+            }
+
+            if (this.fetcher.OriginalFetcherInfo.AnnouncementsUrl != null) {
+                Config.SetFolderOptionalAttribute (target_folder_name, "announcements_url",
+                    this.fetcher.OriginalFetcherInfo.AnnouncementsUrl);
+            }
+
+            AddRepository (target_folder_path);
+            RepositoriesLoaded = true;
+
+            FolderListChanged ();
+            FolderFetched (this.fetcher.RemoteUrl.ToString (), this.fetcher.Warnings.ToArray ());
+
+            this.fetcher.Dispose ();
+            this.fetcher = null;
+
+            this.watcher.EnableRaisingEvents = true;
+        }
+
+
+        string DetermineFolderPath ()
+        {
+            string folder_name = this.fetcher.FormatName ();
+            string folder_group_path = Path.Combine (Config.FoldersPath, this.fetcher.RemoteUrl.Host);
+            string folder_path = Path.Combine (Config.FoldersPath, folder_group_path, folder_name);
+
+            if (!Directory.Exists (folder_path)) {
+                if (!Directory.Exists (folder_group_path))
+                    Directory.CreateDirectory (folder_group_path);
+
+                return folder_path;
+            }
+
+            // Add a number suffix when needed, e.g. "Folder (3)"
+            int suffix = 2 + Directory.GetDirectories (folder_group_path, folder_name + " (*").Length;
+            return string.Format ("{0} ({1})", folder_path, suffix);
+        }
+
+
+        public void Quit ()
+        {
+            foreach (BaseRepository repo in Repositories)
+                repo.Dispose ();
+
+            PlatformQuit ();
+        }
+
+
+        void ClearDirectoryAttributes (string path)
+        {
+            if (!Directory.Exists (path))
+                return;
+
+            string [] folders = Directory.GetDirectories (path);
+
+            foreach (string folder in folders)
+                ClearDirectoryAttributes (folder);
+
+            string [] files = Directory.GetFiles (path);
+
+            foreach (string file in files)
+                if (file.IsSymlink ())
+                    File.SetAttributes (file, FileAttributes.Normal);
+        }
+    }
+}

SparkleShare/Common/BubblesController.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
 //
 //   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,26 +15,31 @@
 //   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
-using System;
 using System.Text;
-
-using SparkleLib;
+using Sparkles;
 
 namespace SparkleShare {
 
-    public class SparkleBubblesController {
+    public class BubblesController {
+        private bool fix_utf_encoding;
 
         public event ShowBubbleEventHandler ShowBubbleEvent = delegate { };
         public delegate void ShowBubbleEventHandler (string title, string subtext, string image_path);
 
 
-        public SparkleBubblesController ()
+        public BubblesController () : this(true)
         {
-            Program.Controller.AlertNotificationRaised += delegate (string title, string message) {
+        }
+
+        public BubblesController (bool fix_utf_encoding)
+        {
+            this.fix_utf_encoding = fix_utf_encoding;
+
+            SparkleShare.Controller.AlertNotificationRaised += delegate (string title, string message) {
                 ShowBubble (title, message, null);
             };
 
-            Program.Controller.NotificationRaised += delegate (SparkleChangeSet change_set) {
+            SparkleShare.Controller.NotificationRaised += delegate (ChangeSet change_set) {
                 ShowBubble (change_set.User.Name, change_set.ToMessage (), change_set.User.AvatarFilePath);
             };
         }
@@ -42,10 +47,13 @@ namespace SparkleShare {
 
         public void ShowBubble (string title, string subtext, string image_path)
         {
-            byte [] title_bytes   = Encoding.Default.GetBytes (title);
-            byte [] subtext_bytes = Encoding.Default.GetBytes (subtext);
-            title                 = Encoding.UTF8.GetString (title_bytes);
-            subtext               = Encoding.UTF8.GetString (subtext_bytes);
+            if(fix_utf_encoding)
+            {
+                byte [] title_bytes = Encoding.Default.GetBytes (title);
+                byte [] subtext_bytes = Encoding.Default.GetBytes (subtext);
+                title = Encoding.UTF8.GetString (title_bytes);
+                subtext = Encoding.UTF8.GetString (subtext_bytes);
+            }
 
             ShowBubbleEvent (title, subtext, image_path);
         }
@@ -53,7 +61,7 @@ namespace SparkleShare {
 
         public void BubbleClicked ()
         {
-            Program.Controller.ShowEventLogWindow ();
+            SparkleShare.Controller.ShowEventLogWindow ();
         }
     }
 }

SparkleShare/Common/EventLogController.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
 //
 //   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
@@ -24,11 +24,11 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 
-using SparkleLib;
+using Sparkles;
 
 namespace SparkleShare {
 
-    public class SparkleEventLogController {
+    public class EventLogController {
 
         public event Action ShowWindowEvent = delegate { };
         public event Action HideWindowEvent = delegate { };
@@ -36,16 +36,16 @@ namespace SparkleShare {
 
         public event UpdateContentEventEventHandler UpdateContentEvent = delegate { };
         public delegate void UpdateContentEventEventHandler (string html);
-        
+
         public event UpdateChooserEventHandler UpdateChooserEvent = delegate { };
         public delegate void UpdateChooserEventHandler (string [] folders);
-        
+
         public event UpdateChooserEnablementEventHandler UpdateChooserEnablementEvent = delegate { };
         public delegate void UpdateChooserEnablementEventHandler (bool enabled);
-        
+
         public event UpdateSizeInfoEventHandler UpdateSizeInfoEvent = delegate { };
         public delegate void UpdateSizeInfoEventHandler (string size, string history_size);
-        
+
         public event ShowSaveDialogEventHandler ShowSaveDialogEvent = delegate { };
         public delegate void ShowSaveDialogEventHandler (string file_name, string target_folder_path);
 
@@ -53,7 +53,7 @@ namespace SparkleShare {
         private string selected_folder;
         private RevisionInfo restore_revision_info;
         private bool history_view_active;
-
+        private bool fix_utf_encoding;
 
         public bool WindowIsOpen { get; private set; }
 
@@ -84,7 +84,7 @@ namespace SparkleShare {
 
         public string HTML {
             get {
-                List<SparkleChangeSet> change_sets = GetLog (this.selected_folder);
+                List<ChangeSet> change_sets = GetLog (this.selected_folder);
                 string html = GetHTMLLog (change_sets);
 
                 return html;
@@ -93,7 +93,7 @@ namespace SparkleShare {
 
         public string [] Folders {
             get {
-                return Program.Controller.Folders.ToArray ();
+                return SparkleShare.Controller.Folders.ToArray ();
             }
         }
 
@@ -101,7 +101,7 @@ namespace SparkleShare {
             get {
                 double size = 0;
 
-                foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
+                foreach (BaseRepository repo in SparkleShare.Controller.Repositories) {
                     if (this.selected_folder == null) {
                         size += repo.Size;
 
@@ -124,7 +124,7 @@ namespace SparkleShare {
             get {
                 double size = 0;
 
-                foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
+                foreach (BaseRepository repo in SparkleShare.Controller.Repositories) {
                     if (this.selected_folder == null) {
                         size += repo.HistorySize;
 
@@ -144,9 +144,15 @@ namespace SparkleShare {
         }
 
 
-        public SparkleEventLogController ()
+        public EventLogController () : this (true)
         {
-            Program.Controller.ShowEventLogWindowEvent += delegate {
+        }
+
+        public EventLogController (bool fix_utf_encoding)
+        {
+            this.fix_utf_encoding = fix_utf_encoding;
+
+            SparkleShare.Controller.ShowEventLogWindowEvent += delegate {
                 if (!WindowIsOpen) {
                     ContentLoadingEvent ();
                     UpdateSizeInfoEvent ("…", "…");
@@ -162,7 +168,7 @@ namespace SparkleShare {
 
 							if (!string.IsNullOrEmpty (html))
                             	UpdateContentEvent (html);
-                            
+
 							UpdateSizeInfoEvent (Size, HistorySize);
 
                         }).Start ();
@@ -172,8 +178,8 @@ namespace SparkleShare {
                 WindowIsOpen = true;
                 ShowWindowEvent ();
             };
-			
-            Program.Controller.OnIdle += delegate {
+
+            SparkleShare.Controller.OnIdle += delegate {
                 if (this.history_view_active)
                     return;
 
@@ -189,9 +195,9 @@ namespace SparkleShare {
 
                 UpdateSizeInfoEvent (Size, HistorySize);
             };
-			
-            Program.Controller.FolderListChanged += delegate {
-                if (this.selected_folder != null && !Program.Controller.Folders.Contains (this.selected_folder))
+
+            SparkleShare.Controller.FolderListChanged += delegate {
+                if (this.selected_folder != null && !SparkleShare.Controller.Folders.Contains (this.selected_folder))
                     this.selected_folder = null;
 
                 UpdateChooserEvent (Folders);
@@ -208,20 +214,20 @@ namespace SparkleShare {
         }
 
 
-        public void LinkClicked (string url)
+        public void LinkClicked (string href)
         {
-            if (url.StartsWith ("about:") || string.IsNullOrEmpty (url))
+            if (string.IsNullOrEmpty (href) || href.StartsWith ("about:"))
                 return;
-				
-            url = url.Replace ("%20", " ");
-            
-            if (url.StartsWith ("http")) {
-                Program.Controller.OpenWebsite (url);
-            
-            } else if (url.StartsWith ("restore://") && this.restore_revision_info == null) {
+
+            href = href.Replace ("%20", " ");
+
+            if (href.StartsWith ("http")) {
+                SparkleShare.Controller.OpenWebsite (href);
+
+            } else if (href.StartsWith ("restore://") && this.restore_revision_info == null) {
                 Regex regex = new Regex ("restore://(.+)/([a-f0-9]+)/(.+)/(.{3} [0-9]+ [0-9]+h[0-9]+)/(.+)");
-                Match match = regex.Match (url);
-                
+                Match match = regex.Match (href);
+
                 if (match.Success) {
                     string author_name = match.Groups [3].Value;
                     string timestamp   = match.Groups [4].Value;
@@ -240,35 +246,38 @@ namespace SparkleShare {
 
                     ShowSaveDialogEvent (file_name, target_folder_path);
                 }
-                
-            } else if (url.StartsWith ("back://")) {
+
+            } else if (href.StartsWith ("back://")) {
                 this.history_view_active = false;
                 SelectedFolder           = this.selected_folder; // TODO: Return to the same position on the page
 
                 UpdateChooserEnablementEvent (true);
 
-            } else if (url.StartsWith ("history://")) {
+            } else if (href.StartsWith ("history://")) {
                 this.history_view_active = true;
 
                 ContentLoadingEvent ();
                 UpdateSizeInfoEvent ("…", "…");
                 UpdateChooserEnablementEvent (false);
 
-                string folder    = url.Replace ("history://", "").Split ("/".ToCharArray ()) [0];
-                string file_path = url.Replace ("history://" + folder + "/", "");
+                string folder    = href.Replace ("history://", "").Split ("/".ToCharArray ()) [0];
+                string file_path = href.Replace ("history://" + folder + "/", "");
 
-                byte [] file_path_bytes = Encoding.Default.GetBytes (file_path);
-                file_path               = Encoding.UTF8.GetString (file_path_bytes);
+                if(fix_utf_encoding)
+                {
+                    byte [] file_path_bytes = Encoding.Default.GetBytes (file_path);
+                    file_path = Encoding.UTF8.GetString (file_path_bytes);
+                }
 
                 file_path = Uri.UnescapeDataString (file_path);
 
-                foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
+                foreach (BaseRepository repo in SparkleShare.Controller.Repositories) {
                     if (!repo.Name.Equals (folder))
 						continue;
 
 			        new Thread (() => {
                         SparkleDelay delay = new SparkleDelay ();
-                        List<SparkleChangeSet> change_sets = repo.GetChangeSets (file_path);
+                        List<ChangeSet> change_sets = repo.GetChangeSets (file_path);
                         string html = GetHistoryHTMLLog (change_sets, file_path);
                         delay.Stop ();
 
@@ -281,14 +290,17 @@ namespace SparkleShare {
                 }
 
             } else {
-                Program.Controller.OpenFile (url);
-            }   
+                if (href.StartsWith ("file:///"))
+                    href = href.Substring (7);
+
+                SparkleShare.Controller.OpenFile (href);
+            }
         }
 
 
         public void SaveDialogCompleted (string target_file_path)
         {
-            foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
+            foreach (BaseRepository repo in SparkleShare.Controller.Repositories) {
                 if (repo.Name.Equals (this.restore_revision_info.Folder.Name)) {
                     repo.RestoreFile (this.restore_revision_info.FilePath,
                         this.restore_revision_info.Revision, target_file_path);
@@ -298,7 +310,7 @@ namespace SparkleShare {
             }
 
             this.restore_revision_info = null;
-            Program.Controller.OpenFolder (Path.GetDirectoryName (target_file_path));
+            SparkleShare.Controller.OpenFolder (Path.GetDirectoryName (target_file_path));
         }
 
 
@@ -308,17 +320,17 @@ namespace SparkleShare {
         }
 
 
-        private List<SparkleChangeSet> GetLog ()
+        private List<ChangeSet> GetLog ()
         {
-            List<SparkleChangeSet> list = new List<SparkleChangeSet> ();
+            List<ChangeSet> list = new List<ChangeSet> ();
 
-            foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
-                List<SparkleChangeSet> change_sets = repo.ChangeSets;
+            foreach (BaseRepository repo in SparkleShare.Controller.Repositories) {
+                List<ChangeSet> change_sets = repo.ChangeSets;
 
                 if (change_sets != null)
                     list.AddRange (change_sets);
                 else
-                    SparkleLogger.LogInfo ("Log", "Could not create log for " + repo.Name);
+                    Logger.LogInfo ("Log", "Could not create log for " + repo.Name);
             }
 
             list.Sort ((x, y) => (x.Timestamp.CompareTo (y.Timestamp)));
@@ -331,14 +343,14 @@ namespace SparkleShare {
         }
 
 
-        private List<SparkleChangeSet> GetLog (string name)
+        private List<ChangeSet> GetLog (string name)
         {
             if (name == null)
                 return GetLog ();
 
-            foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
+            foreach (BaseRepository repo in SparkleShare.Controller.Repositories) {
                 if (repo.Name.Equals (name)) {
-                    List<SparkleChangeSet> change_sets = repo.ChangeSets;
+                    List<ChangeSet> change_sets = repo.ChangeSets;
 
                     if (change_sets != null)
                         return change_sets;
@@ -347,11 +359,11 @@ namespace SparkleShare {
                 }
             }
 
-            return new List<SparkleChangeSet> ();
+            return new List<ChangeSet> ();
         }
 
 
-        public string GetHistoryHTMLLog (List<SparkleChangeSet> change_sets, string file_path)
+        public string GetHistoryHTMLLog (List<ChangeSet> change_sets, string file_path)
         {
             string html = "<div class='history-header'>" +
                 "<a class='windows' href='back://'>&laquo; Back</a> &nbsp;|&nbsp; ";
@@ -367,17 +379,17 @@ namespace SparkleShare {
             if (change_sets.Count > 0)
                 change_sets.RemoveAt (0);
 
-            foreach (SparkleChangeSet change_set in change_sets) {
+            foreach (ChangeSet change_set in change_sets) {
                 html += "<tr>" +
                             "<td class='avatar'><img src='" + GetAvatarFilePath (change_set.User) + "'></td>" +
                             "<td class='name'>" + change_set.User.Name + "</td>" +
-                            "<td class='date'>" + 
-                                change_set.Timestamp.ToString ("d MMM yyyy", CultureInfo.InvariantCulture) + 
+                            "<td class='date'>" +
+                                change_set.Timestamp.ToString ("d MMM yyyy", CultureInfo.InvariantCulture) +
                             "</td>" +
                             "<td class='time'>" + change_set.Timestamp.ToString ("HH:mm") + "</td>" +
                             "<td class='restore'>" +
-                                "<a href='restore://" + change_set.Folder.Name + "/" + 
-                                change_set.Revision + "/" + change_set.User.Name + "/" + 
+                                "<a href='restore://" + change_set.Folder.Name + "/" +
+                                change_set.Revision + "/" + change_set.User.Name + "/" +
                                 change_set.Timestamp.ToString ("MMM d H\\hmm", CultureInfo.InvariantCulture) + "/" +
                                 file_path + "'>Restore&hellip;</a>" +
                             "</td>" +
@@ -385,16 +397,16 @@ namespace SparkleShare {
             }
 
             html += "</table></div>";
-            html = Program.Controller.EventLogHTML.Replace ("<!-- $event-log-content -->", html);
+            html = SparkleShare.Controller.EventLogHTML.Replace ("<!-- $event-log-content -->", html);
 
 			return html.Replace ("<!-- $midnight -->", "100000000");
         }
 
 
-        public string GetHTMLLog (List<SparkleChangeSet> change_sets)
+        public string GetHTMLLog (List<ChangeSet> change_sets)
         {
             if (change_sets == null || change_sets.Count == 0)
-                return Program.Controller.EventLogHTML.Replace ("<!-- $event-log-content -->",
+                return SparkleShare.Controller.EventLogHTML.Replace ("<!-- $event-log-content -->",
                     "<div class='day-entry'><div class='day-entry-header'>This project does not keep a history.</div></div>");
 
             List <ActivityDay> activity_days = new List <ActivityDay> ();
@@ -402,9 +414,9 @@ namespace SparkleShare {
             change_sets.Sort ((x, y) => (x.Timestamp.CompareTo (y.Timestamp)));
             change_sets.Reverse ();
 
-            foreach (SparkleChangeSet change_set in change_sets) {
+            foreach (ChangeSet change_set in change_sets) {
                 bool change_set_inserted = false;
-            
+
                 foreach (ActivityDay stored_activity_day in activity_days) {
                     if (stored_activity_day.Date.Year  == change_set.Timestamp.Year &&
                         stored_activity_day.Date.Month == change_set.Timestamp.Month &&
@@ -424,23 +436,23 @@ namespace SparkleShare {
                 }
             }
 
-            string event_log_html   = Program.Controller.EventLogHTML;
-            string day_entry_html   = Program.Controller.DayEntryHTML;
-            string event_entry_html = Program.Controller.EventEntryHTML;
+            string event_log_html   = SparkleShare.Controller.EventLogHTML;
+            string day_entry_html   = SparkleShare.Controller.DayEntryHTML;
+            string event_entry_html = SparkleShare.Controller.EventEntryHTML;
             string event_log        = "";
 
             foreach (ActivityDay activity_day in activity_days) {
                 string event_entries = "";
 
-                foreach (SparkleChangeSet change_set in activity_day) {
+                foreach (ChangeSet change_set in activity_day) {
                     string event_entry = "<dl>";
 
-                    foreach (SparkleChange change in change_set.Changes) {
-                        if (change.Type != SparkleChangeType.Moved) {
+                    foreach (Change change in change_set.Changes) {
+                        if (change.Type != ChangeType.Moved) {
                             event_entry += "<dd class='" + change.Type.ToString ().ToLower () + "'>";
 
                             if (!change.IsFolder) {
-                                event_entry += "<small><a href=\"history://" + change_set.Folder.Name + "/" + 
+                                event_entry += "<small><a href=\"history://" + change_set.Folder.Name + "/" +
                                     change.Path + "\" title=\"View revisions\">" + change.Timestamp.ToString ("HH:mm") +
                                     " &#x25BE;</a></small> &nbsp;";
 
@@ -533,10 +545,13 @@ namespace SparkleShare {
 
         private string FormatBreadCrumbs (string path_root, string path)
         {
-            byte [] path_root_bytes = Encoding.Default.GetBytes (path_root);
-            byte [] path_bytes      = Encoding.Default.GetBytes (path);
-            path_root               = Encoding.UTF8.GetString (path_root_bytes);
-            path                    = Encoding.UTF8.GetString (path_bytes);
+            if(fix_utf_encoding)
+            {
+                byte [] path_root_bytes = Encoding.Default.GetBytes (path_root);
+                byte [] path_bytes = Encoding.Default.GetBytes (path);
+                path_root = Encoding.UTF8.GetString (path_root_bytes);
+                path = Encoding.UTF8.GetString (path_bytes);
+            }
 
             path_root                = path_root.Replace ("/", Path.DirectorySeparatorChar.ToString ());
             path                     = path.Replace ("/", Path.DirectorySeparatorChar.ToString ());
@@ -579,7 +594,7 @@ namespace SparkleShare {
         private string SafeCombine (string path1, string path2)
         {
             string result = path1;
-            
+
             if (!result.EndsWith (Path.DirectorySeparatorChar.ToString ()))
                 result += Path.DirectorySeparatorChar;
 
@@ -590,13 +605,13 @@ namespace SparkleShare {
         }
 
 
-        private string GetAvatarFilePath (SparkleUser user)
+        private string GetAvatarFilePath (User user)
         {
-            if (!Program.Controller.AvatarsEnabled)
+            if (!SparkleShare.Controller.AvatarsEnabled)
                 return "<!-- $pixmaps-path -->/user-icon-default.png";
-              
-            string fetched_avatar = SparkleAvatars.GetAvatar (user.Email, 48, Program.Controller.Config.FullPath);
-                
+
+            string fetched_avatar = Avatars.GetAvatar (user.Email, 48, SparkleShare.Controller.Config.DirectoryPath, SparkleShare.Controller.AvatarsProvider);
+
             if (!string.IsNullOrEmpty (fetched_avatar))
                 return "file://" + fetched_avatar.Replace ("\\", "/");
             else
@@ -605,7 +620,7 @@ namespace SparkleShare {
 
 
         // All change sets that happened on a day
-        private class ActivityDay : List<SparkleChangeSet>
+        private class ActivityDay : List<ChangeSet>
         {
             public DateTime Date;
 

SparkleShare/Common/HTML/Makefile.am

@@ -1,10 +0,0 @@
-dist_html_DATA = \
-	day-entry.html \
-	event-entry.html \
-	event-log.html \
-	jquery.js
-
-htmldir = $(pkgdatadir)/html/
-
-MAINTAINERCLEANFILES = \
-	Makefile.in

SparkleShare/Common/HTML/event-log.html

@@ -55,7 +55,7 @@
                 background-color: #fefefe;
                 color: <!-- $body-color -->;
                 font-size: <!-- $body-font-size -->;
-                font-family: "<!-- $body-font-family -->";
+                font-family: -apple-system, "<!-- $body-font-family -->";
                 margin: 0;
                 -webkit-user-select: none;
                 overflow-x: hidden;

SparkleShare/Common/HTML/meson.build

@@ -0,0 +1,10 @@
+html_files = ['event-log.html',
+    'day-entry.html',
+    'event-entry.html',
+    'jquery.js'
+]
+
+install_data(
+    sources: html_files,
+    install_dir: join_paths(install_dir, 'html'))
+

SparkleShare/Common/Images/Sources/about-dialog.svg

@@ -2114,7 +2114,7 @@
        id="g101011"
        transform="translate(-65.909,-78.641)"
        clip-path="url(#clipPath4254)"
-       inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Pixmaps/about@2x.png"
+       inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Images/about@2x.png"
        inkscape:export-xdpi="180"
        inkscape:export-ydpi="180">
       <rect

SparkleShare/Common/Images/Sources/gitlab.svg

@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg9662"
+   height="24"
+   width="24"
+   version="1.1"
+   inkscape:version="0.91+devel r14094"
+   sodipodi:docname="gitlab.svg"
+   viewBox="0 0 24 24"
+   inkscape:export-filename="/Users/hbons/Personal/Projects/SparkleShare/SparkleShare/Common/Presets/gitlab@2x.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="755"
+     id="namedview4365"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:zoom="11.313708"
+     inkscape:cx="8.5858812"
+     inkscape:cy="8.8928334"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g4326"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4341" />
+  </sodipodi:namedview>
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient4343"
+       inkscape:collect="always">
+      <stop
+         id="stop4345"
+         offset="0"
+         style="stop-color:#df2000;stop-opacity:1" />
+      <stop
+         id="stop4347"
+         offset="1"
+         style="stop-color:#881805;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4318">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4320" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4322" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4304">
+      <stop
+         style="stop-color:#ce2509;stop-opacity:1"
+         offset="0"
+         id="stop4306" />
+      <stop
+         style="stop-color:#a9210a;stop-opacity:1"
+         offset="1"
+         id="stop4308" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4304"
+       id="linearGradient4310"
+       x1="28.415369"
+       y1="9.2727699"
+       x2="31.521933"
+       y2="19.203804"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4343"
+       id="linearGradient4339"
+       gradientUnits="userSpaceOnUse"
+       x1="26.80905"
+       y1="3.7043378"
+       x2="31.521933"
+       y2="19.203804"
+       gradientTransform="translate(0,0.98994346)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4318"
+       id="radialGradient4349"
+       cx="27.992599"
+       cy="13.000279"
+       fx="27.992599"
+       fy="13.000279"
+       r="10.832553"
+       gradientTransform="matrix(2.7510713,0,0,2.3899162,-49.67941,-17.015106)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g4326"
+     transform="matrix(1.01163,0,0,1.0101587,-20.452835,-1.7447338)"
+     style="stroke-width:0.9892233">
+    <path
+       style="fill:#e24329;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9892233;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 28.012539,10.206244 8.200627,0 L 38.959248,2.1937049 43.510972,14.607498 32.075235,22.996213 20.639498,14.56988 24.965517,2.0432347 Z"
+       id="path4268"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="matrix(-1,0,0,1,64.092707,0.98994346)"
+       id="g4278"
+       style="stroke-width:0.9892233">
+      <g
+         id="g4284"
+         style="stroke-width:0.9892233">
+        <path
+           style="fill:#fc6d26;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9892233px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 28.012539,9.2163007 -5.818181,0 -1.55486,4.3636363 11.435737,8.426333 z"
+           id="path4280"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#fca326;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9892233px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 22.694403,9.207369 32.028121,21.951963 20.639498,13.579937 Z"
+           id="path4282"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+    <g
+       id="g4288"
+       transform="translate(0.01747244,0.98994346)"
+       style="stroke-width:0.9892233">
+      <g
+         id="g4290"
+         style="stroke-width:0.9892233">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path4292"
+           d="m 28.012539,9.2163007 -5.818181,0 -1.55486,4.3636363 11.435737,8.426333 z"
+           style="fill:#fc6d26;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9892233px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0"
+           id="path4294"
+           d="M 22.694403,9.207369 32.028121,21.951963 20.639498,13.579937 Z"
+           style="fill:#fca326;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9892233px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path4266"
+       d="m 28.012539,10.206244 8.200627,0 L 38.959248,2.1937049 43.510972,14.607498 32.075235,22.996213 20.639498,14.56988 24.965517,2.0432347 Z"
+       style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4339);stroke-width:0.9892233;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 25.001953,4.0175781 21.826172,13.210938 32.078125,20.761719 42.3125,13.253906 38.990234,4.1992188 37.160156,9.5410156 A 1.0021178,1.0021178 0 0 1 36.212891,10.21875 l -8.201172,0 A 1.0021178,1.0021178 0 0 1 27.072266,9.5664062 L 25.001953,4.0175781 Z"
+       id="path4312"
+       style="opacity:0.4;fill:none;fill-rule:evenodd;stroke:url(#radialGradient4349);stroke-width:0.9892233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:original="M 24.964844 1.0527344 L 20.638672 13.580078 L 32.076172 22.005859 L 43.511719 13.617188 L 38.958984 1.203125 L 36.212891 9.2167969 L 28.011719 9.2167969 L 24.964844 1.0527344 z "
+       inkscape:radius="-1.0020176"
+       sodipodi:type="inkscape:offset"
+       transform="translate(0,0.98994346)" />
+  </g>
+</svg>

SparkleShare/Common/Images/Sources/side-splash.svg

@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.48.2 r9819"
    sodipodi:docname="side-splash.svg"
-   inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Pixmaps/side-splash.png"
+   inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Images/side-splash.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <sodipodi:namedview

SparkleShare/Common/Images/Sources/tutorial-slides.svg

@@ -3064,7 +3064,7 @@
          style="fill:url(#radialGradient211652);fill-opacity:1;stroke:#261f1f;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          inkscape:export-xdpi="180"
          inkscape:export-ydpi="180"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Pixmaps/tutorial-slide-1@2x.png" />
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Images/tutorial-slide-1@2x.png" />
       <g
          transform="matrix(0.85916724,0,0,0.85916724,-926.30984,-650.2188)"
          id="g52133-7"

SparkleShare/Common/Images/meson.build

@@ -0,0 +1,11 @@
+image_files = ['tutorial-slide-1.png',
+    'tutorial-slide-2.png',
+    'side-splash.png',
+    'about.png',
+    'text-balloon.png',
+    'user-icon-default.png']
+
+install_data(
+    sources: image_files,
+    install_dir: join_paths(install_dir, 'pixmaps'))
+

SparkleShare/Common/Makefile.am

@@ -1,3 +0,0 @@
-SUBDIRS = HTML \
-	Plugins \
-	Pixmaps

SparkleShare/Common/NoteController.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
 //
 //   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
@@ -16,12 +16,13 @@
 
 
 using System;
-using System.Net;
 using System.Threading;
 
+using Sparkles;
+
 namespace SparkleShare {
 
-    public class SparkleNoteController {
+    public class NoteController {
 
         public event Action ShowWindowEvent = delegate { };
         public event Action HideWindowEvent = delegate { };
@@ -29,20 +30,16 @@ namespace SparkleShare {
         public event UpdateTitleEventDelegate UpdateTitleEvent = delegate { };
         public delegate void UpdateTitleEventDelegate (string title);
 
-        public string AvatarFilePath = "";
+        public readonly string AvatarFilePath = "";
         public string CurrentProject { get; private set; }
 
 
-        public SparkleNoteController ()
+        public NoteController ()
         {
-            Program.Controller.ShowNoteWindowEvent += delegate (string project) {
-                CurrentProject = project;
-                ShowWindowEvent ();
-                UpdateTitleEvent (CurrentProject);
-            };
+            SparkleShare.Controller.ShowNoteWindowEvent += OnNoteWindowEvent;
 
-            AvatarFilePath = SparkleAvatars.GetAvatar (Program.Controller.CurrentUser.Email,
-                48, Program.Controller.Config.FullPath);
+            if (SparkleShare.Controller.AvatarsEnabled && !SparkleShare.Controller.FirstRun)
+                AvatarFilePath = Avatars.GetAvatar (SparkleShare.Controller.CurrentUser.Email, 48, SparkleShare.Controller.Config.DirectoryPath, SparkleShare.Controller.AvatarsProvider);
         }
 
 
@@ -55,7 +52,7 @@ namespace SparkleShare {
         public void SyncClicked (string note)
         {
             HideWindowEvent ();
-            new Thread (() => Program.Controller.GetRepoByName (CurrentProject).Resume (note)).Start ();
+            new Thread (() => ResumeWithNote (note)).Start ();
         }
 
 
@@ -63,5 +60,21 @@ namespace SparkleShare {
         {
             HideWindowEvent ();
         }
+
+
+        void OnNoteWindowEvent (string project)
+        {
+            CurrentProject = project;
+
+            ShowWindowEvent ();
+            UpdateTitleEvent (CurrentProject);
+        }
+
+
+        void ResumeWithNote (string note)
+        {
+            BaseRepository repo = SparkleShare.Controller.GetRepoByName (CurrentProject);
+            repo.Resume (note);
+        }
     }
 }

SparkleShare/Common/Pixmaps/Makefile.am

@@ -1,12 +0,0 @@
-dist_pixmaps_DATA = \
-    side-splash.png \
-    user-icon-default.png \
-    text-balloon.png \
-    tutorial-slide-1.png\
-    tutorial-slide-2.png \
-    about.png
-
-pixmapsdir = $(pkgdatadir)/pixmaps/
-
-MAINTAINERCLEANFILES = \
-	Makefile.in

SparkleShare/Common/Pixmaps/Sources/gitorious.svg

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg9662" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs id="defs3">
-  <filter id="filter10824" height="1.2825" width="1.209" color-interpolation-filters="sRGB" y="-.14123" x="-.10449">
-   <feGaussianBlur id="feGaussianBlur10826" stdDeviation="0.95917508"/>
-  </filter>
-  <linearGradient id="linearGradient4333" y2="34.607" gradientUnits="userSpaceOnUse" x2="-545.52" gradientTransform="translate(569,1013)" y1="28.408" x1="-557.06">
-   <stop id="stop10743" stop-color="#f46e6e" offset="0"/>
-   <stop id="stop10749" stop-color="#f7d478" offset=".5"/>
-   <stop id="stop10745" stop-color="#f46e6e" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient4335" y2="36.362" gradientUnits="userSpaceOnUse" x2="-551" gradientTransform="translate(569,1013)" y1="27.362" x1="-551">
-   <stop id="stop10755" stop-color="#e50000" offset="0"/>
-   <stop id="stop10757" stop-color="#ab0000" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient4337" y2="28.079" gradientUnits="userSpaceOnUse" x2="-557.01" gradientTransform="translate(569,1013)" y1="34.767" x1="-568.52">
-   <stop id="stop10729" stop-color="#73d216" offset="0"/>
-   <stop id="stop10735" stop-color="#efff20" offset=".5"/>
-   <stop id="stop10731" stop-color="#89d216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient4339" y2="35.858" gradientUnits="userSpaceOnUse" x2="-563.29" gradientTransform="translate(569,1013)" y1="25.486" x1="-563.29">
-   <stop id="stop10719" stop-color="#4e9a06" offset="0"/>
-   <stop id="stop10721" stop-color="#346704" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient4341" y2="40.663" gradientUnits="userSpaceOnUse" x2="-549.62" gradientTransform="translate(569,1013)" y1="15.384" x1="-562.87">
-   <stop id="stop10836" stop-color="#fff" offset="0"/>
-   <stop id="stop10838" stop-color="#fff" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <metadata id="metadata4">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g id="layer1" transform="translate(0 -1028.4)">
-  <rect id="rect10657" fill-opacity="0" height="24" width="24" y="1029.4" x=".088379"/>
-  <path id="path10769" d="m-555.82 22.937-11.801 3.1974v9.6581l11.801 3.4441 10.23-3.1316v-9.9706z" transform="matrix(1.0124 0 0 1 575.75 1011.2)" filter="url(#filter10824)" fill="#2e3436"/>
-  <path id="path10705" stroke-linejoin="round" d="m23.514 1034.8-10.55-3.9367-1.4805 0.054 0.007 19.914 1.509 0.017 10.514-3.1427z" stroke="url(#linearGradient4335)" fill="url(#linearGradient4333)"/>
-  <path id="path10691" stroke-linejoin="round" d="m0.55806 1034.8 10.471-3.9459h1.4422l0.0365 19.989-1.4631-0.031-10.487-3.1115z" stroke="url(#linearGradient4339)" fill="url(#linearGradient4337)"/>
-  <path id="path10693" d="m2 1036.4 9.0165-3.0054-0.0442 15.034l-8.972-2z" fill="#fff"/>
-  <path id="rect10668" d="m5 1037 2-0.3728v8.6465l-1.9844-0.3518z" fill="#539710"/>
-  <path id="rect10672" d="m3 1040.1 6.5938-0.9381v3.3314l-6.5938-0.9z" fill="#539710"/>
-  <path id="path10737" d="m22.016 1036.4-9.016-3l0.0442 15.034 8.9723-2.0281z" fill="#fff"/>
-  <rect id="rect10798" rx="0" ry="0" height="2" width="2" y="1030.4" x="11" fill="#85680e"/>
-  <rect id="rect10800" rx="0" ry="0" height="2" width="2" y="1049.4" x="11" fill="#85680e"/>
-  <rect id="rect10767" rx="0" ry="0" height="19" width="2" y="1031.4" x="11" fill="#eabe35"/>
-  <rect id="rect10842" rx="0" ry="0" height="1" width="2" y="1031.4" x="11" fill="#a78312"/>
-  <path id="path10810" opacity=".75" d="m12.816 1031.9-1.6843 0.01-9.6106 3.6209-0.0183 11.457 9.5022 2.8463 1.9639 0.031 9.5057-2.8861 0.0335-11.455z" stroke="url(#linearGradient4341)" stroke-width="1px" fill="none"/>
-  <path id="path10830" d="m21.062 1040.1-6.5938-0.9381v3.3314l6.5938-0.8463z" fill="#dc0000"/>
-  <g id="layer9" stroke-linejoin="round" transform="translate(-1687.8 -118.06)" stroke="#000" stroke-linecap="round" display="none" fill="#fff">
-   <path id="path11071" opacity=".5" style="enable-background:new" d="m729.88 60.625a14.688 5.9375 0 1 1 -29.375 0 14.688 5.9375 0 1 1 29.375 0z" transform="matrix(1.2596 0 0 1.0947 -22.831 -6.3684)" display="inline" stroke-width=".85160"/>
-   <path id="path11073" opacity=".5" style="enable-background:new" d="m729.88 60.625a14.688 5.9375 0 1 1 -29.375 0 14.688 5.9375 0 1 1 29.375 0z" transform="matrix(1.2596 0 0 1.0947 -22.831 -3.3684)" display="inline" stroke-width=".85160"/>
-   <path id="path11075" opacity=".5" style="enable-background:new" d="m729.88 60.625a14.688 5.9375 0 1 1 -29.375 0 14.688 5.9375 0 1 1 29.375 0z" transform="matrix(1.0553 0 0 .90859 173.25 35.022)" display="inline" stroke-width="1.0212"/>
-   <path id="path11084" opacity=".5" style="enable-background:new" d="m729.88 60.625a14.688 5.9375 0 1 1 -29.375 0 14.688 5.9375 0 1 1 29.375 0z" transform="matrix(1.0553 0 0 .97833 123.25 30.38)" display="inline" stroke-width=".98416"/>
-   <path id="path11086" opacity=".5" style="enable-background:new" d="m729.88 60.625a14.688 5.9375 0 1 1 -29.375 0 14.688 5.9375 0 1 1 29.375 0z" transform="matrix(1.0894 0 0 .97833 98.901 27.38)" display="inline" stroke-width=".96866"/>
-  </g>
- </g>
-</svg>

SparkleShare/Common/Pixmaps/Sources/ssnet.svg

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg8763" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24.009" width="24.013" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs id="defs8765">
-  <filter id="filter3330" height="1" width="1" color-interpolation-filters="sRGB" y="0" x="0">
-   <feColorMatrix id="feColorMatrix3332" values="0" type="saturate"/>
-  </filter>
-  <filter id="filter4375-3-0" color-interpolation-filters="sRGB" width="1.0248" y="-.35609" x="-.012418" height="1.7122">
-   <feGaussianBlur id="feGaussianBlur4377-0-0" stdDeviation="1.0664062"/>
-  </filter>
-  <linearGradient id="linearGradient11481">
-   <stop id="stop11483" stop-color="#a04600" offset="0"/>
-   <stop id="stop11485" stop-color="#ce5c00" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient21508" y2="18.848" gradientUnits="userSpaceOnUse" x2="24.866" gradientTransform="matrix(.30890 0 0 .27375 301.94 218.48)" y1="30.385" x1="24.866">
-   <stop id="stop4910-6" stop-color="#ce5c00" offset="0"/>
-   <stop id="stop4912-9" stop-color="#f57900" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient21510" y2="221.38" xlink:href="#linearGradient11481" gradientUnits="userSpaceOnUse" x2="315.29" gradientTransform="translate(0,1)" y1="232.34" x1="315.05"/>
-  <radialGradient id="radialGradient21512" gradientUnits="userSpaceOnUse" cy="179.01" cx="306.1" gradientTransform="matrix(2.5489 0 0 .51730 -476.41 129.05)" r="8.6094">
-   <stop id="stop4615" stop-color="#fff" offset="0"/>
-   <stop id="stop4617" stop-color="#fff" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="linearGradient21514" y2="-9.4962" gradientUnits="userSpaceOnUse" x2="25.188" gradientTransform="matrix(.28968 0 0 .17690 301.87 224.04)" y1="50.897" x1="25.188">
-   <stop id="stop4991-0" stop-color="#f57900" offset="0"/>
-   <stop id="stop4993-4" stop-color="#fcaf3e" offset=".060437"/>
-   <stop id="stop4995-6" stop-color="#fcaf3e" offset=".17754"/>
-   <stop id="stop4997-0" stop-color="#f57900" offset=".89422"/>
-   <stop id="stop4999-3" stop-color="#ce5c00" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient21516" y2="223.68" xlink:href="#linearGradient11481" gradientUnits="userSpaceOnUse" x2="314.47" y1="233.24" x1="314.49"/>
-  <linearGradient id="linearGradient21518" y2="208.75" gradientUnits="userSpaceOnUse" x2="320.56" y1="184.62" x1="312.44">
-   <stop id="stop4631" stop-color="#fff" offset="0"/>
-   <stop id="stop4633" stop-color="#fff" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="radialGradient21520" gradientUnits="userSpaceOnUse" cy="525.86" cx="147.02" gradientTransform="matrix(1.5869 1.2599e-7 -5.9773e-8 .75290 -86.287 85.9)" r="103.05">
-   <stop id="stop4349-3-4" stop-color="#fff" offset="0"/>
-   <stop id="stop16502" stop-color="#fff" stop-opacity=".49804" offset=".5"/>
-   <stop id="stop4351-6-4" stop-color="#fff" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="linearGradient21532" y2="263.79" gradientUnits="userSpaceOnUse" x2="117.64" y1="220.79" x1="117.64">
-   <stop id="stop21528" stop-color="#fff" offset="0"/>
-   <stop id="stop21530" stop-color="#fff" stop-opacity="0.36" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient21612" y2="251.79" gradientUnits="userSpaceOnUse" x2="94.143" gradientTransform="translate(-333.93 -139.65)" y1="251.79" x1="70.143">
-   <stop id="stop21608" stop-color="#5dbbc6" offset="0"/>
-   <stop id="stop21610" stop-color="#96dadb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="linearGradient21638" y2="112.14" gradientUnits="userSpaceOnUse" x2="-249.54" y1="112.14" x1="-263.79">
-   <stop id="stop21634" stop-color="#3e3e3e" offset="0"/>
-   <stop id="stop21636" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <metadata id="metadata8768">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g id="layer1" transform="translate(-474.29 -337.78)">
-  <g id="g8506" transform="translate(374.14 98)">
-   <rect id="rect3589" height="24" width="120" display="none" y="241.6" x="97.775" fill="#eeeeec"/>
-   <rect id="rect4698" height="48" width="48" display="none" y="25.598" x="87.775" fill="#eeeeec"/>
-   <rect id="rect4700" height="32" width="32" display="none" y="101.6" x="94.775" fill="#eeeeec"/>
-   <rect id="rect4702" height="22" width="22" display="none" y="152.6" x="94.775" fill="#eeeeec"/>
-   <rect id="rect4704" height="16" width="16" display="none" y="194.6" x="94.775" fill="#eeeeec"/>
-   <rect id="rect4706" height="24" width="24" display="none" y="151.6" x="93.775" fill="#eeeeec"/>
-   <rect id="rect4708" height="256" width="256" display="none" y="3.5985" x="-188.22" fill="#eeeeec"/>
-   <text id="text4710" style="enable-background:new" xml:space="preserve" font-size="18.301px" display="none" y="-2.8879292" x="-187.25412" font-family="Bitstream Vera Sans" fill="#000000"><tspan id="tspan4712" x="-187.25412" y="-2.8879292">places</tspan></text>
-   <text id="text4714" style="enable-background:new" line-height="125%" font-weight="bold" xml:space="preserve" font-size="18.301px" y="-2.8879292" x="-66.254158" font-family="Droid Sans" display="none" fill="#000000"><tspan id="tspan4716" x="-66.254158" y="-2.8879292">sparkleshare</tspan></text>
-   <rect id="rect22378" height="22" width="22" display="none" y="152.6" x="124.78" fill="#ededed"/>
-   <rect id="rect22380" height="24" width="24" display="none" y="151.6" x="123.78" fill="#ededed"/>
-   <rect id="rect12657-5" style="color:#000000;enable-background:new" rx="0" ry="0" height="0" width="2" y="165.6" x="467.78" fill="#888a85"/>
-   <use id="use3340" style="enable-background:new" xlink:href="#g3326" transform="translate(-203.22 225.6)" height="400" width="500" y="0" x="0"/>
-   <rect id="rect20728" transform="rotate(-90)" rx="3.7196" ry="3.7196" height="22.998" width="22.998" stroke="#6196c5" stroke-linecap="round" y="100.64" x="-263.29" stroke-width="1.002" fill="url(#linearGradient21612)"/>
-   <path id="path21534" opacity="0.333" d="m248.42 154.51h-6.8943s-2.6516 0.57452-3.0494-3.0494v-11.093s0.35356-1.5468 1.9446-1.9445h5.1265c1.5468 0.48614 2.0771 2.0771 2.0771 2.0771h6.8501s0.75131 0.30935 1.1049 1.1048v9.8276c-0.0442 2.1655-2.0992 3.0992-2.0992 3.0992z" transform="translate(-134.86 105.79)" stroke="#fff" stroke-width="1px" fill="none"/>
-   <g id="g21596" opacity=".5">
-    <path id="rect21555" opacity=".25" d="m103.14 239.79h7l2 12z"/>
-    <path id="path21558" opacity=".25" d="m121.14 263.79h-7l-2-12z"/>
-    <path id="path21560" opacity=".25" d="m121.14 239.79h-7l-2 12z"/>
-    <path id="path21562" opacity=".25" d="m103.14 263.79h7l2-12z"/>
-    <path id="path21570" opacity=".25" d="m124.14 242.79 0.00001 7-12 2z"/>
-    <path id="path21572" opacity=".25" d="m100.14 260.79-0.00001-7 12-2z"/>
-    <path id="path21574" opacity=".25" d="m124.14 260.79v-7l-12-2z"/>
-    <path id="path21576" opacity=".25" d="m100.14 242.79 0.00001 7 12 2z"/>
-   </g>
-   <g id="g21498" transform="translate(9.3677 49.194)">
-    <g id="g10370" style="enable-background:new" transform="translate(-208.22 -24.402)">
-     <path id="path10372" style="enable-background:new" d="m304.53 220.5c-0.57203 0.064-1.0035 0.54941-1 1.125v10.344c0.00006 0.62129 0.50371 1.1249 1.125 1.125h12.719c0.62129-0.00006 1.1249-0.50371 1.125-1.125v-8.3125c-0.00006-0.62129-0.50371-1.1249-1.125-1.125h-5.8438c-0.3334 0-0.20853 0.0527-0.40625-0.21875l-0.96875-1.3438c-0.2098-0.29211-0.54661-0.46632-0.90625-0.46875h-4.5938c-0.0416-0.002-0.0834-0.002-0.125 0z" fill-rule="evenodd" stroke="url(#linearGradient21510)" fill="url(#linearGradient21508)"/>
-     <path id="path10374" opacity=".4" style="enable-background:new" d="m304.62 221.44c-0.10325 0.0115-0.15688 0.0836-0.15625 0.1875v10.344c0.00001 0.11468 0.0728 0.18749 0.1875 0.1875h12.719c0.11468-0.00001 0.18749-0.0728 0.1875-0.1875v-8.3125c-0.00001-0.11468-0.0728-0.18749-0.1875-0.1875h-5.8438c-0.0587 0-0.0805-0.001-0.15625 0-0.0757 0.001-0.29559 0.0325-0.5625-0.125-0.26691-0.15754-0.34468-0.32772-0.375-0.375-0.0303-0.0473-0.0322-0.0522-0.0625-0.0937l-0.96875-1.3438c-0.0355-0.0494-0.0954-0.0933-0.15625-0.0937h-4.5938c-0.0104 0.00017-0.0208 0.00017-0.0313 0l0.00005-0.0001z" stroke="url(#radialGradient21512)" fill="none"/>
-     <path id="path10377" stroke-linejoin="round" style="enable-background:new" d="m309.78 222.5c-0.2554 0-0.45965 0.13987-0.59375 0.34375-0.43264 0.54853-1.1235 1.6562-1.6562 1.6562h-2.6875c-0.83807 0-1.3437 0.5428-1.3438 1.4688v6.125c0 1.3376 0.65057 2.4062 1.4688 2.4062h12.062c0.81819 0 1.4688-1.0687 1.4688-2.4062v-8.9062c0-0.37505-0.29595-0.6875-0.65625-0.6875h-8.0625z" fill-rule="evenodd" stroke="url(#linearGradient21516)" fill="url(#linearGradient21514)"/>
-     <path id="path10379" opacity=".40639" stroke-linejoin="round" style="enable-background:new" d="m310.94 183.5c-0.74659 0.74659-1.6086 2-2.4062 2h-2.6875c-0.20314 0-0.22418 0.0344-0.25 0.0625-0.0258 0.0281-0.0937 0.12531-0.0937 0.40625v7.5312h13v-10h-7.5625-0.00005z" transform="translate(-1,40)" stroke="url(#linearGradient21518)" fill="none"/>
-     <path id="path10381" opacity=".71595" style="enable-background:new" d="m250.06 476.75c-0.0458 1.3355-0.49131 2.357-1.2188 3.0625-0.72744 0.70545-1.7687 1.125-3.1875 1.125h-197.25c-1.4189 0-2.4805-0.44927-3.2188-1.1562-0.73826-0.70698-1.1869-1.7049-1.2188-3.0312v3c0.03187 1.3263 0.48049 2.3243 1.2188 3.0312 0.73826 0.70698 1.7998 1.1562 3.2188 1.1562h197.25c1.4188 0 2.4601-0.41955 3.1875-1.125 0.72744-0.70545 1.1729-1.727 1.2188-3.0625v-3z" fill-rule="evenodd" transform="matrix(.065331 0 0 .29412 301.15 90.449)" filter="url(#filter4375-3-0)" fill="url(#radialGradient21520)"/>
-    </g>
-    <path id="path5717-2" stroke-linejoin="round" style="enable-background:new" d="m103.15 201.61c-0.1681 0.0217-0.3164 0.15386-0.3579 0.31842l-0.7155 2.1494c-0.019 0.0382-0.032 0.0777-0.039 0.11973-0.038-0.0191-0.078-0.0318-0.1196-0.0395h-2.1866c-0.1222 0-0.2415 0.0637-0.3181 0.15921-0.1612 0.18061-0.1208 0.50107 0.079 0.63685l1.7891 1.3136 0.038 0.19106-0.6757 2.1095c-0.094 0.32925 0.3466 0.66015 0.6361 0.47763l1.7889-1.3134h0.229l1.7891 1.3134c0.1556 0.1019 0.3785 0.0841 0.5167-0.0395 0.1171-0.10827 0.1659-0.28518 0.1196-0.4379l-0.6759-2.1095c-0.064-0.0127 0.025-0.12737 0.038-0.19105l1.7889-1.3136c0.2004-0.13577 0.2401-0.45623 0.079-0.63684-0.076-0.0955-0.1958-0.15526-0.318-0.15921h-2.2264c-0.042 0.0127-0.081 0.0204-0.1196 0.0395-0.013-0.042-0.02-0.0815-0.039-0.11973l-0.6759-2.1493c-0.02-0.0752-0.062-0.14546-0.1196-0.19908-0.084-0.0815-0.2016-0.1261-0.318-0.11973l0.014 0.00013-0.0006 0.00001z" stroke="#c66f11" stroke-linecap="round" fill="none"/>
-    <path id="path5717" stroke-linejoin="round" style="enable-background:new" d="m103.15 200.61c-0.1681 0.0217-0.3164 0.15386-0.3579 0.31842l-0.7155 2.1494c-0.019 0.0382-0.032 0.0777-0.039 0.11973-0.038-0.0191-0.078-0.0318-0.1196-0.0395h-2.1866c-0.1222 0-0.2415 0.0637-0.3181 0.15921-0.1612 0.18061-0.1208 0.50107 0.079 0.63685l1.7891 1.3136 0.038 0.19106-0.6757 2.1095c-0.094 0.32925 0.3466 0.66015 0.6361 0.47763l1.7889-1.3134h0.229l1.7891 1.3134c0.1556 0.1019 0.3785 0.0841 0.5167-0.0395 0.1171-0.10827 0.1659-0.28518 0.1196-0.4379l-0.6759-2.1095c-0.064-0.0127 0.025-0.12737 0.038-0.19105l1.7889-1.3136c0.2004-0.13577 0.2401-0.45623 0.079-0.63684-0.076-0.0955-0.1958-0.15526-0.318-0.15921h-2.2264c-0.042 0.0127-0.081 0.0204-0.1196 0.0395-0.013-0.042-0.02-0.0815-0.039-0.11973l-0.6759-2.1493c-0.02-0.0752-0.062-0.14546-0.1196-0.19908-0.084-0.0815-0.2016-0.1261-0.318-0.11973l0.014 0.00013-0.0006 0.00001z" stroke="#fff" stroke-linecap="round" fill="none"/>
-   </g>
-   <rect id="rect21524" opacity=".83759" rx="2.8127" ry="2.8127" height="20.998" width="20.998" stroke="url(#linearGradient21532)" stroke-linecap="round" y="241.29" x="101.64" stroke-width="1.002" fill="none"/>
-   <rect id="rect21630" opacity="0.33" ry="3.9071" rx="3.9071" transform="rotate(-90)" height="22.998" width="22.998" stroke="url(#linearGradient21638)" stroke-linecap="round" y="100.64" x="-263.29" stroke-width="1.002" fill="none"/>
-  </g>
- </g>
-</svg>

SparkleShare/Common/Plugins/Makefile.am

@@ -1,18 +0,0 @@
-dist_plugins_DATA = \
-    bitbucket.xml \
-    github.xml \
-    gitorious.xml \
-    ssnet.xml \
-    own-server.xml \
-    planio.xml \
-    github.png \
-    gitorious.png \
-    bitbucket.png \
-    ssnet.png \
-    planio.png \
-    own-server.png
-
-pluginsdir = $(pkgdatadir)/plugins/
-
-MAINTAINERCLEANFILES = \
-	Makefile.in

SparkleShare/Common/Plugins/gitorious.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sparkleshare>
-  <plugin>
-    <info>
-        <name>Gitorious</name>
-        <description>Open source infrastructure for hosting open source projects</description>
-        <icon>gitorious.png</icon>
-        <backend>Git</backend>
-        <fingerprint>7e:af:8d:ec:f0:39:5e:ba:52:16:ce:19:fa:d4:b8:7d</fingerprint>
-    </info>
-    <address>
-      <value>ssh://git@gitorious.org/</value>
-      <example/>
-    </address>
-    <path>
-      <value/>
-      <example>/project/repository</example>
-    </path>
-  </plugin>
-</sparkleshare>

SparkleShare/Common/Plugins/planio.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sparkleshare>
-  <plugin>
-    <info>
-        <name>Planio</name>
-        <description>500MB of unlimited free hosted Git repos and project management</description>
-        <icon>planio.png</icon>
-        <backend>Git</backend>
-        <fingerprint>77:d1:54:d7:33:7e:38:43:40:70:ca:2d:3a:24:05:22</fingerprint>
-        <announcements_url>tcp://sparkleshare-notifications.plan.io:443</announcements_url>
-    </info>
-    <address>
-      <value/>
-      <example>ssh://git@[account].plan.io</example>
-    </address>
-    <path>
-      <value/>
-      <example>/[account]-[project].git</example>
-    </path>
-  </plugin>
-</sparkleshare>

SparkleShare/Common/Plugins/ssnet.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sparkleshare>
-  <plugin>
-    <info>
-        <name>SparkleShare.Net</name>
-        <description>The easiest way to share projects with SparkleShare</description>
-        <icon>ssnet.png</icon>
-        <backend>Git</backend>
-    </info>
-    <address>
-      <value>ssh://storage@sparkleshare.net/</value>
-      <example/>
-    </address>
-    <path>
-      <value/>
-      <example>/username/project</example>
-    </path>
-  </plugin>
-</sparkleshare>

SparkleShare/Common/Presets/bitbucket.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sparkleshare>
-  <plugin>
+  <preset>
     <info>
         <name>Bitbucket</name>
         <description>Free code hosting for Git and Mercurial</description>
         <icon>bitbucket.png</icon>
         <backend>Git</backend>
-        <fingerprint>97:8c:1b:f2:6f:14:6b:5c:3b:ec:aa:46:46:74:7c:40</fingerprint>
+        <fingerprint>4c:eb:19:11:0d:d6:19:65:7b:6a:40:8a:fb:b7:4d:51:81:a1:7a:07:74:4a:b5:22:0c:91:86:42:74:88:9b:bc</fingerprint>
     </info>
     <address>
       <value>ssh://git@bitbucket.org/</value>
@@ -17,5 +17,5 @@
       <example>/username/project</example>
       <uses_lower_case>True</uses_lower_case>
     </path>
-  </plugin>
+  </preset>
 </sparkleshare>

SparkleShare/Common/Presets/github.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sparkleshare>
-  <plugin>
+  <preset>
     <info>
         <name>GitHub</name>
-        <description>Collaborate on projects hosted on GitHub</description>
+        <description>The biggest collection of Open Source projects</description>
         <icon>github.png</icon>
         <backend>Git</backend>
-        <fingerprint>16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48</fingerprint>
+        <storage_type>LargeFiles</storage_type>
+        <fingerprint>92:a3:7f:bd:5e:21:a5:3a:95:c7:16:e1:14:4f:44:2f:58:2b:94:d0:fa:fc:67:3e:b6:71:7a:4e:b5:1a:88:a7</fingerprint>
     </info>
     <address>
       <value>ssh://git@github.com/</value>
@@ -16,5 +17,5 @@
       <value/>
       <example>/username/project</example>
     </path>
-  </plugin>
+  </preset>
 </sparkleshare>

SparkleShare/Common/Presets/gitlab.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sparkleshare>
+  <preset>
+    <info>
+        <name>GitLab</name>
+        <description>Open Source alternative to GitHub</description>
+        <icon>gitlab.png</icon>
+        <backend>Git</backend>
+        <fingerprint>44:e4:05:bc:f4:e1:1a:b5:b8:46:e5:8b:a0:bf:6d:ab:d2:3d:cc:9e:36:7c:ae:17:cb:0c:91:b5:b3:b3:fc:44</fingerprint>
+    </info>
+    <address>
+      <value>ssh://git@gitlab.com/</value>
+      <example/>
+    </address>
+    <path>
+      <value/>
+      <example>/username/project</example>
+    </path>
+  </preset>
+</sparkleshare>
+

SparkleShare/Common/Presets/meson.build

@@ -0,0 +1,10 @@
+preset_files = ['github.xml', 'github.png',
+    'gitlab.xml', 'gitlab.png',
+    'bitbucket.xml', 'bitbucket.png',
+    'own-server.xml', 'own-server.png'
+]
+
+install_data(
+    sources: preset_files,
+    install_dir: join_paths(install_dir, 'presets'))
+

SparkleShare/Common/Presets/own-server.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sparkleshare>
-  <plugin>
+  <preset>
     <info>
-        <name>On my own server</name>
+        <name>Own server</name>
         <description>Everything under my control</description>
         <icon>own-server.png</icon>
         <backend>Git</backend>
@@ -15,5 +15,6 @@
       <value/>
       <example>/path/to/project</example>
     </path>
-  </plugin>
+  </preset>
 </sparkleshare>
+

SparkleShare/Common/SetupController.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
 //
 //   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
@@ -21,7 +21,7 @@ using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading;
 
-using SparkleLib;
+using Sparkles;
 
 namespace SparkleShare {
 
@@ -33,7 +33,7 @@ namespace SparkleShare {
         Syncing,
         Error,
         Finished,
-        Tutorial,
+        StorageSetup,
         CryptoSetup,
         CryptoPassword
     }
@@ -44,7 +44,7 @@ namespace SparkleShare {
     }
 
 
-    public class SparkleSetupController {
+    public class SetupController {
 
         public event Action ShowWindowEvent = delegate { };
         public event Action HideWindowEvent = delegate { };
@@ -53,7 +53,7 @@ namespace SparkleShare {
         public delegate void ChangePageEventHandler (PageType page, string [] warnings);
         
         public event UpdateProgressBarEventHandler UpdateProgressBarEvent = delegate { };
-        public delegate void UpdateProgressBarEventHandler (double percentage, string speed);
+        public delegate void UpdateProgressBarEventHandler (double percentage, string information);
 
         public event UpdateSetupContinueButtonEventHandler UpdateSetupContinueButtonEvent = delegate { };
         public delegate void UpdateSetupContinueButtonEventHandler (bool button_enabled);
@@ -73,12 +73,11 @@ namespace SparkleShare {
         public event ChangePathFieldEventHandler ChangePathFieldEvent = delegate { };
         public delegate void ChangePathFieldEventHandler (string text, string example_text, FieldState state);
 
-        public readonly List<SparklePlugin> Plugins = new List<SparklePlugin> ();
-        public SparklePlugin SelectedPlugin;
+        public readonly List<Preset> Presets = new List<Preset> ();
+        public Preset SelectedPreset;
 
         public bool WindowIsOpen { get; private set; }
         public SparkleInvite PendingInvite { get; private set; }
-        public int TutorialPageNumber { get; private set; }
         public string PreviousUrl { get; private set; }
         public string PreviousAddress { get; private set; }
         public string PreviousPath { get; private set; }
@@ -86,9 +85,9 @@ namespace SparkleShare {
         public double ProgressBarPercentage  { get; private set; }
 
 
-        public int SelectedPluginIndex {
+        public int SelectedPresetIndex {
             get {
-                return Plugins.IndexOf (SelectedPlugin);
+                return Presets.IndexOf (SelectedPreset);
             }
         }
 
@@ -101,61 +100,56 @@ namespace SparkleShare {
         private PageType current_page;
         private string saved_address     = "";
         private string saved_remote_path = "";
-        private bool create_startup_item = true;
         private bool fetch_prior_history = false;
 
 
-        public SparkleSetupController ()
+        public SetupController ()
         {
             ChangePageEvent += delegate (PageType page_type, string [] warnings) {
                 this.current_page = page_type;
             };
 
-            TutorialPageNumber = 0;
             PreviousAddress    = "";
             PreviousPath       = "";
             PreviousUrl        = "";
             SyncingFolder      = "";
 
-            string local_plugins_path = SparklePlugin.LocalPluginsPath;
-            int local_plugins_count   = 0;
+            string local_presets_path = Preset.LocalPresetsPath;
+            int local_presets_count   = 0;
 
-            // Import all of the plugins
-            if (Directory.Exists (local_plugins_path))
-                // Local plugins go first...
-                foreach (string xml_file_path in Directory.GetFiles (local_plugins_path, "*.xml")) {
-                    Plugins.Add (new SparklePlugin (xml_file_path));
-                    local_plugins_count++;
+            // Import all of the presets
+            if (Directory.Exists (local_presets_path))
+                // Local presets go first...
+                foreach (string xml_file_path in Directory.GetFiles (local_presets_path, "*.xml")) {
+                    Presets.Add (new Preset (xml_file_path));
+                    local_presets_count++;
                 }
 
-            // ...system plugins after that...
-            if (Directory.Exists (Program.Controller.PluginsPath)) {
-                foreach (string xml_file_path in Directory.GetFiles (Program.Controller.PluginsPath, "*.xml")) {
+            // ...system presets after that...
+            if (Directory.Exists (SparkleShare.Controller.PresetsPath)) {
+                foreach (string xml_file_path in Directory.GetFiles (SparkleShare.Controller.PresetsPath, "*.xml")) {
                     // ...and "Own server" at the very top
-                    if (xml_file_path.EndsWith ("own-server.xml")) {
-                        Plugins.Insert (0, new SparklePlugin (xml_file_path));
-
-                    } else if (xml_file_path.EndsWith ("ssnet.xml")) {
-                        // Plugins.Insert ((local_plugins_count + 1), new SparklePlugin (xml_file_path)); 
-                        // TODO: Skip this plugin for now
-
-                    } else {
-                        Plugins.Add (new SparklePlugin (xml_file_path));
-                    }
+                    if (xml_file_path.EndsWith ("own-server.xml"))
+                        Presets.Insert (0, new Preset (xml_file_path));
+                    else
+                        Presets.Add (new Preset (xml_file_path));
                 }
             }
 
-            SelectedPlugin = Plugins [0];
+            SelectedPreset = Presets [0];
 
-            Program.Controller.InviteReceived += delegate (SparkleInvite invite) {
+            SparkleShare.Controller.InviteReceived += delegate (SparkleInvite invite) {
                 PendingInvite = invite;
 
                 ChangePageEvent (PageType.Invite, null);
                 ShowWindowEvent ();
             };
 
-            Program.Controller.ShowSetupWindowEvent += delegate (PageType page_type) {
-                if (page_type == PageType.CryptoSetup || page_type == PageType.CryptoPassword) {
+            SparkleShare.Controller.ShowSetupWindowEvent += delegate (PageType page_type) {
+                if (page_type == PageType.StorageSetup ||
+                    page_type == PageType.CryptoSetup ||
+                    page_type == PageType.CryptoPassword) {
+
                     ChangePageEvent (page_type, null);
                     return;
                 }
@@ -184,7 +178,7 @@ namespace SparkleShare {
                             ChangePageEvent (PageType.Add, null);
                         }
 
-                    } else if (!Program.Controller.FirstRun && TutorialPageNumber == 0) {
+                    } else if (!SparkleShare.Controller.FirstRun) {
                         WindowIsOpen = true;
                         ChangePageEvent (PageType.Add, null);
                     }
@@ -203,7 +197,7 @@ namespace SparkleShare {
         public void PageCancelled ()
         {
             PendingInvite   = null;
-            SelectedPlugin  = Plugins [0];
+            SelectedPreset  = Presets [0];
 
             PreviousAddress = "";
             PreviousPath    = "";
@@ -230,70 +224,44 @@ namespace SparkleShare {
         
         public void SetupPageCancelled ()
         {
-            Program.Controller.Quit ();
+            SparkleShare.Controller.Quit ();
         }
         
         
         public void SetupPageCompleted (string full_name, string email)
         {
-            Program.Controller.CurrentUser = new SparkleUser (full_name, email);
+            SparkleShare.Controller.CurrentUser = new User (full_name, email);
+            new Thread (() => SparkleShare.Controller.CreateStartupItem ()).Start ();
 
-            TutorialPageNumber = 1;
-            ChangePageEvent (PageType.Tutorial, null);
+            ChangePageEvent (PageType.Add, null);
         }
 
-
-        public void TutorialSkipped ()
-        {
-            TutorialPageNumber = 4;
-            ChangePageEvent (PageType.Tutorial, null);
-        }
-
-
+      
         public void HistoryItemChanged (bool fetch_prior_history)
         {
             this.fetch_prior_history = fetch_prior_history;
         }
 
 
-        public void TutorialPageCompleted ()
+        public void SelectedPresetChanged (int preset_index)
         {
-            TutorialPageNumber++;
+            SelectedPreset = Presets [preset_index];
 
-            if (TutorialPageNumber == 5) {
-                TutorialPageNumber = 0;
+            if (SelectedPreset.Address != null) {
+                ChangeAddressFieldEvent (SelectedPreset.Address, "", FieldState.Disabled);
 
-                WindowIsOpen = false;
-                HideWindowEvent ();
-
-                if (this.create_startup_item)
-                    new Thread (() => Program.Controller.CreateStartupItem ()).Start ();
-
-            } else {
-                ChangePageEvent (PageType.Tutorial, null);
-            }
-        }
-
-
-        public void SelectedPluginChanged (int plugin_index)
-        {
-            SelectedPlugin = Plugins [plugin_index];
-
-            if (SelectedPlugin.Address != null) {
-                ChangeAddressFieldEvent (SelectedPlugin.Address, "", FieldState.Disabled);
-
-            } else if (SelectedPlugin.AddressExample != null) {
-                ChangeAddressFieldEvent (this.saved_address, SelectedPlugin.AddressExample, FieldState.Enabled);
+            } else if (SelectedPreset.AddressExample != null) {
+                ChangeAddressFieldEvent (this.saved_address, SelectedPreset.AddressExample, FieldState.Enabled);
 
             } else {
                 ChangeAddressFieldEvent (this.saved_address, "", FieldState.Enabled);
             }
 
-            if (SelectedPlugin.Path != null) {
-                ChangePathFieldEvent (SelectedPlugin.Path, "", FieldState.Disabled);
+            if (SelectedPreset.Path != null) {
+                ChangePathFieldEvent (SelectedPreset.Path, "", FieldState.Disabled);
 
-            } else if (SelectedPlugin.PathExample != null) {
-                ChangePathFieldEvent (this.saved_remote_path, SelectedPlugin.PathExample, FieldState.Enabled);
+            } else if (SelectedPreset.PathExample != null) {
+                ChangePathFieldEvent (this.saved_remote_path, SelectedPreset.PathExample, FieldState.Enabled);
 
             } else {
                 ChangePathFieldEvent (this.saved_remote_path, "", FieldState.Enabled);
@@ -301,18 +269,12 @@ namespace SparkleShare {
         }
 
 
-        public void StartupItemChanged (bool create_startup_item)
-        {
-            this.create_startup_item = create_startup_item;
-        }
-
-
-        public void CheckAddPage (string address, string remote_path, int selected_plugin)
+        public void CheckAddPage (string address, string remote_path, int selected_preset)
         {
             address     = address.Trim ();
             remote_path = remote_path.Trim ();
 
-            if (selected_plugin == 0)
+            if (selected_preset == 0)
                 this.saved_address = address;
 
             this.saved_remote_path = remote_path;
@@ -331,8 +293,7 @@ namespace SparkleShare {
             if (remote_path.EndsWith (".git"))
                 SyncingFolder = remote_path.Substring (0, remote_path.Length - 4);
 
-			SyncingFolder         = SyncingFolder.Replace ("-crypto", "");
-			SyncingFolder         = SyncingFolder.ReplaceUnderscoreWithSpace ();
+            SyncingFolder = SyncingFolder.ReplaceUnderscoreWithSpace ();
             ProgressBarPercentage = 1.0;
 
             ChangePageEvent (PageType.Syncing, null);
@@ -341,26 +302,26 @@ namespace SparkleShare {
             remote_path = remote_path.Trim ();
             remote_path = remote_path.TrimEnd ("/".ToCharArray ());
 
-            if (SelectedPlugin.PathUsesLowerCase)
+            if (SelectedPreset.PathUsesLowerCase)
                 remote_path = remote_path.ToLower ();
 
             PreviousAddress = address;
             PreviousPath    = remote_path;
 
-            Program.Controller.FolderFetched    += AddPageFetchedDelegate;
-            Program.Controller.FolderFetchError += AddPageFetchErrorDelegate;
-            Program.Controller.FolderFetching   += SyncingPageFetchingDelegate;
+            SparkleShare.Controller.FolderFetched    += AddPageFetchedDelegate;
+            SparkleShare.Controller.FolderFetchError += AddPageFetchErrorDelegate;
+            SparkleShare.Controller.FolderFetching   += SyncingPageFetchingDelegate;
 
             SparkleFetcherInfo info = new SparkleFetcherInfo {
                 Address           = address,
-                Fingerprint       = SelectedPlugin.Fingerprint,
+                Fingerprint       = SelectedPreset.Fingerprint,
                 RemotePath        = remote_path,
                 FetchPriorHistory = this.fetch_prior_history,
-                AnnouncementsUrl  = SelectedPlugin.AnnouncementsUrl,
-                Backend           = SelectedPlugin.Backend 
+                AnnouncementsUrl  = SelectedPreset.AnnouncementsUrl,
+                Backend           = SelectedPreset.Backend 
             };
 
-            new Thread (() => { Program.Controller.StartFetcher (info); }).Start ();
+            new Thread (() => { SparkleShare.Controller.StartFetcher (info); }).Start ();
         }
 
         // The following private methods are
@@ -370,31 +331,31 @@ namespace SparkleShare {
         {
             SyncingFolder = "";
 
-            // Create a local plugin for succesfully added projects, so
+            // Create a local preset for succesfully added projects, so
             // so the user can easily use the same host again
-            if (SelectedPluginIndex == 0) {
-                SparklePlugin new_plugin;
+            if (SelectedPresetIndex == 0) {
+                Preset new_preset;
                 Uri uri = new Uri (remote_url);
 
                 try {
                     string address = remote_url.Replace (uri.AbsolutePath, "");
-                    new_plugin = SparklePlugin.Create (uri.Host, address, address, "", "", "/path/to/project");
+                    new_preset = Preset.Create (uri.Host, address, address, "", "", "/path/to/project");
     
-                    if (new_plugin != null) {
-                        Plugins.Insert (1, new_plugin);
-                        SparkleLogger.LogInfo ("Controller", "Added plugin for " + uri.Host);
+                    if (new_preset != null) {
+                        Presets.Insert (1, new_preset);
+                        Logger.LogInfo ("Controller", "Added preset for " + uri.Host);
                     }
 
-                } catch {
-                    SparkleLogger.LogInfo ("Controller", "Failed adding plugin for " + uri.Host);
+                } catch (Exception e) {
+                    Logger.LogInfo ("Controller", "Failed adding preset for " + uri.Host, e);
                 }
             }
 
             ChangePageEvent (PageType.Finished, warnings);
 
-            Program.Controller.FolderFetched    -= AddPageFetchedDelegate;
-            Program.Controller.FolderFetchError -= AddPageFetchErrorDelegate;
-            Program.Controller.FolderFetching   -= SyncingPageFetchingDelegate;
+            SparkleShare.Controller.FolderFetched    -= AddPageFetchedDelegate;
+            SparkleShare.Controller.FolderFetchError -= AddPageFetchErrorDelegate;
+            SparkleShare.Controller.FolderFetching   -= SyncingPageFetchingDelegate;
         }
 
         private void AddPageFetchErrorDelegate (string remote_url, string [] errors)
@@ -404,19 +365,19 @@ namespace SparkleShare {
 
             ChangePageEvent (PageType.Error, errors);
 
-            Program.Controller.FolderFetched    -= AddPageFetchedDelegate;
-            Program.Controller.FolderFetchError -= AddPageFetchErrorDelegate;
-            Program.Controller.FolderFetching   -= SyncingPageFetchingDelegate;
+            SparkleShare.Controller.FolderFetched    -= AddPageFetchedDelegate;
+            SparkleShare.Controller.FolderFetchError -= AddPageFetchErrorDelegate;
+            SparkleShare.Controller.FolderFetching   -= SyncingPageFetchingDelegate;
         }
 
-        private void SyncingPageFetchingDelegate (double percentage, double speed)
+        private void SyncingPageFetchingDelegate (double percentage, double speed ,string information)
         {
             ProgressBarPercentage = percentage;
 
-            if (speed == 0.0)
-                UpdateProgressBarEvent (ProgressBarPercentage, "");
-            else
-                UpdateProgressBarEvent (ProgressBarPercentage, "Fetching files… " + speed.ToSize () + "/s");
+            if (speed > 0)
+                information = speed.ToSize () + " – " + information;
+
+            UpdateProgressBarEvent (ProgressBarPercentage, information);
         }
 
 
@@ -427,7 +388,6 @@ namespace SparkleShare {
             if (PendingInvite.RemotePath.EndsWith (".git"))
                 SyncingFolder = PendingInvite.RemotePath.Substring (0, PendingInvite.RemotePath.Length - 4);
 
-			SyncingFolder   = SyncingFolder.Replace ("-crypto", "");
 			SyncingFolder   = SyncingFolder.ReplaceUnderscoreWithSpace ();
             PreviousAddress = PendingInvite.Address;
             PreviousPath    = PendingInvite.RemotePath;
@@ -435,15 +395,15 @@ namespace SparkleShare {
             ChangePageEvent (PageType.Syncing, null);
 
             new Thread (() => {
-                if (!PendingInvite.Accept (Program.Controller.CurrentUser.PublicKey)) {
+                if (!PendingInvite.Accept (SparkleShare.Controller.UserAuthenticationInfo.PublicKey)) {
                     PreviousUrl = PendingInvite.Address + PendingInvite.RemotePath.TrimStart ("/".ToCharArray ());
                     ChangePageEvent (PageType.Error, new string [] { "error: Failed to upload the public key" });
                     return;
                 }
 
-                Program.Controller.FolderFetched    += InvitePageFetchedDelegate;
-                Program.Controller.FolderFetchError += InvitePageFetchErrorDelegate;
-                Program.Controller.FolderFetching   += SyncingPageFetchingDelegate;
+                SparkleShare.Controller.FolderFetched    += InvitePageFetchedDelegate;
+                SparkleShare.Controller.FolderFetchError += InvitePageFetchErrorDelegate;
+                SparkleShare.Controller.FolderFetching   += SyncingPageFetchingDelegate;
 
                 SparkleFetcherInfo info = new SparkleFetcherInfo {
                     Address           = PendingInvite.Address,
@@ -453,7 +413,7 @@ namespace SparkleShare {
                     AnnouncementsUrl  = PendingInvite.AnnouncementsUrl
                 };
 
-                Program.Controller.StartFetcher (info);
+                SparkleShare.Controller.StartFetcher (info);
 
             }).Start ();
         }
@@ -468,9 +428,9 @@ namespace SparkleShare {
 
             ChangePageEvent (PageType.Finished, warnings);
 
-            Program.Controller.FolderFetched    -= AddPageFetchedDelegate;
-            Program.Controller.FolderFetchError -= AddPageFetchErrorDelegate;
-            Program.Controller.FolderFetching   -= SyncingPageFetchingDelegate;
+            SparkleShare.Controller.FolderFetched    -= AddPageFetchedDelegate;
+            SparkleShare.Controller.FolderFetchError -= AddPageFetchErrorDelegate;
+            SparkleShare.Controller.FolderFetching   -= SyncingPageFetchingDelegate;
         }
 
         private void InvitePageFetchErrorDelegate (string remote_url, string [] errors)
@@ -480,15 +440,15 @@ namespace SparkleShare {
 
             ChangePageEvent (PageType.Error, errors);
 
-            Program.Controller.FolderFetched    -= AddPageFetchedDelegate;
-            Program.Controller.FolderFetchError -= AddPageFetchErrorDelegate;
-            Program.Controller.FolderFetching   -= SyncingPageFetchingDelegate;
+            SparkleShare.Controller.FolderFetched    -= AddPageFetchedDelegate;
+            SparkleShare.Controller.FolderFetchError -= AddPageFetchErrorDelegate;
+            SparkleShare.Controller.FolderFetching   -= SyncingPageFetchingDelegate;
         }
 
 
         public void SyncingCancelled ()
         {
-            Program.Controller.StopFetcher ();
+            SparkleShare.Controller.StopFetcher ();
 
             if (PendingInvite != null)
                 ChangePageEvent (PageType.Invite, null);
@@ -506,6 +466,24 @@ namespace SparkleShare {
         }
 
 
+        public void StoragePageCompleted (StorageType storage_type)
+        {
+            if (storage_type == StorageType.Encrypted) {
+                ChangePageEvent (PageType.CryptoSetup, null);
+                return;
+            }
+
+            ProgressBarPercentage = 100.0;
+            ChangePageEvent (PageType.Syncing, null);
+
+            new Thread (() => {
+                Thread.Sleep (1000);
+                SparkleShare.Controller.FinishFetcher (storage_type);
+
+            }).Start ();
+        }
+
+
         public void CheckCryptoSetupPage (string password)
         {
             new Thread (() => {
@@ -517,7 +495,7 @@ namespace SparkleShare {
 
         public void CheckCryptoPasswordPage (string password)
         {
-            bool is_password_correct = Program.Controller.CheckPassword (password);
+            bool is_password_correct = SparkleShare.Controller.CheckPassword (password);
             UpdateCryptoPasswordContinueButtonEvent (is_password_correct);
         }
 
@@ -541,7 +519,7 @@ namespace SparkleShare {
 
             new Thread (() => {
                 Thread.Sleep (1000);
-                Program.Controller.FinishFetcher (password);
+                SparkleShare.Controller.FinishFetcher (StorageType.Encrypted, password);
 
             }).Start ();
         }
@@ -549,29 +527,23 @@ namespace SparkleShare {
 
         public void CopyToClipboardClicked ()
         {
-            Program.Controller.CopyToClipboard (Program.Controller.CurrentUser.PublicKey);
+            SparkleShare.Controller.CopyToClipboard (SparkleShare.Controller.UserAuthenticationInfo.PublicKey);
         }
 
 
         public void ShowFilesClicked ()
         {
-            string folder_name = Path.GetFileName (PreviousPath);
-            folder_name        = folder_name.ReplaceUnderscoreWithSpace ();
+            string folder_name = Path.GetFileNameWithoutExtension (PreviousPath);
+            folder_name = folder_name.ReplaceUnderscoreWithSpace ();
 
-            if (PreviousPath.EndsWith ("-crypto"))
-                folder_name = folder_name.Replace ("-crypto", "");
-
-            if (PreviousPath.EndsWith ("-crypto.git"))
-                folder_name = folder_name.Replace ("-crypto.git", "");
-
-            Program.Controller.OpenSparkleShareFolder (folder_name);
+            SparkleShare.Controller.OpenSparkleShareFolder (folder_name);
             FinishPageCompleted ();
         }
 
 
         public void FinishPageCompleted ()
         {
-            SelectedPlugin  = Plugins [0];
+            SelectedPreset  = Presets [0];
             PreviousUrl     = "";
             PreviousAddress = "";
             PreviousPath    = "";
@@ -588,7 +560,7 @@ namespace SparkleShare {
 
         private bool IsValidEmail (string email)
         {
-            return new Regex (@"^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]+$", RegexOptions.IgnoreCase).IsMatch (email);
+            return email.Contains ("@");
         }
     }
 }

SparkleShare/Common/SparkleShare.cs

@@ -0,0 +1,66 @@
+//   SparkleShare, a collaboration and sharing tool.
+//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//
+//   This program is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+using System;
+using System.Threading;
+
+using Sparkles;
+
+namespace SparkleShare {
+
+    public class SparkleShare {
+
+        public static Controller Controller;
+        public static UserInterface UI;
+
+        static Mutex program_mutex = new Mutex (false, "SparkleShare");
+        
+     
+        #if !__MonoCS__
+        [STAThread]
+        #endif
+        public static void Main (string [] args)
+        {
+            // Only allow one instance of SparkleShare (on Windows)
+            if (!program_mutex.WaitOne (0, exitContext: false)) {
+                Console.WriteLine ("SparkleShare is already running.");
+                Environment.Exit (-1);
+            }
+
+            AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
+
+            Controller = new Controller (Configuration.DefaultConfiguration);
+            Controller.Initialize ();
+
+            UI = new UserInterface ();
+            UI.Run (args);
+
+            #if !__MonoCS__
+            // Suppress assertion messages in debug mode
+            GC.Collect (GC.MaxGeneration, GCCollectionMode.Forced);
+            GC.WaitForPendingFinalizers ();
+            #endif
+        }
+
+
+        static void OnUnhandledException (object sender, UnhandledExceptionEventArgs exception_args)
+        {
+            var exception = (Exception) exception_args.ExceptionObject;
+            Logger.WriteCrashReport (exception);
+        }
+    }
+}

SparkleShare/Common/SparkleShare.projitems

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>{F16E3683-B622-4654-B799-99C8D68AA963}</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>SparkleShare</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)AboutController.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Avatars.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)BaseController.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)BubblesController.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EventLogController.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)NoteController.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SetupController.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SparkleShare.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)StatusIconController.cs" />
+  </ItemGroup>
+</Project>

SparkleShare/Common/SparkleShare.shproj

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F16E3683-B622-4654-B799-99C8D68AA963}</ProjectGuid>
+    <ReleaseVersion></ReleaseVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <Import Project="SparkleShare.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>

SparkleShare/Common/StatusIconController.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
 //
 //   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
@@ -20,7 +20,7 @@ using System.Collections.Generic;
 using System.Threading;
 using Timers = System.Timers;
 
-using SparkleLib;
+using Sparkles;
 
 namespace SparkleShare {
 
@@ -35,38 +35,41 @@ namespace SparkleShare {
 
     public class ProjectInfo {
 
-        private SparkleRepoBase repo;
+        readonly BaseRepository repo;
 
-        public string Name { get { return this.repo.Name; }}
-        public string Path { get { return this.repo.LocalPath; }}
+        public string Name { get { return repo.Name; }}
+        public string Path { get { return repo.LocalPath; }}
 
-        public bool IsPaused { get { return this.repo.Status == SyncStatus.Paused; }}
-        public bool HasError { get { return this.repo.Status == SyncStatus.Error; }}
+        public bool IsPaused { get { return repo.Status == SyncStatus.Paused; }}
+        public bool HasError { get { return repo.Status == SyncStatus.Error; }}
 
 
         public string StatusMessage {
             get {
                 string status_message = "Waiting to sync";
                 
-                if (!this.repo.LastSync.Equals (DateTime.MinValue))
-                    status_message = string.Format ("Synced {0}", this.repo.LastSync.ToPrettyDate ());
+                if (!repo.LastSync.Equals (DateTime.MinValue))
+                    status_message = string.Format ("✓ Synced – Last change {0}", repo.LastSync.ToPrettyDate ());
 
-                if (this.repo.Status == SyncStatus.SyncUp)
-                    status_message = "Sending changes… " + this.repo.ProgressPercentage + "%";
+                if (repo.Status == SyncStatus.SyncUp)
+                    status_message = "Sending… " + (int) repo.ProgressPercentage + "%";
             
-                if (this.repo.Status == SyncStatus.SyncDown)
-                    status_message = "Receiving changes… " + this.repo.ProgressPercentage + "%";
+                if (repo.Status == SyncStatus.SyncDown)
+                    status_message = "Receiving… " + (int) repo.ProgressPercentage + "%";
 
-                if (this.repo.Status == SyncStatus.SyncUp || this.repo.Status == SyncStatus.SyncDown) {
-                    if (this.repo.ProgressSpeed > 0)
-                        status_message += " " + this.repo.ProgressSpeed.ToSize () + "/s";
+                if (!string.IsNullOrWhiteSpace (repo.ProgressInformation))
+                    status_message += " – " + SparkleShare.Controller.ProgressInformation;
+
+                if (repo.Status == SyncStatus.SyncUp || repo.Status == SyncStatus.SyncDown) {
+                    if (repo.ProgressSpeed > 0)
+                        status_message += " " + repo.ProgressSpeed.ToSize () + "/s";
                 }
 
-                if (IsPaused) {
+                if (IsPaused)
                     return "Paused";
 
-                } else if (HasError) {
-                    switch (this.repo.Error) {
+                if (HasError) {
+                    switch (repo.Error) {
                     case ErrorStatus.HostUnreachable: return "Can’t reach the host";
                     case ErrorStatus.HostIdentityChanged: return "The host’s identity has changed";
                     case ErrorStatus.AuthenticationFailed: return "Authentication failed";
@@ -86,20 +89,20 @@ namespace SparkleShare {
 
         public Dictionary<string, string> UnsyncedChangesInfo {
             get { 
-                Dictionary<string, string> changes_info = new Dictionary<string, string> ();
+                var changes_info = new Dictionary<string, string> ();
             
                 int changes_count = 0;
-                foreach (SparkleChange change in repo.UnsyncedChanges) {
+                foreach (Change change in repo.UnsyncedChanges) {
                     changes_count++;
 
                     if (changes_count > 10)
                         continue;
 
                     switch (change.Type) {
-                    case SparkleChangeType.Added:   changes_info [change.Path] = "document-added-12.png"; break;
-                    case SparkleChangeType.Edited:  changes_info [change.Path] = "document-edited-12.png"; break;
-                    case SparkleChangeType.Deleted: changes_info [change.Path] = "document-deleted-12.png"; break;
-                    case SparkleChangeType.Moved:   changes_info [change.MovedToPath] = "document-moved-12.png"; break;
+                    case ChangeType.Added:   changes_info [change.Path] = "document-added-12.png"; break;
+                    case ChangeType.Edited:  changes_info [change.Path] = "document-edited-12.png"; break;
+                    case ChangeType.Deleted: changes_info [change.Path] = "document-deleted-12.png"; break;
+                    case ChangeType.Moved:   changes_info [change.MovedToPath] = "document-moved-12.png"; break;
                     }
                 }
 
@@ -111,14 +114,14 @@ namespace SparkleShare {
         }
 
 
-        public ProjectInfo (SparkleRepoBase repo)
+        public ProjectInfo (BaseRepository repo)
         {
             this.repo = repo;
         }
     }
 
 
-    public class SparkleStatusIconController {
+    public class StatusIconController {
 
         public event UpdateIconEventHandler UpdateIconEvent = delegate { };
         public delegate void UpdateIconEventHandler (IconState state);
@@ -133,47 +136,20 @@ namespace SparkleShare {
         public delegate void UpdateQuitItemEventHandler (bool quit_item_enabled);
 
         public IconState CurrentState = IconState.Idle;
-        public string StateText       = "Welcome to SparkleShare!";
+        public string StateText = "Welcome to SparkleShare!";
 
         public ProjectInfo [] Projects = new ProjectInfo [0];
 
 
-        public int ProgressPercentage {
-            get {
-                return (int) Program.Controller.ProgressPercentage;
-            }
-        }
-
-        public string ProgressSpeed {
-            get {
-                string progress_speed = "";
-
-                if (Program.Controller.ProgressSpeedDown == 0 && Program.Controller.ProgressSpeedUp > 0) {
-                    progress_speed = Program.Controller.ProgressSpeedUp.ToSize () + "/s ";
-
-                } else if (Program.Controller.ProgressSpeedUp == 0 && Program.Controller.ProgressSpeedDown > 0) {
-                    progress_speed = Program.Controller.ProgressSpeedDown.ToSize () + "/s ";
-                        
-                } else if (Program.Controller.ProgressSpeedUp   > 0 &&
-                           Program.Controller.ProgressSpeedDown > 0) {
-
-                    progress_speed = "Up: " + Program.Controller.ProgressSpeedUp.ToSize () + "/s " +
-                        "Down: " + Program.Controller.ProgressSpeedDown.ToSize () + "/s";
-                }
-
-                return progress_speed;
-            }
-        }
-
         public bool RecentEventsItemEnabled {
             get {
-                return (Program.Controller.Repositories.Length > 0);
+                return (SparkleShare.Controller.Repositories.Length > 0);
             }
         }
 
         public bool LinkCodeItemEnabled {
             get {
-                return !string.IsNullOrEmpty (Program.Controller.CurrentUser.PublicKey);
+                return !string.IsNullOrEmpty (SparkleShare.Controller.UserAuthenticationInfo.PublicKey);
             }
         }
 
@@ -184,11 +160,11 @@ namespace SparkleShare {
         }
 
 
-        public SparkleStatusIconController ()
+        public StatusIconController ()
         {
             UpdateFolders ();
 
-            Program.Controller.FolderListChanged += delegate {
+            SparkleShare.Controller.FolderListChanged += delegate {
                 if (CurrentState != IconState.Error) {
                     CurrentState = IconState.Idle;
 
@@ -201,10 +177,9 @@ namespace SparkleShare {
                 UpdateMenuEvent (CurrentState);
             };
 
-            Program.Controller.OnIdle += delegate {
+            SparkleShare.Controller.OnIdle += delegate {
                 if (CurrentState != IconState.Error) {
                     CurrentState = IconState.Idle;
-
                     UpdateStateText ();
                 }
 
@@ -216,44 +191,61 @@ namespace SparkleShare {
                 UpdateMenuEvent (CurrentState);
             };
 
-            Program.Controller.OnSyncing += delegate {
-				int repos_syncing_up   = 0;
-				int repos_syncing_down = 0;
-				
-				foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
-					if (repo.Status == SyncStatus.SyncUp)
-						repos_syncing_up++;
-					
-					if (repo.Status == SyncStatus.SyncDown)
-						repos_syncing_down++;
-				}
-				
-				if (repos_syncing_up > 0 &&
-				    repos_syncing_down > 0) {
-					
-					CurrentState = IconState.Syncing;
-                    StateText    = "Syncing changes…";
-				
-				} else if (repos_syncing_down == 0) {
-					CurrentState = IconState.SyncingUp;
-                    StateText    = "Sending changes…";
-					
-				} else {
-					CurrentState = IconState.SyncingDown;
-                    StateText    = "Receiving changes…";
-				}
+            SparkleShare.Controller.OnSyncing += delegate {
+                int repos_syncing_up = 0;
+                int repos_syncing_down = 0;
 
-                if (ProgressPercentage > 0)
-                    StateText += " " + ProgressPercentage + "%  " + ProgressSpeed;
+                foreach (BaseRepository repo in SparkleShare.Controller.Repositories) {
+                    if (repo.Status == SyncStatus.SyncUp)
+                        repos_syncing_up++;
+
+                    if (repo.Status == SyncStatus.SyncDown)
+                        repos_syncing_down++;
+                }
+
+                if (repos_syncing_up > 0 &&
+                    repos_syncing_down > 0) {
+
+                    CurrentState = IconState.Syncing;
+                    StateText    = "Syncing…";
+
+                } else if (repos_syncing_down == 0) {
+                    CurrentState = IconState.SyncingUp;
+                    StateText    = "Sending…";
+
+                } else {
+                    CurrentState = IconState.SyncingDown;
+                    StateText    = "Receiving…";
+                }
+
+                int progress_percentage = (int) SparkleShare.Controller.ProgressPercentage;
+                string progress_speed = "";
+
+                if (SparkleShare.Controller.ProgressSpeedUp > 0.0 && SparkleShare.Controller.ProgressSpeedDown > 0.0) {
+                    progress_speed = "Up: " + SparkleShare.Controller.ProgressSpeedUp.ToSize () + "/s " +
+                        "Down: " + SparkleShare.Controller.ProgressSpeedDown.ToSize () + "/s";
+                }
+
+                if (SparkleShare.Controller.ProgressSpeedUp > 0.0)
+                    progress_speed = SparkleShare.Controller.ProgressSpeedUp.ToSize () + "/s ";
+
+                if (SparkleShare.Controller.ProgressSpeedDown > 0.0)
+                    progress_speed = SparkleShare.Controller.ProgressSpeedDown.ToSize () + "/s ";
+
+                if (progress_percentage > 0)
+                    StateText += string.Format (" {0}% {1}", progress_percentage, progress_speed);
+
+                if (!string.IsNullOrEmpty (SparkleShare.Controller.ProgressInformation))
+                    StateText += " – " + SparkleShare.Controller.ProgressInformation;
 
                 UpdateIconEvent (CurrentState);
                 UpdateStatusItemEvent (StateText);
                 UpdateQuitItemEvent (QuitItemEnabled);
             };
 
-            Program.Controller.OnError += delegate {
+            SparkleShare.Controller.OnError += delegate {
                 CurrentState = IconState.Error;
-                StateText    = "Some changes weren’t synced";
+                StateText = "Not everything synced";
 
                 UpdateFolders ();
                 
@@ -266,7 +258,7 @@ namespace SparkleShare {
 
             // FIXME: Work around a race condition causing
             // the icon to not always show the right state
-            Timers.Timer timer = new Timers.Timer () { Interval = 30 * 1000 };
+            var timer = new Timers.Timer { Interval = 30 * 1000 };
 
             timer.Elapsed += delegate {
                 UpdateIconEvent (CurrentState);
@@ -282,7 +274,7 @@ namespace SparkleShare {
             if (Projects.Length == 0)
                 return StateText = "Welcome to SparkleShare!";
             else
-                return StateText = "Projects up to date " + GetPausedCount ();
+                return StateText = "✓ Synced " + GetPausedCount ();
         }
 
 
@@ -305,56 +297,56 @@ namespace SparkleShare {
         public void RecentEventsClicked ()
         {
             new Thread (() => {
-                while (!Program.Controller.RepositoriesLoaded)
+                while (!SparkleShare.Controller.RepositoriesLoaded)
                     Thread.Sleep (100);
 
-                Program.Controller.ShowEventLogWindow ();
+                SparkleShare.Controller.ShowEventLogWindow ();
             
             }).Start ();
         }
 
         public void AddHostedProjectClicked ()
         {
-            new Thread (() => Program.Controller.ShowSetupWindow (PageType.Add)).Start ();
+            new Thread (() => SparkleShare.Controller.ShowSetupWindow (PageType.Add)).Start ();
         }
 
         public void CopyToClipboardClicked ()
         {
-            Program.Controller.CopyToClipboard (Program.Controller.CurrentUser.PublicKey);
+            SparkleShare.Controller.CopyToClipboard (SparkleShare.Controller.UserAuthenticationInfo.PublicKey);
         }
 
         public void AboutClicked ()
         {
-            Program.Controller.ShowAboutWindow ();
+            SparkleShare.Controller.ShowAboutWindow ();
         }
 
         public void QuitClicked ()
         {
-            Program.Controller.Quit ();
+            SparkleShare.Controller.Quit ();
         }
 
 
         // Project items
         public void ProjectClicked (string project)
         {
-            Program.Controller.OpenSparkleShareFolder (project);
+            SparkleShare.Controller.OpenSparkleShareFolder (project);
         }
 
         public void PauseClicked (string project)
         {
-            Program.Controller.GetRepoByName (project).Pause ();
+            SparkleShare.Controller.GetRepoByName (project).Pause ();
             UpdateStateText ();
             UpdateMenuEvent (CurrentState);
         }
 
         public void ResumeClicked (string project)
         {
-            if (Program.Controller.GetRepoByName (project).UnsyncedChanges.Count > 0) {
-                Program.Controller.ShowNoteWindow (project);
+            if (SparkleShare.Controller.GetRepoByName (project).UnsyncedChanges.Count > 0) {
+                SparkleShare.Controller.ShowNoteWindow (project);
             
             } else {
               new Thread (() => {
-                    Program.Controller.GetRepoByName (project).Resume ("");
+                    SparkleShare.Controller.GetRepoByName (project).Resume ("");
                     
                     UpdateStateText ();
                     UpdateMenuEvent (CurrentState);
@@ -365,7 +357,7 @@ namespace SparkleShare {
 
         public void TryAgainClicked (string project)
         {
-            new Thread (() => Program.Controller.GetRepoByName (project).ForceRetry ()).Start ();
+            new Thread (() => SparkleShare.Controller.GetRepoByName (project).ForceRetry ()).Start ();
         }
 
 
@@ -391,18 +383,18 @@ namespace SparkleShare {
         }
 
 
-        private Object projects_lock = new Object ();
+        readonly object projects_lock = new object ();
 
-        private void UpdateFolders ()
+        void UpdateFolders ()
         {
-            lock (this.projects_lock) {
-                List<ProjectInfo> projects = new List<ProjectInfo> ();
+            var projects = new List<ProjectInfo> ();
 
-                foreach (SparkleRepoBase repo in Program.Controller.Repositories)
+            lock (projects_lock) {
+                foreach (BaseRepository repo in SparkleShare.Controller.Repositories)
                     projects.Add (new ProjectInfo (repo));
-            
-                Projects = projects.ToArray ();
             }
+
+            Projects = projects.ToArray ();
         }
     }
 }

SparkleShare/Common/Translations/Makefile.in.in

@@ -1,222 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
-#
-# This file may be copied and used freely without restrictions.  It may
-# be used in projects which are not available under a GNU Public License,
-# but which still want to provide support for the GNU gettext functionality.
-#
-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob@ximian.com> to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-datarootdir = @datarootdir@
-libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-subdir = po
-install_sh = @install_sh@
-# Automake >= 1.8 provides @mkdir_p@.
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = @ALL_LINGUAS@
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
-DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-# This comment gets stripped out
-
-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-
-.SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
-INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
-INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
-
-.po.pox:
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
-	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	$(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && gencat $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(GENPOT)
-
-install: install-data
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $$dir; \
-	  if test -r $$lang.gmo; then \
-	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $(srcdir)/$$lang.gmo as" \
-		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-	  fi; \
-	  if test -r $$lang.gmo.m; then \
-	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	  else \
-	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
-
-# Empty stubs to satisfy archaic automake needs
-dvi info ctags tags CTAGS TAGS ID:
-
-# Define this as empty until I found a useful application.
-install-exec installcheck:
-
-uninstall:
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-	done
-
-check: all $(GETTEXT_PACKAGE).pot
-	rm -f missing notexist
-	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-	if [ -r missing -o -r notexist ]; then \
-	  exit 1; \
-	fi
-
-mostlyclean:
-	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-	rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES stamp-it
-	rm -f *.mo *.msg *.cat *.cat.m *.gmo
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f Makefile.in.in
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	extra_dists="$(EXTRA_DISTFILES)"; \
-	for file in $$extra_dists; do \
-	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-	done; \
-	for file in $$dists; do \
-	  test -f $$file || file="$(srcdir)/$$file"; \
-	  ln $$file $(distdir) 2> /dev/null \
-	    || cp -p $$file $(distdir); \
-	done
-
-update-po: Makefile
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	tmpdir=`pwd`; \
-	linguas="$(USE_LINGUAS)"; \
-	for lang in $$linguas; do \
-	  echo "$$lang:"; \
-	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-	  if $$result; then \
-	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	      rm -f $$tmpdir/$$lang.new.po; \
-            else \
-	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	        :; \
-	      else \
-	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	        rm -f $$tmpdir/$$lang.new.po; \
-	        exit 1; \
-	      fi; \
-	    fi; \
-	  else \
-	    echo "msgmerge for $$lang.gmo failed!"; \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  fi; \
-	done
-
-Makefile POTFILES: stamp-it
-	@if test ! -f $@; then \
-	  rm -f stamp-it; \
-	  $(MAKE) stamp-it; \
-	fi
-
-stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-	       $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

SparkleShare/Common/Translations/nl.po

@@ -2,7 +2,7 @@
 # 
 # Translators:
 #   <benjamincottyn@gmail.com>, 2011.
-#   <hylkebons@gmail.com>, 2011.
+#   <hi@planetpeanut.uk>, 2011.
 #   <inxidious@gmail.com>, 2011.
 # Łukasz Jernaś <deejay1@srem.org>, 2011.
 #   <m.manshanden@gmail.com>, 2011.

SparkleShare/Linux/About.cs

@@ -0,0 +1,166 @@
+//   SparkleShare, a collaboration and sharing tool.
+//   Copyright (C) 2010  Hylke Bons (hi@planetpeanut.uk)
+//
+//   This program is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, see (http://www.gnu.org/licenses/).
+
+
+using System;
+
+using Sparkles;
+using Gtk;
+
+namespace SparkleShare {
+
+    public class About : Window {
+
+        public AboutController Controller = new AboutController ();
+
+        Label updates;
+
+
+        public About () : base ("About SparkleShare")
+        {
+            IconName       = "org.sparkleshare.SparkleShare";
+            Resizable      = false;
+            WindowPosition = WindowPosition.CenterAlways;
+            TypeHint       = Gdk.WindowTypeHint.Dialog;
+
+            SetSizeRequest (640, 260);
+
+
+            DeleteEvent += delegate (object o, DeleteEventArgs args) {
+                Controller.WindowClosed ();
+                args.RetVal = true;
+            };
+
+            KeyPressEvent += delegate (object o, KeyPressEventArgs args) {
+                if (args.Event.Key == Gdk.Key.Escape ||
+                    (args.Event.State == Gdk.ModifierType.ControlMask && args.Event.Key == Gdk.Key.w)) {
+
+                    Controller.WindowClosed ();
+                }
+            };
+
+            Controller.HideWindowEvent += delegate {
+                Application.Invoke (delegate { Hide (); });
+            };
+
+            Controller.ShowWindowEvent += delegate {
+                Application.Invoke (delegate {
+                    ShowAll ();
+                    Present ();
+                });
+            };
+
+            Controller.UpdateLabelEvent += delegate (string text) {
+                Application.Invoke (delegate {
+                    updates.Text = text;
+                    updates.ShowAll();
+                });
+            };
+
+
+            CreateAbout ();
+        }
+
+
+        void CreateAbout ()
+        {
+            CssProvider window_css_provider = new CssProvider ();
+            string image_path = InstallationInfo.Directory + "/pixmaps/about.png";
+
+            window_css_provider.LoadFromData ("window, GtkWindow {" +
+                "    background-image: url('" + image_path + "');" +
+                "    background-repeat: no-repeat;" +
+                "    background-position: left bottom;" +
+                "}");
+
+            StyleContext.AddProvider (window_css_provider, 800);
+
+            var layout_vertical = new VBox (false, 0);
+            var links_layout = new HBox (false, 16);
+
+            CssProvider label_css_provider = new CssProvider ();
+            label_css_provider.LoadFromData ("label { color: #fff; font-size: 14pt; background-color: rgba(0, 0, 0, 0); }");
+
+            CssProvider label_highlight_css_provider = new CssProvider ();
+            label_highlight_css_provider.LoadFromData ("label { color: #a8bbcf; font-size: 12pt; }");
+
+            var version = new Label {
+                Text = "version " + Controller.RunningVersion,
+                Xalign = 0, Xpad = 0
+            };
+
+            if (InstallationInfo.IsFlatpak)
+                version.Text += " (Flatpak)";
+
+            updates = new Label ("Checking for updates…") {
+                Xalign = 0, Xpad = 0
+            };
+
+            var copyright = new Label {
+                Markup = string.Format ("Copyright © 2010–{0} Hylke Bons and others", DateTime.Now.Year),
+                Xalign = 0, Xpad = 0
+            };
+
+            var license = new Label ("SparkleShare is Open Source and you’re free to\n" +
+                "use, change, and share it under the GNU GPLv3") {
+
+                Xalign = 0, Xpad = 0
+            };
+
+            license.StyleContext.AddProvider (label_css_provider, 800);
+            updates.StyleContext.AddProvider (label_highlight_css_provider, 800);
+            version.StyleContext.AddProvider (label_css_provider, 800);
+            copyright.StyleContext.AddProvider (label_css_provider, 800);
+
+            var website_link        = new Link ("Website", Controller.WebsiteLinkAddress);
+            var credits_link        = new Link ("Credits", Controller.CreditsLinkAddress);
+            var report_problem_link = new Link ("Report a problem", Controller.ReportProblemLinkAddress);
+            var debug_log_link      = new Link ("Debug log", Controller.DebugLogLinkAddress);
+
+            layout_vertical.PackStart (new Label (""), true, true, 0);
+            layout_vertical.PackStart (version, false, false, 0);
+            layout_vertical.PackStart (updates, false, false, 0);
+            layout_vertical.PackStart (copyright, false, false, 6);
+            layout_vertical.PackStart (license, false, false, 6);
+            layout_vertical.PackStart (links_layout, false, false, 6);
+
+            links_layout.PackStart (website_link, false, false, 0);
+            links_layout.PackStart (credits_link, false, false, 0);
+            links_layout.PackStart (report_problem_link, false, false, 0);
+            links_layout.PackStart (debug_log_link, false, false, 0);
+
+            var layout_horizontal = new HBox (false, 0);
+            layout_horizontal.PackStart (new Label (""), false, false, 149);
+            layout_horizontal.PackStart (layout_vertical, false, false, 0);
+
+            Add (layout_horizontal);
+        }
+    }
+
+
+    class Link : Label {
+
+        public Link (string label, string url)
+        {
+            Markup   = string.Format ("<a href=\"{0}\">{1}</a>", url, label);
+            CanFocus = false;
+
+            CssProvider css_provider = new CssProvider ();
+            css_provider.LoadFromData ("label a { color: #729fcf; font-size: 14pt; }");
+            StyleContext.AddProvider (css_provider, 800);
+        }
+    }
+}

SparkleShare/Linux/Bubbles.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
 //
 //   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
@@ -19,27 +19,28 @@ using System;
 
 using Gtk;
 using Notifications;
-using SparkleLib;
+
+using Sparkles;
 
 namespace SparkleShare {
     
-    public class SparkleBubbles {
+    public class Bubbles {
 
-        public SparkleBubblesController Controller = new SparkleBubblesController ();
+        public BubblesController Controller = new BubblesController ();
 
 
-        public SparkleBubbles ()
+        public Bubbles ()
         {
             Controller.ShowBubbleEvent += ShowBubbleEvent;
         }
 
 
-        private void ShowBubbleEvent (string title, string subtext, string image_path)
+        void ShowBubbleEvent (string title, string subtext, string image_path)
         {
-            if (!Program.Controller.NotificationsEnabled)
+            if (!SparkleShare.Controller.NotificationsEnabled)
                 return;
 
-			Application.Invoke (delegate {
+            Application.Invoke (delegate {
 				Notification notification = new Notification () {
 					Summary = title,
 					Body    = subtext,
@@ -50,16 +51,15 @@ namespace SparkleShare {
 				if (image_path != null)
 					notification.Icon = new Gdk.Pixbuf (image_path);
 				else
-					notification.IconName = "folder-sparkleshare";
+					notification.IconName = "org.sparkleshare.SparkleShare";
 
 				try {
 					notification.Show ();
 
 				} catch (Exception e) {
-					SparkleLogger.LogInfo ("Notification", "Error showing notification: ", e);
+					Logger.LogInfo ("Notification", "Could not show notification: ", e);
 				}
 			});
         }
     }
 }
-

SparkleShare/Linux/Controller.cs

@@ -0,0 +1,151 @@
+//   SparkleShare, a collaboration and sharing tool.
+//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
+//
+//   This program is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+using System;
+using System.Diagnostics;
+using System.IO;
+
+using Gtk;
+using Mono.Unix.Native;
+
+using Sparkles;
+using Sparkles.Git;
+
+namespace SparkleShare {
+
+    public class Controller : BaseController {
+
+        public Controller (Configuration config) : base (config)
+        {
+            if (InstallationInfo.IsFlatpak)
+                GitCommand.ExecPath = Path.Combine ("/app", "libexec", "git-core");
+        }
+
+
+        public override void CreateSparkleShareFolder ()
+        {
+            if (!Directory.Exists (Configuration.DefaultConfiguration.FoldersPath)) {
+                Directory.CreateDirectory (Configuration.DefaultConfiguration.FoldersPath);
+                Syscall.chmod (Configuration.DefaultConfiguration.FoldersPath, (FilePermissions) 448); // 448 -> 700
+            }
+        }
+        
+
+        public override void SetFolderIcon ()
+        {
+            var gio_set = new Command ("gio", "set \"" + Configuration.DefaultConfiguration.FoldersPath + "\" " +
+                "metadata::custom-icon-name org.sparkleshare.SparkleShare");
+
+            string XDG_DATA_HOME = Path.Combine (Config.HomePath, ".local", "share");
+            gio_set.StartInfo.EnvironmentVariables ["XDG_DATA_HOME"] = XDG_DATA_HOME;
+
+            gio_set.StartAndWaitForExit ();
+        }
+
+
+        public override void CreateStartupItem ()
+        {
+            string autostart_file_path = Path.Combine (Path.GetDirectoryName (InstallationInfo.Directory),
+                "applications", "SparkleShare.Autostart.desktop");
+            
+            string autostart_file_dest = Path.Combine (Config.HomePath, ".config", "autostart", "SparkleShare.Autostart.desktop");
+            string autostart_path = Path.GetDirectoryName (autostart_file_dest);
+
+            if (!Directory.Exists (autostart_path))
+                Directory.CreateDirectory (autostart_path);
+
+            if (File.Exists (autostart_file_dest))
+                return;
+
+            try {
+                File.Copy (autostart_file_path, autostart_file_dest);
+                Logger.LogInfo ("Controller", "Added SparkleShare to startup items");
+
+            } catch (Exception e) {
+                Logger.LogInfo ("Controller", "Failed to add SparkleShare to startup items", e);
+            }
+        }
+
+
+        public override void InstallProtocolHandler ()
+        {
+        }
+        
+
+        public override void CopyToClipboard (string text)
+        {
+            Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false)).Text = text;
+        }
+
+
+        public override void OpenFolder (string path)
+        {
+            OpenFile (path);
+        }
+
+
+        public override void OpenFile (string path)
+        {
+            if (InstallationInfo.IsFlatpak)
+                Global.ShowUri (Gdk.Screen.Default, path);
+            else
+                new Command ("xdg-open", string.Format ("\"{0}\"", path)).Start ();
+        }
+
+
+        public override string EventLogHTML {
+            get {
+                string html_path = Path.Combine (InstallationInfo.Directory, "html", "event-log.html");
+                string jquery_file_path = Path.Combine (InstallationInfo.Directory, "html", "jquery.js");
+
+                string html   = File.ReadAllText (html_path);
+                string jquery = File.ReadAllText (jquery_file_path);
+
+                return html.Replace ("<!-- $jquery -->", jquery);
+            }
+        }
+
+        
+        public override string DayEntryHTML {
+            get {
+                string path = Path.Combine (InstallationInfo.Directory, "html", "day-entry.html");
+                return File.ReadAllText (path);
+            }
+        }
+
+        
+        public override string EventEntryHTML {
+            get {
+                string path = Path.Combine (InstallationInfo.Directory, "html", "event-entry.html");
+                return File.ReadAllText (path);
+            }
+        }
+
+
+        public override string PresetsPath {
+            get {
+                return Path.Combine (InstallationInfo.Directory, "presets");
+            }
+        }
+
+
+        public override void PlatformQuit ()
+        {
+            Environment.Exit (0);
+        }
+    }
+}

SparkleShare/Linux/EventLog.cs

@@ -1,5 +1,5 @@
 //   SparkleShare, a collaboration and sharing tool.
-//   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
+//   Copyright (C) 2010  Hylke Bons <hi@planetpeanut.uk>
 //
 //   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
@@ -16,41 +16,42 @@
 
 
 using System;
+using IO = System.IO;
 
 using Gtk;
-using WebKit;
+using WebKit2;
 
 namespace SparkleShare {
 
-    public class SparkleEventLog : Window {
+    public class EventLog : Window {
 
-        public SparkleEventLogController Controller = new SparkleEventLogController ();
+        public EventLogController Controller = new EventLogController ();
 
         private Label size_label;
         private Label history_label;
-        private ComboBox combo_box;
         private EventBox content_wrapper;
-        private HBox combo_box_wrapper;
-        private HBox layout_horizontal;
         private ScrolledWindow scrolled_window;
         private VBox spinner_wrapper;
         private Spinner spinner;
         private WebView web_view;
 
-        private int pos_x, pos_y;
+        int pos_x, pos_y;
 
 
-        public SparkleEventLog () : base ("Recent Changes")
+        public EventLog () : base ("Recent Changes")
         {
-            SetWmclass ("SparkleShare", "SparkleShare");
+            TypeHint = Gdk.WindowTypeHint.Dialog;
+            IconName = "org.sparkleshare.SparkleShare";
+
+            SetSizeRequest (480, 640);
 
             Gdk.Rectangle monitor_0_rect = Gdk.Screen.Default.GetMonitorGeometry (0);
-            SetSizeRequest (480, (int) (monitor_0_rect.Height * 0.8));
 
-            IconName = "sparkleshare";
-            this.pos_x = (int) (monitor_0_rect.Width * 0.61);
-            this.pos_y = (int) (monitor_0_rect.Height * 0.5 - (HeightRequest * 0.5));
-            
+            Resize (480, (int) (monitor_0_rect.Height * 0.8));
+
+            pos_x = (int) (monitor_0_rect.Width * 0.62);
+            pos_y = (int) ((monitor_0_rect.Height - (monitor_0_rect.Height * 0.8)) / 2);
+
             this.size_label    = new Label () { Xalign = 0, Markup = "<b>Size:</b> …" };
             this.history_label = new Label () { Xalign = 0, Markup = "<b>History:</b> …" };
 
@@ -66,12 +67,11 @@ namespace SparkleShare {
             this.content_wrapper = new EventBox ();
             this.scrolled_window = new ScrolledWindow ();
 
-            this.content_wrapper.OverrideBackgroundColor (StateFlags.Normal,
-                new Gdk.RGBA () { Red = 1, Green = 1, Blue=1, Alpha = 1 });
-
-            this.web_view = new WebView () { Editable = false };
-            this.web_view.NavigationRequested += WebViewNavigationRequested;
+            CssProvider css_provider = new CssProvider ();
+            css_provider.LoadFromData ("GtkEventBox { background-color: #ffffff; }");
+            this.content_wrapper.StyleContext.AddProvider (css_provider, 800);
 
+            this.web_view = CreateWebView ();
             this.scrolled_window.Add (this.web_view);
             
             this.spinner_wrapper = new VBox (false, 0);
@@ -83,11 +83,6 @@ namespace SparkleShare {
 
             this.content_wrapper.Add (this.spinner_wrapper);
 
-            this.layout_horizontal = new HBox (false, 0);
-            this.layout_horizontal.PackStart (layout_sizes, true, true, 12);
-
-            layout_vertical.PackStart (this.layout_horizontal, false, false, 0);
-            layout_vertical.PackStart (new HSeparator (), false, false, 0);
             layout_vertical.PackStart (this.content_wrapper, true, true, 0);
 
             Add (layout_vertical);
@@ -104,7 +99,7 @@ namespace SparkleShare {
 
             Controller.ShowWindowEvent += delegate {
                 Application.Invoke (delegate {
-                    Move (this.pos_x, this.pos_y);
+                    Move (pos_x, pos_y);
                     ShowAll ();
                     Present ();
                 });
@@ -128,14 +123,6 @@ namespace SparkleShare {
                 });
             };
 
-            Controller.UpdateChooserEvent += delegate (string [] folders) {
-                Application.Invoke (delegate { UpdateChooser (folders); });
-            };
-			
-            Controller.UpdateChooserEnablementEvent += delegate (bool enabled) {
-                Application.Invoke (delegate { this.combo_box.Sensitive = enabled; });
-            };
-
             Controller.UpdateContentEvent += delegate (string html) {
                  Application.Invoke (delegate { UpdateContent (html); });
             };
@@ -170,120 +157,81 @@ namespace SparkleShare {
                 }
             };
         }
-        
-        
-        public void UpdateChooser (string [] folders)
-        {
-            if (folders == null)
-                folders = Controller.Folders;
-
-            if (this.combo_box_wrapper != null && this.combo_box_wrapper.Parent != null) {
-                this.layout_horizontal.Remove (this.combo_box_wrapper);
-                this.combo_box_wrapper.Remove (this.combo_box);
-            }
-
-            this.combo_box_wrapper = new HBox (false, 0);
-            this.combo_box = new ComboBox ();
-
-            CellRendererText cell = new CellRendererText();
-            this.combo_box.PackStart (cell, false);
-            this.combo_box.AddAttribute (cell, "text", 0);
-
-            ListStore store = new ListStore (typeof (string));
-
-            store.AppendValues ("Summary");
-            store.AppendValues ("---");
-            
-            this.combo_box.Model  = store;
-            this.combo_box.Active = 0;
-            
-            int row = 2;
-            foreach (string folder in folders) {
-                store.AppendValues (folder);
-                
-                if (folder.Equals (Controller.SelectedFolder))
-                    this.combo_box.Active = row;
-
-                row++;
-            }
-
-            this.combo_box.RowSeparatorFunc = delegate (ITreeModel model, TreeIter iter) {
-                string item = (string) this.combo_box.Model.GetValue (iter, 0);
-                return (item == "---");
-            };
-
-            this.combo_box.Changed += delegate {
-                TreeIter iter;
-                this.combo_box.GetActiveIter (out iter);
-                string selection = (string) this.combo_box.Model.GetValue (iter, 0);
-                TreePath path    = this.combo_box.Model.GetPath (iter);
-
-                if (path.Indices [0] == 0)
-                    Controller.SelectedFolder = null;
-                else
-                    Controller.SelectedFolder = selection;
-            };
-
-            this.combo_box_wrapper.Add (this.combo_box);
-            this.combo_box.GrabFocus ();
-
-            this.layout_horizontal.BorderWidth = 6;
-            this.layout_horizontal.PackStart (this.combo_box_wrapper, false, false, 0);
-            this.layout_horizontal.ShowAll ();
-        }
 
 
         public void UpdateContent (string html)
         {
-            string pixmaps_path = new string [] {SparkleUI.AssetsPath, "pixmaps"}.Combine ();
-            string icons_path   = new string [] {SparkleUI.AssetsPath, "icons", "hicolor", "12x12", "status"}.Combine ();
+            string pixmaps_path = IO.Path.Combine (UserInterface.AssetsPath, "pixmaps");
+            string icons_path   = IO.Path.Combine (UserInterface.AssetsPath, "icons", "hicolor", "12x12", "status");
 
             html = html.Replace ("<!-- $a-hover-color -->", "#009ff8");
             html = html.Replace ("<!-- $a-color -->", "#0085cf");
-
             html = html.Replace ("<!-- $body-font-family -->", StyleContext.GetFont (StateFlags.Normal).Family);
             html = html.Replace ("<!-- $body-font-size -->", (double) (StyleContext.GetFont (StateFlags.Normal).Size / 1024 + 3) + "px");
-            html = html.Replace ("<!-- $body-color -->", SparkleUIHelpers.RGBAToHex (StyleContext.GetColor (StateFlags.Normal)));
-            html = html.Replace ("<!-- $body-background-color -->",
-                SparkleUIHelpers.RGBAToHex (new TreeView ().StyleContext.GetBackgroundColor (StateFlags.Normal)));
-
+            html = html.Replace ("<!-- $body-color -->", UserInterfaceHelpers.RGBAToHex (StyleContext.GetColor (StateFlags.Normal)));
+            html = html.Replace ("<!-- $body-background-color -->",UserInterfaceHelpers.RGBAToHex (new TreeView ().StyleContext.GetBackgroundColor (StateFlags.Normal)));
             html = html.Replace ("<!-- $day-entry-header-font-size -->", (StyleContext.GetFont (StateFlags.Normal).Size / 1024 + 3) + "px");
-            html = html.Replace ("<!-- $day-entry-header-background-color -->",
-                SparkleUIHelpers.RGBAToHex (StyleContext.GetBackgroundColor (StateFlags.Normal)));
-
-            html = html.Replace ("<!-- $secondary-font-color -->", SparkleUIHelpers.RGBAToHex (StyleContext.GetColor (StateFlags.Insensitive)));
-
-            html = html.Replace ("<!-- $small-color -->", SparkleUIHelpers.RGBAToHex (StyleContext.GetColor (StateFlags.Insensitive)));
+            html = html.Replace ("<!-- $day-entry-header-background-color -->", UserInterfaceHelpers.RGBAToHex (StyleContext.GetBackgroundColor (StateFlags.Normal)));
+            html = html.Replace ("<!-- $secondary-font-color -->", UserInterfaceHelpers.RGBAToHex (StyleContext.GetColor (StateFlags.Insensitive)));
+            html = html.Replace ("<!-- $small-color -->", UserInterfaceHelpers.RGBAToHex (StyleContext.GetColor (StateFlags.Insensitive)));
             html = html.Replace ("<!-- $small-font-size -->", "90%");
-
             html = html.Replace ("<!-- $pixmaps-path -->", pixmaps_path);
-			html = html.Replace ("<!-- $document-added-background-image -->", "file://" + new string [] {icons_path, "document-added.png"}.Combine ());
-            html = html.Replace ("<!-- $document-edited-background-image -->", "file://" + new string [] {icons_path, "document-edited.png"}.Combine ());
-            html = html.Replace ("<!-- $document-deleted-background-image -->", "file://" + new string [] {icons_path, "document-deleted.png"}.Combine ());
-            html = html.Replace ("<!-- $document-moved-background-image -->", "file://" + new string [] {icons_path, "document-moved.png"}.Combine ());
-                    
-            this.spinner.Stop ();
-            this.scrolled_window.Remove (this.web_view);
-            this.web_view.Dispose ();
+            html = html.Replace ("<!-- $document-added-background-image -->", "file://" + IO.Path.Combine (icons_path, "document-added.png"));
+            html = html.Replace ("<!-- $document-edited-background-image -->", "file://" + IO.Path.Combine (icons_path, "document-edited.png"));
+            html = html.Replace ("<!-- $document-deleted-background-image -->", "file://" + IO.Path.Combine (icons_path, "document-deleted.png"));
+            html = html.Replace ("<!-- $document-moved-background-image -->", "file://" + IO.Path.Combine (icons_path, "document-moved.png"));
+
+            this.spinner.Stop ();
+            this.scrolled_window.Remove (this.scrolled_window.Child);
+
+            this.web_view.LoadHtml (html, "file:///");
 
-            this.web_view = new WebView () { Editable = false };
-            this.web_view.LoadString (html, "text/html", "UTF-8", "file://");
-            this.web_view.NavigationRequested += WebViewNavigationRequested;
             this.scrolled_window.Add (this.web_view);
 
             this.content_wrapper.Remove (this.content_wrapper.Child);
             this.content_wrapper.Add (this.scrolled_window);
+
             this.scrolled_window.ShowAll ();
         }
 
 
-        private void WebViewNavigationRequested (object o, WebKit.NavigationRequestedArgs args) {
-            Controller.LinkClicked (args.Request.Uri);
+        WebView CreateWebView ()
+        {
+            var web_view = new SparkleWebView { Editable = false };
+            web_view.Settings.EnablePlugins = false;
 
-            // Don't follow HREFs (as this would cause a page refresh)
-            if (!args.Request.Uri.Equals ("file:"))
-                args.RetVal = 1;
+            web_view.LinkClicked += Controller.LinkClicked;
+
+            return web_view;
+        }
+
+
+        class SparkleWebView : WebView {
+
+            public event LinkClickedHandler LinkClicked = delegate { };
+            public delegate void LinkClickedHandler (string href);
+
+
+            protected override bool OnDecidePolicy (PolicyDecision decision, PolicyDecisionType decision_type)
+            {
+                if (decision_type != PolicyDecisionType.NavigationAction) {
+                    decision.Use ();
+                    return false;
+                }
+
+                #pragma warning disable 0612
+                string uri = (decision as NavigationPolicyDecision).Request.Uri;
+
+                if (uri.Equals ("file:///")) {
+                    decision.Use ();
+                    return false;
+                }
+
+                LinkClicked (uri);
+                decision.Ignore ();
+
+                return true;
+            }
         }
     }
 }
-