diff --git a/SparkleShare/Mac/AppDelegate.cs b/SparkleShare/Mac/AppDelegate.cs
new file mode 100644
index 00000000..061449d4
--- /dev/null
+++ b/SparkleShare/Mac/AppDelegate.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Drawing;
+using MonoMac.Foundation;
+using MonoMac.AppKit;
+using MonoMac.ObjCRuntime;
+
+namespace test2
+{
+ public partial class AppDelegate : NSApplicationDelegate
+ {
+
+ public AppDelegate ()
+ {
+ }
+
+ public override void FinishedLaunching (NSObject notification)
+ {
+ }
+ }
+}
+
diff --git a/SparkleShare/Mac/SparkleShare/Info.plist b/SparkleShare/Mac/Info.plist
similarity index 77%
rename from SparkleShare/Mac/SparkleShare/Info.plist
rename to SparkleShare/Mac/Info.plist
index 4431992a..dfe7c843 100644
--- a/SparkleShare/Mac/SparkleShare/Info.plist
+++ b/SparkleShare/Mac/Info.plist
@@ -3,12 +3,7 @@
CFBundleIconFile
- sparkleshare.icns
- LSEnvironment
-
- PATH
- /opt/local/bin
-
+ sparkleshare
CFBundleIdentifier
org.sparkleshare.sparkleshare
CFBundleName
@@ -21,7 +16,5 @@
MainMenu
NSPrincipalClass
NSApplication
- LSBackgroundOnly
-
diff --git a/SparkleShare/Mac/MainMenu.xib b/SparkleShare/Mac/MainMenu.xib
new file mode 100644
index 00000000..472b3d05
--- /dev/null
+++ b/SparkleShare/Mac/MainMenu.xib
@@ -0,0 +1,2245 @@
+
+
+
+ 1060
+ 10D2162
+ 762
+ 1038.29
+ 460.00
+
+
+
+
+
+
+
+ 0
+ IBCocoaFramework
+
+
+ YES
+ ../MacCocoaApp.xcodeproj
+ 3
+
+
+
diff --git a/SparkleShare/Mac/SparkleShare/MainMenu.xib.designer.cs b/SparkleShare/Mac/MainMenu.xib.designer.cs
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/MainMenu.xib.designer.cs
rename to SparkleShare/Mac/MainMenu.xib.designer.cs
diff --git a/SparkleShare/Mac/SparkleShare/SparkleIntro.cs b/SparkleShare/Mac/SparkleIntro.cs
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/SparkleIntro.cs
rename to SparkleShare/Mac/SparkleIntro.cs
diff --git a/SparkleShare/Mac/SparkleShare/SparkleLog.cs b/SparkleShare/Mac/SparkleLog.cs
similarity index 99%
rename from SparkleShare/Mac/SparkleShare/SparkleLog.cs
rename to SparkleShare/Mac/SparkleLog.cs
index 02dac934..559ffc1c 100644
--- a/SparkleShare/Mac/SparkleShare/SparkleLog.cs
+++ b/SparkleShare/Mac/SparkleLog.cs
@@ -128,8 +128,7 @@ namespace SparkleShare {
html = html.Replace ("", "#0085cf");
html = html.Replace ("",
"file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "avatar-default.png"));
-
- Console.WriteLine (html);
+
WebView.MainFrame.LoadHtmlString (html, new NSUrl (""));
Update ();
diff --git a/SparkleShare/Mac/SparkleShare/SparkleMacController.cs b/SparkleShare/Mac/SparkleMacController.cs
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/SparkleMacController.cs
rename to SparkleShare/Mac/SparkleMacController.cs
diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj
new file mode 100644
index 00000000..0e736b32
--- /dev/null
+++ b/SparkleShare/Mac/SparkleShare.csproj
@@ -0,0 +1,160 @@
+
+
+
+ Debug
+ AnyCPU
+ 10.0.0
+ 2.0
+ {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}
+ {1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ Exe
+ SparkleShare
+ SparkleShare
+ v4.0
+
+
+ true
+ full
+ false
+ bin\Debug
+ DEBUG
+ prompt
+ 4
+ false
+
+
+ none
+ false
+ bin\Release
+ prompt
+ 4
+ false
+
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+ ..\..\bin\SparkleLib.dll
+
+
+ False
+
+
+ False
+ ..\..\bin\DiffieHellman.dll
+
+
+ False
+ ..\..\bin\GitSharp.Core.dll
+
+
+ False
+ ..\..\bin\GitSharp.dll
+
+
+ False
+ ..\..\bin\Meebey.SmartIrc4net.dll
+
+
+ False
+ ..\..\bin\Org.Mentalis.Security.dll
+
+
+ False
+ ..\..\bin\Tamir.SharpSSH.dll
+
+
+
+
+ MainMenu.xib
+
+
+ MainMenu.xib
+
+
+ SparkleController.cs
+
+
+
+
+
+
+
+
+ SparkleShare.cs
+
+
+
+
+
+
+
+
+
+
+
+
+ HTML\day-entry.html
+
+
+ HTML\event-entry.html
+
+
+ HTML\event-log.html
+
+
+ Pixmaps\side-splash.png
+
+
+ Pixmaps\avatar-default.png
+
+
+ sparkleshare-mac.icns
+
+
+ sparkleshare.icns
+
+
+ Pixmaps\idle-active.png
+
+
+ Pixmaps\idle.png
+
+
+ Pixmaps\idle0.png
+
+
+ Pixmaps\idle1.png
+
+
+ Pixmaps\idle2.png
+
+
+ Pixmaps\idle3.png
+
+
+ Pixmaps\idle4.png
+
+
+
+
+
+
+
diff --git a/SparkleShare/Mac/SparkleShare.sln b/SparkleShare/Mac/SparkleShare.sln
new file mode 100644
index 00000000..3f1a6c09
--- /dev/null
+++ b/SparkleShare/Mac/SparkleShare.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShare.csproj", "{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(MonoDevelopProperties) = preSolution
+ StartupItem = SparkleShare.csproj
+ EndGlobalSection
+EndGlobal
diff --git a/SparkleShare/Mac/SparkleShare/Layout.cs b/SparkleShare/Mac/SparkleShare/Layout.cs
deleted file mode 100644
index 56bccafd..00000000
--- a/SparkleShare/Mac/SparkleShare/Layout.cs
+++ /dev/null
@@ -1,298 +0,0 @@
-//
-// Layout.cs
-//
-// Author:
-// Michael Hutchinson
-//
-// Copyright (c) 2010 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using MonoMac.AppKit;
-using System.Linq;
-namespace MonoDevelop.Platform.Mac
-{
- interface ILayout
- {
- LayoutRequest BeginLayout ();
- void EndLayout (LayoutRequest request, PointF origin, SizeF allocation);
- }
-
- class LayoutRequest
- {
- public SizeF Size { get; set; }
- public bool Visible { get; set; }
- public bool ExpandWidth { get; set; }
- public bool ExpandHeight { get; set; }
- }
-
- abstract class LayoutBox : IEnumerable, ILayout
- {
- List children = new List ();
-
- public float Spacing { get; set; }
- public float PadLeft { get; set; }
- public float PadRight { get; set; }
- public float PadTop { get; set; }
- public float PadBottom { get; set; }
- public LayoutAlign Align { get; set; }
-
- public LayoutDirection Direction { get; set; }
-
- public LayoutBox (LayoutDirection direction, float spacing) : this (direction, spacing, 0)
- {
- }
-
- public LayoutBox (LayoutDirection direction, float spacing, float padding)
- {
- PadLeft = PadRight = PadTop = PadBottom = padding;
- this.Direction = direction;
- this.Spacing = spacing;
- this.Align = LayoutAlign.Center;
- }
-
- public int Count { get { return children.Count; } }
-
- bool IsHorizontal { get { return Direction == LayoutDirection.Horizontal; } }
-
- public IEnumerator GetEnumerator ()
- {
- return children.GetEnumerator ();
- }
-
- System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator ()
- {
- return children.GetEnumerator ();
- }
-
- public void Add (ILayout child)
- {
- children.Add (child);
- OnChildAdded (child);
- }
-
- ContainerLayoutRequest request = new ContainerLayoutRequest ();
-
- public virtual LayoutRequest BeginLayout ()
- {
- float width = 0;
- float height = 0;
-
- request.ChildRequests.Clear ();
- request.ChildRequests.AddRange (children.Select (c => c.BeginLayout ()));
-
- foreach (var r in request.ChildRequests) {
- if (!r.Visible)
- continue;
- request.Visible = true;
- if (r.ExpandWidth)
- request.ExpandWidth = true;
- if (r.ExpandHeight)
- request.ExpandHeight = true;
-
- if (IsHorizontal) {
- if (width != 0)
- width += Spacing;
- width += r.Size.Width;
- height = Math.Max (height, r.Size.Height);
- } else {
- if (height != 0)
- height += Spacing;
- height += r.Size.Height;
- width = Math.Max (width, r.Size.Width);
- }
- }
-
- request.Size = new SizeF (width + PadLeft + PadRight, height + PadTop + PadBottom);
- return request;
- }
-
- public virtual void EndLayout (LayoutRequest request, PointF origin, SizeF allocation)
- {
- var childRequests = ((ContainerLayoutRequest) request).ChildRequests;
-
- allocation = new SizeF (allocation.Width - PadLeft - PadRight, allocation.Height - PadBottom - PadTop);
- origin = new PointF (origin.X + PadLeft, origin.Y + PadBottom);
-
- var size = request.Size;
- size.Height -= (PadTop + PadBottom);
- size.Width -= (PadLeft + PadRight);
-
- int wExpandCount = 0;
- int hExpandCount = 0;
- int visibleCount = 0;
- foreach (var childRequest in childRequests) {
- if (childRequest.Visible)
- visibleCount++;
- else
- continue;
- if (childRequest.ExpandWidth)
- wExpandCount++;
- if (childRequest.ExpandHeight)
- hExpandCount++;
- }
-
- float wExpand = 0;
- if (allocation.Width > size.Width) {
- wExpand = allocation.Width - size.Width;
- if (wExpandCount > 0)
- wExpand /= wExpandCount;
- }
- float hExpand = 0;
- if (allocation.Height > size.Height) {
- hExpand = allocation.Height - size.Height;
- if (hExpandCount > 0)
- hExpand /= hExpandCount;
- }
-
- if (Direction == LayoutDirection.Horizontal) {
- float pos = PadLeft;
- if (wExpandCount == 0) {
- if (Align == LayoutAlign.End)
- pos += wExpand;
- else if (Align == LayoutAlign.Center)
- pos += wExpand / 2;
- }
- for (int i = 0; i < childRequests.Count; i++) {
- var child = children[i];
- var childReq = childRequests[i];
- if (!childReq.Visible)
- continue;
-
- var childSize = new SizeF (childReq.Size.Width, allocation.Height);
- if (childReq.ExpandWidth) {
- childSize.Width += wExpand;
- } else if (hExpandCount == 0 && Align == LayoutAlign.Fill) {
- childSize.Width += wExpand / visibleCount;
- }
-
- child.EndLayout (childReq, new PointF (pos, origin.Y), childSize);
- pos += childSize.Width + Spacing;
- }
- } else {
- float pos = PadBottom;
- if (hExpandCount == 0) {
- if (Align == LayoutAlign.End)
- pos += hExpand;
- else if (Align == LayoutAlign.Center)
- pos += hExpand / 2;
- }
- for (int i = 0; i < childRequests.Count; i++) {
- var child = children[i];
- var childReq = childRequests[i];
- if (!childReq.Visible)
- continue;
-
- var childSize = new SizeF (allocation.Width, childReq.Size.Height);
- if (childReq.ExpandHeight) {
- childSize.Height += hExpand;
- } else if (hExpandCount == 0 && Align == LayoutAlign.Fill) {
- childSize.Height += hExpand / visibleCount;
- }
-
- child.EndLayout (childReq, new PointF (origin.X, pos), childSize);
- pos += childSize.Height + Spacing;
- }
- }
- }
-
- protected abstract void OnChildAdded (ILayout child);
-
- class ContainerLayoutRequest : LayoutRequest
- {
- public List ChildRequests = new List ();
- }
- }
-
- public enum LayoutAlign
- {
- Begin, Center, End, Fill
- }
-
- public enum LayoutDirection
- {
- Horizontal, Vertical
- }
-
- abstract class LayoutAlignment : ILayout
- {
- public LayoutAlignment ()
- {
- XAlign = YAlign = LayoutAlign.Center;
- }
-
- public LayoutAlign XAlign { get; set; }
- public LayoutAlign YAlign { get; set; }
- public bool ExpandHeight { get; set; }
- public bool ExpandWidth { get; set; }
- public float MinHeight { get; set; }
- public float MinWidth { get; set; }
- public float PadLeft { get; set; }
- public float PadRight { get; set; }
- public float PadTop { get; set; }
- public float PadBottom { get; set; }
- public bool Visible { get; set; }
-
- LayoutRequest request = new LayoutRequest ();
-
- public virtual LayoutRequest BeginLayout ()
- {
- request.Size = new SizeF (MinWidth + PadLeft + PadRight, MinHeight + PadTop + PadBottom);
- request.ExpandHeight = this.ExpandHeight;
- request.ExpandWidth = this.ExpandWidth;
- request.Visible = this.Visible;
- return request;
- }
-
- public virtual void EndLayout (LayoutRequest request, PointF origin, SizeF allocation)
- {
- var frame = new RectangleF (origin.X + PadLeft, origin.Y + PadBottom,
- allocation.Width - PadLeft - PadRight, allocation.Height - PadTop - PadBottom);
-
- if (allocation.Height > request.Size.Height) {
- if (YAlign != LayoutAlign.Fill) {
- frame.Height = request.Size.Height - PadTop - PadBottom;
- if (YAlign == LayoutAlign.Center) {
- frame.Y += (allocation.Height - request.Size.Height) / 2;
- } else if (YAlign == LayoutAlign.End) {
- frame.Y += (allocation.Height - request.Size.Height);
- }
- }
- }
-
- if (allocation.Width > request.Size.Width) {
- if (XAlign != LayoutAlign.Fill) {
- frame.Width = request.Size.Width - PadLeft - PadRight;
- if (XAlign == LayoutAlign.Center) {
- frame.X += (allocation.Width - request.Size.Width) / 2;
- } else if (XAlign == LayoutAlign.End) {
- frame.X += (allocation.Width - request.Size.Width);
- }
- }
- }
-
- OnLayoutEnded (frame);
- }
-
- protected abstract void OnLayoutEnded (RectangleF frame);
- }
-}
\ No newline at end of file
diff --git a/SparkleShare/Mac/SparkleShare/MainMenu.xib b/SparkleShare/Mac/SparkleShare/MainMenu.xib
deleted file mode 100644
index ed428a77..00000000
--- a/SparkleShare/Mac/SparkleShare/MainMenu.xib
+++ /dev/null
@@ -1,1028 +0,0 @@
-
-
-
- 1060
- 10D2162
- 762
- 1038.29
- 460.00
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
-
-
- YES
- ../MacCocoaApp.xcodeproj
- 3
-
-
-
diff --git a/SparkleShare/Mac/SparkleShare/MainWindow.xib b/SparkleShare/Mac/SparkleShare/MainWindow.xib
deleted file mode 100644
index 877e588b..00000000
--- a/SparkleShare/Mac/SparkleShare/MainWindow.xib
+++ /dev/null
@@ -1,190 +0,0 @@
-
-
-
- 1060
- 10D573
- 762
- 1038.29
- 460.00
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
-
- YES
-
- 3
-
-
-
diff --git a/SparkleShare/Mac/SparkleShare/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare/SparkleShare.csproj
deleted file mode 100644
index 50a86364..00000000
--- a/SparkleShare/Mac/SparkleShare/SparkleShare.csproj
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
- Debug
- AnyCPU
- 9.0.21022
- 2.0
- {709CB8F4-F82F-4C94-B4E2-DC502087525B}
- {1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Exe
- SparkleShare
- SparkleShare
- v3.5
-
-
- true
- full
- false
- bin\Debug
- DEBUG
- prompt
- 4
- false
-
-
-
-
-
-
-
- none
- false
- bin\Release
- prompt
- 4
- false
-
-
-
-
-
-
-
-
- False
-
-
-
-
-
- MainMenu.xib
-
-
-
-
-
- SparkleShare.cs
-
-
- SparkleController.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Pixmaps\side-splash.png
-
-
-
-
-
- {2C914413-B31C-4362-93C7-1AE34F09112A}
- SparkleLib
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SparkleShare/Mac/SparkleShare/SparkleShare.sln b/SparkleShare/Mac/SparkleShare/SparkleShare.sln
deleted file mode 100644
index 925a0eda..00000000
--- a/SparkleShare/Mac/SparkleShare/SparkleShare.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShare.csproj", "{709CB8F4-F82F-4C94-B4E2-DC502087525B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "..\..\..\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
- {709CB8F4-F82F-4C94-B4E2-DC502087525B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {709CB8F4-F82F-4C94-B4E2-DC502087525B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {709CB8F4-F82F-4C94-B4E2-DC502087525B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {709CB8F4-F82F-4C94-B4E2-DC502087525B}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = SparkleShare.csproj
- EndGlobalSection
-EndGlobal
diff --git a/SparkleShare/Mac/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs
similarity index 99%
rename from SparkleShare/Mac/SparkleShare/SparkleStatusIcon.cs
rename to SparkleShare/Mac/SparkleStatusIcon.cs
index 3482474c..2051ded4 100644
--- a/SparkleShare/Mac/SparkleShare/SparkleStatusIcon.cs
+++ b/SparkleShare/Mac/SparkleStatusIcon.cs
@@ -178,7 +178,7 @@ namespace SparkleShare {
string folder_icon_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
- "sparkleshare.icns");
+ "sparkleshare-mac.icns");
FolderMenuItem.Image = new NSImage (folder_icon_path);
FolderMenuItem.Image.Size = new SizeF (16, 16);
diff --git a/SparkleShare/Mac/SparkleShare/SparkleUI.cs b/SparkleShare/Mac/SparkleUI.cs
similarity index 99%
rename from SparkleShare/Mac/SparkleShare/SparkleUI.cs
rename to SparkleShare/Mac/SparkleUI.cs
index 5bb655b4..46d348a6 100644
--- a/SparkleShare/Mac/SparkleShare/SparkleUI.cs
+++ b/SparkleShare/Mac/SparkleUI.cs
@@ -126,7 +126,7 @@ namespace SparkleShare {
{
string folder_icon_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
- "sparkleshare.icns");
+ "sparkleshare-mac.icns");
NSImage folder_icon = new NSImage (folder_icon_path);
diff --git a/SparkleShare/Mac/SparkleShare/SparkleWindow.cs b/SparkleShare/Mac/SparkleWindow.cs
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/SparkleWindow.cs
rename to SparkleShare/Mac/SparkleWindow.cs
diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs
index 74822030..ac47a720 100644
--- a/SparkleShare/SparkleController.cs
+++ b/SparkleShare/SparkleController.cs
@@ -165,7 +165,7 @@ namespace SparkleShare {
// The location of the user's public key for SparkleShare
string public_key_file_path = SparkleHelpers.CombineMore (SparklePaths.HomePath, ".ssh",
- "sparkleshare." + SparkleShare.Controller.UserEmail + ".key.pub");
+ "sparkleshare." + UserEmail + ".key.pub");
if (!File.Exists (public_key_file_path))
return false;
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/idle-active.png b/data/idle-active.png
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/Pixmaps/idle-active.png
rename to data/idle-active.png
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/idle.png b/data/idle.png
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/Pixmaps/idle.png
rename to data/idle.png
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/idle0.png b/data/idle0.png
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/Pixmaps/idle0.png
rename to data/idle0.png
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/idle1.png b/data/idle1.png
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/Pixmaps/idle1.png
rename to data/idle1.png
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/idle2.png b/data/idle2.png
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/Pixmaps/idle2.png
rename to data/idle2.png
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/idle3.png b/data/idle3.png
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/Pixmaps/idle3.png
rename to data/idle3.png
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/idle4.png b/data/idle4.png
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/Pixmaps/idle4.png
rename to data/idle4.png
diff --git a/data/sparkleshare-folder.icns b/data/sparkleshare-folder.icns
deleted file mode 100644
index 7a6d8d2c..00000000
Binary files a/data/sparkleshare-folder.icns and /dev/null differ
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/sparkleshare-idle-focus.png b/data/sparkleshare-idle-focus.png
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/Pixmaps/sparkleshare-idle-focus.png
rename to data/sparkleshare-idle-focus.png
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/sparkleshare-idle.png b/data/sparkleshare-idle.png
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/Pixmaps/sparkleshare-idle.png
rename to data/sparkleshare-idle.png
diff --git a/data/sparkleshare-mac-16.png b/data/sparkleshare-mac-16.png
deleted file mode 100644
index 09e3b3c4..00000000
Binary files a/data/sparkleshare-mac-16.png and /dev/null differ
diff --git a/data/sparkleshare-mac-512.png b/data/sparkleshare-mac-512.png
deleted file mode 100644
index dd20cf5d..00000000
Binary files a/data/sparkleshare-mac-512.png and /dev/null differ
diff --git a/data/sparkleshare-mac.icns b/data/sparkleshare-mac.icns
new file mode 100644
index 00000000..c85d8854
Binary files /dev/null and b/data/sparkleshare-mac.icns differ
diff --git a/data/sparkleshare-mac.svg b/data/sparkleshare-mac.svg
new file mode 100644
index 00000000..28aaad20
--- /dev/null
+++ b/data/sparkleshare-mac.svg
@@ -0,0 +1,2513 @@
+
+
+
+
diff --git a/data/sparkleshare-osx.svg b/data/sparkleshare-osx.svg
new file mode 100644
index 00000000..c7da48c6
--- /dev/null
+++ b/data/sparkleshare-osx.svg
@@ -0,0 +1,1064 @@
+
+
+
+
diff --git a/SparkleShare/Mac/SparkleShare/sparkleshare.icns b/data/sparkleshare.icns
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/sparkleshare.icns
rename to data/sparkleshare.icns