diff --git a/SparkleShare.sln b/SparkleShare.sln
index 1d7731b6..516668c0 100644
--- a/SparkleShare.sln
+++ b/SparkleShare.sln
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sparkles.Git", "Sparkles\Gi
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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|Any CPU = Release|Any CPU
@@ -40,6 +42,12 @@ Global
{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
+ {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}.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}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU
+ {5714D3CA-88A6-4330-A29D-4CA90D1D193C}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
diff --git a/SparkleShare/Common/BaseController.cs b/SparkleShare/Common/BaseController.cs
index fb6ee5a7..7653d45f 100644
--- a/SparkleShare/Common/BaseController.cs
+++ b/SparkleShare/Common/BaseController.cs
@@ -250,13 +250,13 @@ namespace SparkleShare {
} 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) {
diff --git a/SparkleShare/Linux/Bubbles.cs b/SparkleShare/Linux/Bubbles.cs
index 744fccb5..94699401 100755
--- a/SparkleShare/Linux/Bubbles.cs
+++ b/SparkleShare/Linux/Bubbles.cs
@@ -18,7 +18,7 @@
using System;
using Gtk;
-using Notifications;
+//using Notifications;
using Sparkles;
@@ -27,7 +27,7 @@ namespace SparkleShare {
public class SparkleBubbles {
public SparkleBubblesController Controller = new SparkleBubblesController ();
-
+ /*
public SparkleBubbles ()
{
@@ -60,7 +60,6 @@ namespace SparkleShare {
Logger.LogInfo ("Notification", "Error showing notification: ", e);
}
});
- }
+ }*/
}
}
-
diff --git a/SparkleShare/Linux/EventLog.cs b/SparkleShare/Linux/EventLog.cs
index 3fb9d7ad..002d2ff3 100755
--- a/SparkleShare/Linux/EventLog.cs
+++ b/SparkleShare/Linux/EventLog.cs
@@ -35,7 +35,7 @@ namespace SparkleShare {
private HBox layout_horizontal;
private ScrolledWindow scrolled_window;
private VBox spinner_wrapper;
- private Spinner spinner;
+ // private Spinner spinner;
// private WebView web_view;
private int pos_x, pos_y;
@@ -65,7 +65,7 @@ namespace SparkleShare {
layout_sizes.PackStart (this.history_label, false, false, 0);
VBox layout_vertical = new VBox (false, 0);
- this.spinner = new Spinner ();
+ // this.spinner = new Spinner ();
this.spinner_wrapper = new VBox ();
this.content_wrapper = new EventBox ();
this.scrolled_window = new ScrolledWindow ();
@@ -84,8 +84,8 @@ namespace SparkleShare {
this.spinner_wrapper.PackStart (new Label(""), true, true, 0);
this.spinner_wrapper.PackStart (this.spinner, false, false, 0);
this.spinner_wrapper.PackStart (new Label(""), true, true, 0);
- this.spinner.SetSizeRequest (24, 24);
- this.spinner.Start ();
+ // this.spinner.SetSizeRequest (24, 24);
+ // this.spinner.Start ();
this.content_wrapper.Add (this.spinner_wrapper);
diff --git a/SparkleShare/Linux/Setup.cs b/SparkleShare/Linux/Setup.cs
index 21052081..f2ffb608 100755
--- a/SparkleShare/Linux/Setup.cs
+++ b/SparkleShare/Linux/Setup.cs
@@ -698,7 +698,7 @@ namespace SparkleShare {
private void RenderServiceColumn (TreeViewColumn column, CellRenderer cell,
- ITreeModel model, TreeIter iter)
+ TreeModel model, TreeIter iter)
{
string markup = (string) model.GetValue (iter, 2);
TreeSelection selection = (column.TreeView as TreeView).Selection;
diff --git a/SparkleShare/Linux/SparkleShare.Linux.csproj b/SparkleShare/Linux/SparkleShare.Linux.csproj
index c151da8e..08ccdbb0 100644
--- a/SparkleShare/Linux/SparkleShare.Linux.csproj
+++ b/SparkleShare/Linux/SparkleShare.Linux.csproj
@@ -1,299 +1,129 @@
-
-
-
- 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}
- Sparkles
-
-
- {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}
- Sparkles.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
-
-
- Presets\bitbucket%402x.png
-
-
- Presets\github%402x.png
-
-
- Presets\gitorious%402x.png
-
-
- Presets\own-server%402x.png
-
-
- Presets\ssnet%402x.png
-
-
- Presets\bitbucket.xml
-
-
- Presets\github.xml
-
-
- Presets\gitorious.xml
-
-
- Presets\own-server.xml
-
-
- Presets\bitbucket.png
-
-
- Presets\github.png
-
-
- Presets\gitorious.png
-
-
- Presets\own-server.png
-
-
- Presets\ssnet.png
-
-
- Presets\ssnet.xml
-
-
-
- Presets\planio.png
-
-
- Presets\planio.xml
-
-
- Presets\planio%402x.png
-
-
- Resources\text-balloon.png
-
-
- Resources\text-balloon%402x.png
-
-
-
+
+
+
+ Debug
+ AnyCPU
+ 8.0.30703
+ 2.0
+ {5714D3CA-88A6-4330-A29D-4CA90D1D193C}
+ Exe
+ SparkleShare.Linux
+ SparkleShare.Linux
+ v4.5
+
+
+ true
+ full
+ false
+ bin\Debug
+ DEBUG;
+ prompt
+ 4
+ true
+
+
+ true
+ bin\Release
+ prompt
+ 4
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}
+ Sparkles.Git
+
+
+ {2C914413-B31C-4362-93C7-1AE34F09112A}
+ Sparkles
+
+
+
+
+
+
+
+
+ HTML\day-entry.html
+
+
+ HTML\event-entry.html
+
+
+ HTML\event-log.html
+
+
+ HTML\jquery.js
+
+
+
+
+ UserInterface\Avatars.cs
+
+
+ UserInterface\About.cs
+
+
+ UserInterface\Bubbles.cs
+
+
+ UserInterface\Note.cs
+
+
+ UserInterface\Setup.cs
+
+
+ UserInterface\SetupWindow.cs
+
+
+ UserInterface\StatusIcon.cs
+
+
+ UserInterface\UserInterface.cs
+
+
+ UserInterface\UserInterfaceHelpers.cs
+
+
+ SparkleShare.cs
+
+
+ Controllers\AboutController.cs
+
+
+ Controllers\BaseController.cs
+
+
+ Controllers\BubblesController.cs
+
+
+ Controllers\EventLogController.cs
+
+
+ Controllers\NoteController.cs
+
+
+ Controllers\SetupController.cs
+
+
+ Controllers\StatusIconController.cs
+
+
+ Controllers\Controller.cs
+
+
+ UserInterface\EventLog.cs
+
+
+
+
\ No newline at end of file
diff --git a/SparkleShare/Linux/UserInterfaceHelpers.cs b/SparkleShare/Linux/UserInterfaceHelpers.cs
index 4647d4ef..feb8366c 100755
--- a/SparkleShare/Linux/UserInterfaceHelpers.cs
+++ b/SparkleShare/Linux/UserInterfaceHelpers.cs
@@ -64,7 +64,7 @@ namespace SparkleShare {
}
- public static Gdk.Color RGBAToColor (Gdk.RGBA rgba) {
+ public static Gdk.Color RGBAToColor (Gdk.Rgb rgba) {
return new Gdk.Color () {
Red = (ushort) (rgba.Red * 65535),
Green = (ushort) (rgba.Green * 65535),
@@ -73,7 +73,7 @@ namespace SparkleShare {
}
- public static string RGBAToHex (Gdk.RGBA rgba)
+ public static string RGBAToHex (Gdk.Rgb rgba)
{
return ColorToHex (RGBAToColor (rgba));
}
@@ -92,4 +92,3 @@ namespace SparkleShare {
}
}
}
-
diff --git a/SparkleShare/Mac/SparkleShare.Mac.csproj b/SparkleShare/Mac/SparkleShare.Mac.csproj
index f2183960..146727ae 100644
--- a/SparkleShare/Mac/SparkleShare.Mac.csproj
+++ b/SparkleShare/Mac/SparkleShare.Mac.csproj
@@ -95,10 +95,6 @@
SparkleShare.cs
-
- Invite.cs
-
-
Controllers\AboutController.cs
@@ -129,6 +125,9 @@
Controllers\BaseController.cs
+
+ UserInterface\Avatars.cs
+
diff --git a/SparkleShare/Mac/UserInterface/Setup.cs b/SparkleShare/Mac/UserInterface/Setup.cs
index 70055ca7..79e8d8ae 100644
--- a/SparkleShare/Mac/UserInterface/Setup.cs
+++ b/SparkleShare/Mac/UserInterface/Setup.cs
@@ -20,11 +20,12 @@ using System.Collections.Generic;
using System.Drawing;
using System.IO;
+using Mono.Unix;
using MonoMac.Foundation;
using MonoMac.AppKit;
using MonoMac.WebKit;
-using Mono.Unix;
+using Sparkles;
namespace SparkleShare {
diff --git a/SparkleShare/Common/Invite.cs b/Sparkles/Invite.cs
similarity index 98%
rename from SparkleShare/Common/Invite.cs
rename to Sparkles/Invite.cs
index 4e923855..ecc5cef8 100644
--- a/SparkleShare/Common/Invite.cs
+++ b/Sparkles/Invite.cs
@@ -21,9 +21,7 @@ using System.Net;
using System.Text;
using System.Xml;
-using Sparkles;
-
-namespace SparkleShare {
+namespace Sparkles {
public class SparkleInvite : XmlDocument {
diff --git a/Sparkles/Makefile.am b/Sparkles/Makefile.am
index 08763e72..c5aa0a5e 100755
--- a/Sparkles/Makefile.am
+++ b/Sparkles/Makefile.am
@@ -13,6 +13,7 @@ SOURCES = \
Command.cs \
Configuration.cs \
Extensions.cs \
+ Invite.cs \
ListenerFactory.cs \
Logger.cs \
Preset.cs \
diff --git a/Sparkles/Preset.cs b/Sparkles/Preset.cs
index af8f392e..213ddba3 100644
--- a/Sparkles/Preset.cs
+++ b/Sparkles/Preset.cs
@@ -20,7 +20,7 @@ using System.Xml;
using IO = System.IO;
-namespace SparkleShare {
+namespace Sparkles {
public class Preset : XmlDocument {
diff --git a/Sparkles/Sparkles.csproj b/Sparkles/Sparkles.csproj
index fc3d3488..d34547e8 100644
--- a/Sparkles/Sparkles.csproj
+++ b/Sparkles/Sparkles.csproj
@@ -72,6 +72,7 @@
+