diff --git a/Makefile.am b/Makefile.am index 47f3b20f..d2771fea 100755 --- a/Makefile.am +++ b/Makefile.am @@ -5,13 +5,12 @@ DIST_SUBDIRS = $(basedirs) SparkleShare EXTRA_DIST = \ News.txt \ - README.md \ + 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 + SparkleShare/Linux/org.sparkleshare.SparkleShare.appdata.xml DISTCLEANFILES = \ intltool-extract \ diff --git a/SparkleLib/AuthenticationInfo/AuthenticationInfo.cs b/SparkleLib/AuthenticationInfo.cs similarity index 100% rename from SparkleLib/AuthenticationInfo/AuthenticationInfo.cs rename to SparkleLib/AuthenticationInfo.cs diff --git a/SparkleLib/Fetcher/BaseFetcher.cs b/SparkleLib/BaseFetcher.cs similarity index 100% rename from SparkleLib/Fetcher/BaseFetcher.cs rename to SparkleLib/BaseFetcher.cs diff --git a/SparkleLib/Listener/BaseListener.cs b/SparkleLib/BaseListener.cs similarity index 83% rename from SparkleLib/Listener/BaseListener.cs rename to SparkleLib/BaseListener.cs index d996f8de..2174517f 100755 --- a/SparkleLib/Listener/BaseListener.cs +++ b/SparkleLib/BaseListener.cs @@ -38,7 +38,7 @@ namespace SparkleLib { public delegate void DisconnectedEventHandler (DisconnectReason reason); public event AnnouncementReceivedEventHandler AnnouncementReceived = delegate { }; - public delegate void AnnouncementReceivedEventHandler (SparkleAnnouncement announcement); + public delegate void AnnouncementReceivedEventHandler (Announcement announcement); public readonly Uri Server; @@ -47,7 +47,7 @@ namespace SparkleLib { public abstract bool IsConnecting { get; } - protected abstract void AnnounceInternal (SparkleAnnouncement announcent); + protected abstract void AnnounceInternal (Announcement announcent); protected abstract void AlsoListenToInternal (string folder_identifier); protected List channels = new List (); @@ -55,10 +55,10 @@ namespace SparkleLib { private int max_recent_announcements = 10; - private Dictionary> recent_announcements = - new Dictionary> (); + private Dictionary> recent_announcements = + new Dictionary> (); - private Dictionary queue_up = new Dictionary (); + private Dictionary queue_up = new Dictionary (); private Timer reconnect_timer = new Timer { Interval = 60 * 1000, @@ -81,7 +81,7 @@ namespace SparkleLib { Reconnect (); } - public void Announce (SparkleAnnouncement announcement) + public void Announce (Announcement announcement) { if (!IsRecentAnnouncement (announcement)) { if (IsConnected) { @@ -135,8 +135,8 @@ namespace SparkleLib { if (this.queue_up.Count > 0) { Logger.LogInfo ("Listener", "Delivering " + this.queue_up.Count + " queued messages..."); - foreach (KeyValuePair item in this.queue_up) { - SparkleAnnouncement announcement = item.Value; + foreach (KeyValuePair item in this.queue_up) { + Announcement announcement = item.Value; Announce (announcement); } } @@ -150,7 +150,7 @@ namespace SparkleLib { } - public void OnAnnouncement (SparkleAnnouncement announcement) + public void OnAnnouncement (Announcement announcement) { Logger.LogInfo ("Listener", "Got message " + announcement.Message + " from " + announcement.FolderIdentifier + " on " + Server); @@ -176,13 +176,13 @@ namespace SparkleLib { } - private bool IsRecentAnnouncement (SparkleAnnouncement announcement) + private bool IsRecentAnnouncement (Announcement announcement) { if (!this.recent_announcements.ContainsKey (announcement.FolderIdentifier)) { return false; } else { - foreach (SparkleAnnouncement recent_announcement in GetRecentAnnouncements (announcement.FolderIdentifier)) { + foreach (Announcement recent_announcement in GetRecentAnnouncements (announcement.FolderIdentifier)) { if (recent_announcement.Message.Equals (announcement.Message)) return true; } @@ -192,18 +192,18 @@ namespace SparkleLib { } - private List GetRecentAnnouncements (string folder_identifier) + private List GetRecentAnnouncements (string folder_identifier) { if (!this.recent_announcements.ContainsKey (folder_identifier)) - this.recent_announcements [folder_identifier] = new List (); + this.recent_announcements [folder_identifier] = new List (); return this.recent_announcements [folder_identifier]; } - private void AddRecentAnnouncement (SparkleAnnouncement announcement) + private void AddRecentAnnouncement (Announcement announcement) { - List recent_announcements = + List recent_announcements = GetRecentAnnouncements (announcement.FolderIdentifier); if (!IsRecentAnnouncement (announcement)) diff --git a/SparkleLib/Repository/BaseRepository.cs b/SparkleLib/BaseRepository.cs similarity index 97% rename from SparkleLib/Repository/BaseRepository.cs rename to SparkleLib/BaseRepository.cs index 057af0c2..bbc9a354 100644 --- a/SparkleLib/Repository/BaseRepository.cs +++ b/SparkleLib/BaseRepository.cs @@ -59,7 +59,7 @@ namespace SparkleLib { public abstract double HistorySize { get; } public abstract List ExcludePaths { get; } - public abstract List UnsyncedChanges { get; } + public abstract List UnsyncedChanges { get; } public abstract List GetChangeSets (); public abstract List GetChangeSets (string path); @@ -373,7 +373,7 @@ namespace SparkleLib { HasUnsyncedChanges = false; this.poll_interval = PollInterval.Long; - this.listener.Announce (new SparkleAnnouncement (Identifier, CurrentRevision)); + this.listener.Announce (new Announcement (Identifier, CurrentRevision)); Status = SyncStatus.Idle; SyncStatusChanged (Status); @@ -388,7 +388,7 @@ namespace SparkleLib { if (Error == ErrorStatus.None && SyncUp ()) { HasUnsyncedChanges = false; - this.listener.Announce (new SparkleAnnouncement (Identifier, CurrentRevision)); + this.listener.Announce (new Announcement (Identifier, CurrentRevision)); Status = SyncStatus.Idle; SyncStatusChanged (Status); @@ -437,7 +437,7 @@ namespace SparkleLib { bool emit_change_event = true; - foreach (SparkleChange change in ChangeSets [0].Changes) { + foreach (Change change in ChangeSets [0].Changes) { if (change.Path.EndsWith (".sparkleshare")) { emit_change_event = false; break; @@ -538,7 +538,7 @@ namespace SparkleLib { } - private void ListenerAnnouncementReceivedDelegate (SparkleAnnouncement announcement) + private void ListenerAnnouncementReceivedDelegate (Announcement announcement) { string identifier = Identifier; diff --git a/SparkleLib/Repository/ChangeSet.cs b/SparkleLib/ChangeSet.cs similarity index 82% rename from SparkleLib/Repository/ChangeSet.cs rename to SparkleLib/ChangeSet.cs index 764d6b36..cbe71062 100644 --- a/SparkleLib/Repository/ChangeSet.cs +++ b/SparkleLib/ChangeSet.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; namespace SparkleLib { - public enum SparkleChangeType { + public enum ChangeType { Added, Edited, Deleted, @@ -39,16 +39,16 @@ namespace SparkleLib { public DateTime FirstTimestamp; public Uri RemoteUrl; - public List Changes = new List (); + public List Changes = new List (); public string ToMessage () { string message = "added: {0}"; switch (Changes [0].Type) { - case SparkleChangeType.Edited: message = "edited: {0}"; break; - case SparkleChangeType.Deleted: message = "deleted: {0}"; break; - case SparkleChangeType.Moved: message = "moved: {0}"; break; + case ChangeType.Edited: message = "edited: {0}"; break; + case ChangeType.Deleted: message = "deleted: {0}"; break; + case ChangeType.Moved: message = "moved: {0}"; break; } if (Changes.Count > 0) @@ -59,9 +59,9 @@ namespace SparkleLib { } - public class SparkleChange { + public class Change { - public SparkleChangeType Type; + public ChangeType Type; public DateTime Timestamp; public bool IsFolder = false; @@ -94,13 +94,13 @@ namespace SparkleLib { } - public class SparkleAnnouncement { + public class Announcement { public readonly string FolderIdentifier; public readonly string Message; - public SparkleAnnouncement (string folder_identifier, string message) + public Announcement (string folder_identifier, string message) { FolderIdentifier = folder_identifier; Message = message; diff --git a/SparkleLib/Defines.cs b/SparkleLib/Defines.cs deleted file mode 100644 index 8d3ab42e..00000000 --- a/SparkleLib/Defines.cs +++ /dev/null @@ -1,30 +0,0 @@ -// SparkleShare, a collaboration and sharing tool. -// Copyright (C) 2010 Hylke Bons -// -// 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 . - - -using System; -using System.Reflection; - -[assembly:AssemblyTitle ("SparkleLib")] -[assembly:AssemblyVersion ("2.0")] -[assembly:AssemblyCopyright ("Copyright (c) 2010 Hylke Bons and others")] - -namespace SparkleLib { - - public class Defines { - public const string INSTALL_DIR = "/app/share/sparkleshare"; - } -} diff --git a/SparkleLib/Git/GitRepository.cs b/SparkleLib/Git/GitRepository.cs index ef099559..e8a5e2b6 100644 --- a/SparkleLib/Git/GitRepository.cs +++ b/SparkleLib/Git/GitRepository.cs @@ -705,7 +705,7 @@ namespace SparkleLib.Git { } - public override List UnsyncedChanges { + public override List UnsyncedChanges { get { return ParseStatus (); } @@ -835,11 +835,11 @@ namespace SparkleLib.Git { file_path = file_path.Replace ("\\\"", "\""); - SparkleChange change = new SparkleChange () { + Change change = new Change () { Path = file_path, IsFolder = change_is_folder, Timestamp = change_set.Timestamp, - Type = SparkleChangeType.Added + Type = ChangeType.Added }; if (type_letter.Equals ("R")) { @@ -878,13 +878,13 @@ namespace SparkleLib.Git { change.Path = file_path; change.MovedToPath = to_file_path; - change.Type = SparkleChangeType.Moved; + change.Type = ChangeType.Moved; } else if (type_letter.Equals ("M")) { - change.Type = SparkleChangeType.Edited; + change.Type = ChangeType.Edited; } else if (type_letter.Equals ("D")) { - change.Type = SparkleChangeType.Deleted; + change.Type = ChangeType.Deleted; } change_set.Changes.Add (change); @@ -917,17 +917,17 @@ namespace SparkleLib.Git { } else { // Don't show removals or moves in the revision list of a file if (path != null) { - List changes_to_skip = new List (); + List changes_to_skip = new List (); - foreach (SparkleChange change in change_set.Changes) { - if ((change.Type == SparkleChangeType.Deleted || change.Type == SparkleChangeType.Moved) + foreach (Change change in change_set.Changes) { + if ((change.Type == ChangeType.Deleted || change.Type == ChangeType.Moved) && change.Path.Equals (path)) { changes_to_skip.Add (change); } } - foreach (SparkleChange change_to_skip in changes_to_skip) + foreach (Change change_to_skip in changes_to_skip) change_set.Changes.Remove (change_to_skip); } @@ -1028,9 +1028,9 @@ namespace SparkleLib.Git { - private List ParseStatus () + private List ParseStatus () { - List changes = new List (); + List changes = new List (); GitCommand git_status = new GitCommand (LocalPath, "status --porcelain"); git_status.Start (); @@ -1042,28 +1042,28 @@ namespace SparkleLib.Git { if (line.EndsWith (".empty") || line.EndsWith (".empty\"")) line = line.Replace (".empty", ""); - SparkleChange change; + Change change; if (line.StartsWith ("R")) { string path = line.Substring (3, line.IndexOf (" -> ") - 3).Trim ("\" ".ToCharArray ()); string moved_to_path = line.Substring (line.IndexOf (" -> ") + 4).Trim ("\" ".ToCharArray ()); - change = new SparkleChange () { - Type = SparkleChangeType.Moved, + change = new Change () { + Type = ChangeType.Moved, Path = EnsureSpecialCharacters (path), MovedToPath = EnsureSpecialCharacters (moved_to_path) }; } else { string path = line.Substring (2).Trim ("\" ".ToCharArray ()); - change = new SparkleChange () { Path = EnsureSpecialCharacters (path) }; - change.Type = SparkleChangeType.Added; + change = new Change () { Path = EnsureSpecialCharacters (path) }; + change.Type = ChangeType.Added; if (line.StartsWith ("M")) { - change.Type = SparkleChangeType.Edited; + change.Type = ChangeType.Edited; } else if (line.StartsWith ("D")) { - change.Type = SparkleChangeType.Deleted; + change.Type = ChangeType.Deleted; } } @@ -1082,19 +1082,19 @@ namespace SparkleLib.Git { { string message = ""; - foreach (SparkleChange change in ParseStatus ()) { - if (change.Type == SparkleChangeType.Moved) { + foreach (Change change in ParseStatus ()) { + if (change.Type == ChangeType.Moved) { message += "< ‘" + EnsureSpecialCharacters (change.Path) + "’\n"; message += "> ‘" + EnsureSpecialCharacters (change.MovedToPath) + "’\n"; } else { - if (change.Type == SparkleChangeType.Edited) { + if (change.Type == ChangeType.Edited) { message += "/"; - } else if (change.Type == SparkleChangeType.Deleted) { + } else if (change.Type == ChangeType.Deleted) { message += "-"; - } else if (change.Type == SparkleChangeType.Added) { + } else if (change.Type == ChangeType.Added) { message += "+"; } diff --git a/SparkleLib/Git/Makefile.am b/SparkleLib/Git/Makefile.am index 5d516405..c376b41e 100755 --- a/SparkleLib/Git/Makefile.am +++ b/SparkleLib/Git/Makefile.am @@ -4,9 +4,9 @@ TARGET = library LINK = -r:$(DIR_BIN)/SparkleLib.dll SOURCES = \ - SparkleGit.cs \ - SparkleFetcherGit.cs \ - SparkleRepoGit.cs + GitCommand.cs \ + GitFetcher.cs \ + GitRepository.cs install-data-hook: diff --git a/SparkleLib/Listener/ListenerFactory.cs b/SparkleLib/ListenerFactory.cs similarity index 100% rename from SparkleLib/Listener/ListenerFactory.cs rename to SparkleLib/ListenerFactory.cs diff --git a/SparkleLib/Makefile.am b/SparkleLib/Makefile.am index c7d34e6f..9e2ec19a 100755 --- a/SparkleLib/Makefile.am +++ b/SparkleLib/Makefile.am @@ -9,8 +9,9 @@ SOURCES = \ BaseFetcher.cs \ BaseListener.cs \ BaseRepository.cs \ + ChangeSet.cs \ Command.cs \ - Config.cs \ + Configuration.cs \ Extensions.cs \ ListenerFactory.cs \ Logger.cs \ @@ -18,8 +19,7 @@ SOURCES = \ SSHFetcher.cs \ TcpListener.cs \ User.cs \ - Watcher.cs \ - Wrappers.cs + Watcher.cs install-data-hook: for ASM in $(EXTRA_BUNDLE); do \ diff --git a/SparkleLib/AuthenticationInfo/SSHAuthenticationInfo.cs b/SparkleLib/SSHAuthenticationInfo.cs similarity index 100% rename from SparkleLib/AuthenticationInfo/SSHAuthenticationInfo.cs rename to SparkleLib/SSHAuthenticationInfo.cs diff --git a/SparkleLib/Fetcher/SSHFetcher.cs b/SparkleLib/SSHFetcher.cs similarity index 100% rename from SparkleLib/Fetcher/SSHFetcher.cs rename to SparkleLib/SSHFetcher.cs diff --git a/SparkleLib/SparkleLib.csproj b/SparkleLib/SparkleLib.csproj index 0a9b37de..5c8c84b9 100644 --- a/SparkleLib/SparkleLib.csproj +++ b/SparkleLib/SparkleLib.csproj @@ -38,17 +38,39 @@ - - - - - - - - - - - + + Fetcher\SSHFetcher.cs + + + Fetcher\BaseFetcher.cs + + + Listener\TcpListener.cs + + + Listener\BaseListener.cs + + + Listener\ListenerFactory.cs + + + AuthenticationInfo\SSHAuthenticationInfo.cs + + + AuthenticationInfo\AuthenticationInfo.cs + + + Repository\BaseRepository.cs + + + Repository\ChangeSet.cs + + + Repository\User.cs + + + Repository\Watcher.cs + diff --git a/SparkleLib/SparkleLib.sln b/SparkleLib/SparkleLib.sln deleted file mode 100755 index bd1d8588..00000000 --- a/SparkleLib/SparkleLib.sln +++ /dev/null @@ -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 diff --git a/SparkleLib/Listener/TcpListener.cs b/SparkleLib/TcpListener.cs similarity index 97% rename from SparkleLib/Listener/TcpListener.cs rename to SparkleLib/TcpListener.cs index 544cd9db..e125154c 100644 --- a/SparkleLib/Listener/TcpListener.cs +++ b/SparkleLib/TcpListener.cs @@ -171,7 +171,7 @@ namespace SparkleLib { // We have a message! if (!folder_identifier.Equals ("debug") && !string.IsNullOrEmpty (message)) - OnAnnouncement (new SparkleAnnouncement (folder_identifier, message)); + OnAnnouncement (new Announcement (folder_identifier, message)); } } catch (SocketException e) { @@ -216,7 +216,7 @@ namespace SparkleLib { } - protected override void AnnounceInternal (SparkleAnnouncement announcement) + protected override void AnnounceInternal (Announcement announcement) { string to_send = "announce " + announcement.FolderIdentifier + " " + announcement.Message + "\n"; diff --git a/SparkleLib/Repository/User.cs b/SparkleLib/User.cs similarity index 100% rename from SparkleLib/Repository/User.cs rename to SparkleLib/User.cs diff --git a/SparkleLib/Repository/Watcher.cs b/SparkleLib/Watcher.cs similarity index 92% rename from SparkleLib/Repository/Watcher.cs rename to SparkleLib/Watcher.cs index bb99b553..d25a688a 100755 --- a/SparkleLib/Repository/Watcher.cs +++ b/SparkleLib/Watcher.cs @@ -15,7 +15,6 @@ // along with this program. If not, see . -using System; using System.IO; namespace SparkleLib { @@ -25,7 +24,7 @@ namespace SparkleLib { public event ChangeEventEventHandler ChangeEvent = delegate { }; public delegate void ChangeEventEventHandler (FileSystemEventArgs args); - private object thread_lock = new object (); + object thread_lock = new object (); public Watcher (string path) : base (path) @@ -41,7 +40,7 @@ namespace SparkleLib { } - private void OnChanged (object sender, FileSystemEventArgs args) + void OnChanged (object sender, FileSystemEventArgs args) { ChangeEvent (args); } diff --git a/SparkleShare/Common/EventLogController.cs b/SparkleShare/Common/EventLogController.cs index 82886e0f..ba4a5cb4 100644 --- a/SparkleShare/Common/EventLogController.cs +++ b/SparkleShare/Common/EventLogController.cs @@ -435,8 +435,8 @@ namespace SparkleShare { foreach (ChangeSet change_set in activity_day) { string event_entry = "
"; - 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 += "
"; if (!change.IsFolder) { diff --git a/SparkleShare/Common/StatusIconController.cs b/SparkleShare/Common/StatusIconController.cs index f9610192..16bda33a 100644 --- a/SparkleShare/Common/StatusIconController.cs +++ b/SparkleShare/Common/StatusIconController.cs @@ -89,17 +89,17 @@ namespace SparkleShare { Dictionary changes_info = new Dictionary (); 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; } } diff --git a/SparkleShare/Linux/Makefile.am b/SparkleShare/Linux/Makefile.am index 24c6b982..51dc6a32 100644 --- a/SparkleShare/Linux/Makefile.am +++ b/SparkleShare/Linux/Makefile.am @@ -10,7 +10,7 @@ BUILD_DEFINES = "-define:HAVE_APP_INDICATOR" endif SOURCES = \ - ../Common/Program.cs \ + ../Common/SparkleShare.cs \ ../Common/AboutController.cs \ ../Common/Avatars.cs \ ../Common/BubblesController.cs \ @@ -38,7 +38,7 @@ bin_SCRIPTS = sparkleshare Applicationsdir = $(datadir)/applications dist_Applications_DATA = org.sparkleshare.SparkleShare.desktop \ - org.sparkleshare.SparkleShare.InviteOpener.desktop + org.sparkleshare.SparkleShare.Invites.desktop install-data-hook: test -f $(datadir)/applications/defaults.list && \ diff --git a/SparkleShare/Linux/SparkleShare.Linux.csproj b/SparkleShare/Linux/SparkleShare.Linux.csproj new file mode 100644 index 00000000..14726223 --- /dev/null +++ b/SparkleShare/Linux/SparkleShare.Linux.csproj @@ -0,0 +1,299 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC} + {948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Exe + SparkleShare + SparkleShare + + + True + True + + + none + False + bin\Release + prompt + 4 + + + + + + False + False + False + false + False + false + false + false + + + False + bin\Debug + DEBUG + prompt + 4 + + + + + + False + False + False + false + False + true + false + false + false + + + false + bin\ReleaseDist + 4 + false + false + false + + + + + + + false + false + false + false + + + + + + + + + ..\..\..\monomac\src\MonoMac.dll + + + + + MainMenu.xib + + + MainMenu.xib + + + SparkleShare.cs + + + + Plugin.cs + + + Invite.cs + + + + Controllers\AboutController.cs + + + Controllers\BubblesController.cs + + + Controllers\EventLogController.cs + + + Controllers\NoteController.cs + + + Controllers\SetupController.cs + + + Controllers\StatusIconController.cs + + + + + + + + + + + + Controllers\BaseController.cs + + + + + + + + + + + + + HTML\day-entry.html + + + HTML\event-entry.html + + + HTML\event-log.html + + + Resources\sparkleshare-folder.icns + + + Resources\sparkleshare-app.icns + + + HTML\jquery.js + + + Resources\sparkleshare-folder-yosemite.icns + + + + + + + + + + + + {2C914413-B31C-4362-93C7-1AE34F09112A} + SparkleLib + + + {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE} + SparkleLib.Git + + + + + Resources\side-splash.png + + + Resources\document-added-12.png + + + Resources\document-edited-12.png + + + Resources\document-deleted-12.png + + + Resources\document-moved-12.png + + + Resources\about.png + + + Resources\tutorial-slide-3.png + + + + + + + + Resources\user-icon-default.png + + + Resources\side-splash%402x.png + + + + + + + + Resources\about%402x.png + + + Resources\tutorial-slide-1.png + + + Resources\tutorial-slide-1%402x.png + + + Resources\tutorial-slide-2.png + + + Resources\tutorial-slide-2%402x.png + + + Plugins\bitbucket%402x.png + + + Plugins\github%402x.png + + + Plugins\gitorious%402x.png + + + Plugins\own-server%402x.png + + + Plugins\ssnet%402x.png + + + Plugins\bitbucket.xml + + + Plugins\github.xml + + + Plugins\gitorious.xml + + + Plugins\own-server.xml + + + Plugins\bitbucket.png + + + Plugins\github.png + + + Plugins\gitorious.png + + + Plugins\own-server.png + + + Plugins\ssnet.png + + + Plugins\ssnet.xml + + + + Plugins\planio.png + + + Plugins\planio.xml + + + Plugins\planio%402x.png + + + Resources\text-balloon.png + + + Resources\text-balloon%402x.png + + + diff --git a/SparkleShare/Linux/org.sparkleshare.SparkleShare.InviteOpener.desktop b/SparkleShare/Linux/org.sparkleshare.SparkleShare.Invites.desktop similarity index 100% rename from SparkleShare/Linux/org.sparkleshare.SparkleShare.InviteOpener.desktop rename to SparkleShare/Linux/org.sparkleshare.SparkleShare.Invites.desktop diff --git a/SparkleShare/Linux/sparkleshare.appdata.xml b/SparkleShare/Linux/org.sparkleshare.SparkleShare.appdata.xml similarity index 95% rename from SparkleShare/Linux/sparkleshare.appdata.xml rename to SparkleShare/Linux/org.sparkleshare.SparkleShare.appdata.xml index 6df28d1d..a1f51d6d 100644 --- a/SparkleShare/Linux/sparkleshare.appdata.xml +++ b/SparkleShare/Linux/org.sparkleshare.SparkleShare.appdata.xml @@ -1,6 +1,6 @@ - sparkleshare.desktop + org.sparkleshare.SparkleShare.desktop CC0-1.0 GPL-3.0 SparkleShare @@ -25,3 +25,4 @@ http://www.sparkleshare.org/ + diff --git a/SparkleShare/Mac/Controller.cs b/SparkleShare/Mac/Controllers/Controller.cs similarity index 100% rename from SparkleShare/Mac/Controller.cs rename to SparkleShare/Mac/Controllers/Controller.cs diff --git a/SparkleShare/Mac/SparkleShare.Mac.csproj b/SparkleShare/Mac/SparkleShare.Mac.csproj index 8b7521b1..14726223 100644 --- a/SparkleShare/Mac/SparkleShare.Mac.csproj +++ b/SparkleShare/Mac/SparkleShare.Mac.csproj @@ -91,15 +91,10 @@ MainMenu.xib - - BaseController.cs - - SparkleShare.cs - Plugin.cs @@ -132,6 +127,11 @@ + + + + Controllers\BaseController.cs + @@ -152,16 +152,16 @@ HTML\event-log.html - sparkleshare-folder.icns + Resources\sparkleshare-folder.icns - sparkleshare-app.icns + Resources\sparkleshare-app.icns HTML\jquery.js - sparkleshare-folder-yosemite.icns + Resources\sparkleshare-folder-yosemite.icns diff --git a/SparkleShare/Mac/UserInterface.cs b/SparkleShare/Mac/UserInterface/UserInterface.cs similarity index 100% rename from SparkleShare/Mac/UserInterface.cs rename to SparkleShare/Mac/UserInterface/UserInterface.cs diff --git a/SparkleShare/Mac/git.version b/SparkleShare/Mac/git.version deleted file mode 100644 index a4dd9dba..00000000 --- a/SparkleShare/Mac/git.version +++ /dev/null @@ -1 +0,0 @@ -2.7.4 diff --git a/SparkleShare/Mac/SparkleShare.sln b/SparkleShare/SparkleShare.sln similarity index 73% rename from SparkleShare/Mac/SparkleShare.sln rename to SparkleShare/SparkleShare.sln index 06828817..7a25902b 100644 --- a/SparkleShare/Mac/SparkleShare.sln +++ b/SparkleShare/SparkleShare.sln @@ -1,11 +1,13 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Mac", "SparkleShare.Mac.csproj", "{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Linux", "Linux\SparkleShare.Linux.csproj", "{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "..\..\SparkleLib\SparkleLib.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "..\SparkleLib\SparkleLib.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib.Git", "..\..\SparkleLib\Git\SparkleLib.Git.csproj", "{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib.Git", "..\SparkleLib\Git\SparkleLib.Git.csproj", "{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Windows", "Windows\SparkleShare.Windows.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -32,6 +34,12 @@ Global {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Release|Any CPU.Build.0 = Release|Any CPU {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.ReleaseDist|Any CPU.ActiveCfg = ReleaseDist|Any CPU {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.ReleaseDist|Any CPU.Build.0 = ReleaseDist|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}.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}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU + {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.Windows.csproj similarity index 98% rename from SparkleShare/Windows/SparkleShare.csproj rename to SparkleShare/Windows/SparkleShare.Windows.csproj index b1e4bfdc..98c8de9c 100644 --- a/SparkleShare/Windows/SparkleShare.csproj +++ b/SparkleShare/Windows/SparkleShare.Windows.csproj @@ -280,11 +280,11 @@ - {7f0db8d0-e278-4955-8204-fc391b99f7c1} + {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE} SparkleLib.Git - {748f6316-37b4-46fd-a011-af073bc7c02d} + {2C914413-B31C-4362-93C7-1AE34F09112A} SparkleLib diff --git a/SparkleShare/Windows/SparkleShare.sln b/SparkleShare/Windows/SparkleShare.sln deleted file mode 100644 index 03ee1fd4..00000000 --- a/SparkleShare/Windows/SparkleShare.sln +++ /dev/null @@ -1,49 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30110.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShare.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}" - ProjectSection(ProjectDependencies) = postProject - {1DB5492D-B897-4A5E-8DD7-175EC65F52F2} = {1DB5492D-B897-4A5E-8DD7-175EC65F52F2} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShareInviteOpener", "SparkleShareInviteOpener\SparkleShareInviteOpener.csproj", "{1DB5492D-B897-4A5E-8DD7-175EC65F52F2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "SparkleLib\SparkleLib.csproj", "{748F6316-37B4-46FD-A011-AF073BC7C02D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib.Git", "SparkleLib\Git\SparkleLib.Git.csproj", "{7F0DB8D0-E278-4955-8204-FC391B99F7C1}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {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 - {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DB5492D-B897-4A5E-8DD7-175EC65F52F2}.Release|Any CPU.Build.0 = Release|Any CPU - {748F6316-37B4-46FD-A011-AF073BC7C02D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {748F6316-37B4-46FD-A011-AF073BC7C02D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {748F6316-37B4-46FD-A011-AF073BC7C02D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {748F6316-37B4-46FD-A011-AF073BC7C02D}.Release|Any CPU.Build.0 = Release|Any CPU - {7F0DB8D0-E278-4955-8204-FC391B99F7C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F0DB8D0-E278-4955-8204-FC391B99F7C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F0DB8D0-E278-4955-8204-FC391B99F7C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F0DB8D0-E278-4955-8204-FC391B99F7C1}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = SparkleShare.csproj - version = - outputpath = bin - name = SparkleShare - EndGlobalSection -EndGlobal diff --git a/legal/Trademark.txt b/legal/Trademark.txt deleted file mode 100644 index 8368f91e..00000000 --- a/legal/Trademark.txt +++ /dev/null @@ -1,41 +0,0 @@ -We at SparkleShare love it when people talk about SparkleShare, build -businesses around SparkleShare and produce products that make life -better for SparkleShare users and developers. We do, however, have a -trademark, which we are obliged to protect. The trademark gives us -the exclusive right to use the term to promote websites, services, -businesses and products. Although those rights are exclusively ours, -we are happy to give people permission to use the term under most -circumstances. - -The following is a general policy that tells you when you can refer -to the SparkleShare name and logo without need of any specific -permission from SparkleShare: - -First, you must make clear that you are not SparkleShare and that you -do not represent SparkleShare. A simple disclaimer on your home page -is an excellent way of doing that. - -Second, you may not incorporate the SparkleShare name or logo into -the name or logo of your website, product, business or service. - -Third, you may use the SparkleShare name (but not the SparkleShare -logo) only in descriptions of your website, product, business or -service to provide accurate information to the public about yourself. - -Fourth, you may not use the SparkleShare graphical logo. - -If you would like to use the SparkleShare name or logo for any other -use, please contact us and we’ll discuss a way to make that happen. -We don’t have strong objections to people using the name for their -websites and businesses, but we do need the chance to review such use. -Generally, we approve your use if you agree to a few things, mainly: -(1) our rights to the SparkleShare trademark are valid and superior to -yours and (2) you’ll take appropriate steps to make sure people don’t -confuse your website for ours. In other words, it’s not a big deal, -and a short conversation (usually done via email) should clear -everything up in short order. - -If you currently have a website that is using the SparkleShare name and -you have not gotten permission from us, don’t panic. Let us know, and -we’ll work it out, as described above. -