diff --git a/README b/README
index f74683d6..642f1184 100644
--- a/README
+++ b/README
@@ -94,7 +94,7 @@ Build on OSX:
Get the Mono Framework, Monodevelop, and MacPorts.
Install git-core, automake and intltool using 'port install'.
-
+Make sure that git or a symbolic link to git is in /usr/bin.
Frequently Asked Question
=========================
diff --git a/SparkleLib/Defines.cs.in b/SparkleLib/Defines.cs.in
index f5beeba7..7ef0803c 100644
--- a/SparkleLib/Defines.cs.in
+++ b/SparkleLib/Defines.cs.in
@@ -22,6 +22,7 @@ namespace SparkleLib {
public const string VERSION = "@VERSION@";
public const string LOCALE_DIR = "@prefix@/share/locale";
+ public const string DATAROOTDIR = "@expanded_datadir@";
public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
public const string PREFIX = "@prefix@";
public const string OPEN_COMMAND = "xdg-open";
diff --git a/SparkleLib/SparklePaths.cs b/SparkleLib/SparklePaths.cs
index c45adc01..138379f6 100644
--- a/SparkleLib/SparklePaths.cs
+++ b/SparkleLib/SparklePaths.cs
@@ -24,7 +24,7 @@ namespace SparkleLib {
public static class SparklePaths
{
- public static string GitPath = GetGitPath ();
+ public static string GitPath = "/usr/bin/git"; // TODO: Don't hardcode this
public static string HomePath = new UnixUserInfo (UnixEnvironment.UserName).HomeDirectory;
@@ -40,7 +40,7 @@ namespace SparkleLib {
public static string SparkleLocalIconPath = SparkleHelpers.CombineMore (SparkleConfigPath, "icons", "hicolor");
- public static string SparkleIconPath = SparkleHelpers.CombineMore (Defines.PREFIX, "share", "sparkleshare",
+ public static string SparkleIconPath = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "sparkleshare",
"icons");
diff --git a/SparkleShare/Mac/SparkleShare/AppDelegate.cs b/SparkleShare/Mac/SparkleShare/AppDelegate.cs
deleted file mode 100644
index 77d455bd..00000000
--- a/SparkleShare/Mac/SparkleShare/AppDelegate.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using System;
-using System.Drawing;
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using SparkleLib;
-
-namespace SparkleShare
-{
- public partial class AppDelegate : NSApplicationDelegate
- {
-
- MainWindowController mainWindowController;
- NSStatusItem StatusItem;
-
- NSMenu Menu;
- NSMenuItem FolderMenuItem;
- NSMenuItem [] FolderMenuItems;
- NSMenuItem SyncMenuItem;
- NSMenuItem NotificationsMenuItem;
- NSMenuItem AboutMenuItem;
- NSMenuItem QuitMenuItem;
-
-
- public AppDelegate ()
- {
- }
-
- public override void FinishedLaunching (NSObject notification)
- {
-
- // mainWindowController = new MainWindowController ();
- // mainWindowController.Window.MakeKeyAndOrderFront (this);
-
- // SparkleStatusIcon = new SparkleStatusIcon ();
-
- // SparkleRepo repo = new SparkleRepo ("/Users/hbons/SparkleShare/SparkleShare-Test");
-
- StatusItem = NSStatusBar.SystemStatusBar.CreateStatusItem (32);
-
- StatusItem.Enabled = true;
- StatusItem.Image = NSImage.ImageNamed ("sparkleshare-idle.png");
- StatusItem.AlternateImage = NSImage.ImageNamed ("sparkleshare-idle-focus.png");
- StatusItem.Image.Size = new SizeF (13, 13);
- StatusItem.AlternateImage.Size = new SizeF (13, 13);
- StatusItem.HighlightMode = true;
-
- Menu = new NSMenu ();
-
-
- Menu.AddItem (new NSMenuItem () { Title="Up to date (102 ᴍʙ)", Enabled = true });
- Menu.AddItem (NSMenuItem.SeparatorItem);
-
-
- FolderMenuItem = new NSMenuItem () {
- Title="SparkleShare", Enabled = true,
- Action = new Selector ("ddd")
- };
-
- FolderMenuItem.Activated += delegate {
- Console.WriteLine ("DDDD");
- };
-
- FolderMenuItem.Image = NSImage.ImageNamed ("NSFolder");
- FolderMenuItem.Image.Size = new SizeF (16, 16);
-
- Menu.AddItem (FolderMenuItem);
-
- FolderMenuItems = new NSMenuItem [2] {
- new NSMenuItem () { Title = "gnome-design" },
- new NSMenuItem () { Title = "tango-icons" }
- };
-
- foreach (NSMenuItem item in FolderMenuItems) {
-
- item.Activated += delegate {
-
- };
-
- item.Image = NSImage.ImageNamed ("NSFolder");
- Menu.AddItem (item);
- };
-
-
- Menu.AddItem (NSMenuItem.SeparatorItem);
-
-
- SyncMenuItem = new NSMenuItem () {
- Title = "Sync Remote Folder..."
- };
-
- SyncMenuItem.Activated += delegate {
-
- };
-
- Menu.AddItem (SyncMenuItem);
-
-
- Menu.AddItem (NSMenuItem.SeparatorItem);
-
-
- NotificationsMenuItem = new NSMenuItem () {
- Title = "Show Notifications",
- State = NSCellStateValue.On
- };
-
- NotificationsMenuItem.Activated += delegate {
-
- //StatusItem.Image = NSImage.ImageNamed ("NSComputer");
- if (NotificationsMenuItem.State == NSCellStateValue.On)
-
- NotificationsMenuItem.State = NSCellStateValue.Off;
-
- else
-
- NotificationsMenuItem.State = NSCellStateValue.On;
-
- };
-
- Menu.AddItem (NotificationsMenuItem);
-
-
- Menu.AddItem (NSMenuItem.SeparatorItem);
-
-
- AboutMenuItem = new NSMenuItem () {
- Title = "About"
- };
-
- AboutMenuItem.Activated += delegate {
-
- };
-
- Menu.AddItem (AboutMenuItem);
-
-
- Menu.AddItem (NSMenuItem.SeparatorItem);
-
-
- QuitMenuItem = new NSMenuItem () {
- Title = "Quit"
- };
-
- QuitMenuItem.Activated += delegate {
- Environment.Exit (0);
- };
-
- Menu.AddItem (QuitMenuItem);
-
- StatusItem.Menu = Menu;
-
- }
- }
-}
-
diff --git a/SparkleShare/Mac/SparkleShare/Info.plist b/SparkleShare/Mac/SparkleShare/Info.plist
index 16ec0ef3..4431992a 100644
--- a/SparkleShare/Mac/SparkleShare/Info.plist
+++ b/SparkleShare/Mac/SparkleShare/Info.plist
@@ -2,13 +2,15 @@
+ CFBundleIconFile
+ sparkleshare.icns
LSEnvironment
PATH
/opt/local/bin
CFBundleIdentifier
- com.yourcompany.SparkleShare
+ org.sparkleshare.sparkleshare
CFBundleName
SparkleShare
CFBundleVersion
@@ -19,5 +21,7 @@
MainMenu
NSPrincipalClass
NSApplication
+ LSBackgroundOnly
+
diff --git a/SparkleShare/Mac/SparkleShare/Layout.cs b/SparkleShare/Mac/SparkleShare/Layout.cs
new file mode 100644
index 00000000..56bccafd
--- /dev/null
+++ b/SparkleShare/Mac/SparkleShare/Layout.cs
@@ -0,0 +1,298 @@
+//
+// 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/Main.cs b/SparkleShare/Mac/SparkleShare/Main.cs
deleted file mode 100644
index f54dc597..00000000
--- a/SparkleShare/Mac/SparkleShare/Main.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Drawing;
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-
-namespace SparkleShare
-{
- class MainClass
- {
- static void Main (string[] args)
- {
- NSApplication.Init ();
- NSApplication.Main (args);
- }
- }
-}
-
diff --git a/SparkleShare/Mac/SparkleShare/MainMenu.xib b/SparkleShare/Mac/SparkleShare/MainMenu.xib
index 0a42fa19..ed428a77 100644
--- a/SparkleShare/Mac/SparkleShare/MainMenu.xib
+++ b/SparkleShare/Mac/SparkleShare/MainMenu.xib
@@ -2,7 +2,7 @@
1060
- 10D573
+ 10D2162
762
1038.29
460.00
@@ -61,45 +61,6 @@
MacCocoaApp
-
-
-
-
39
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SparkleShare/Mac/SparkleShare/MainWindow.cs b/SparkleShare/Mac/SparkleShare/MainWindow.cs
deleted file mode 100644
index 2cbe2ae5..00000000
--- a/SparkleShare/Mac/SparkleShare/MainWindow.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-
-namespace SparkleShare
-{
- public partial class MainWindow : MonoMac.AppKit.NSWindow
- {
- #region Constructors
-
- // Called when created from unmanaged code
- public MainWindow (IntPtr handle) : base(handle)
- {
- Initialize ();
- }
-
- // Called when created directly from a XIB file
- [Export("initWithCoder:")]
- public MainWindow (NSCoder coder) : base(coder)
- {
- Initialize ();
- }
-
- // Shared initialization code
- void Initialize ()
- {
- }
-
- #endregion
- }
-}
-
diff --git a/SparkleShare/Mac/SparkleShare/MainWindow.xib.designer.cs b/SparkleShare/Mac/SparkleShare/MainWindow.xib.designer.cs
deleted file mode 100644
index 2be04caa..00000000
--- a/SparkleShare/Mac/SparkleShare/MainWindow.xib.designer.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// ------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Mono Runtime Version: 2.0.50727.1433
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-// ------------------------------------------------------------------------------
-
-namespace SparkleShare {
-
-
- // Should subclass MonoMac.AppKit.NSWindow
- [MonoMac.Foundation.Register("MainWindow")]
- public partial class MainWindow {
- }
-
- // Should subclass MonoMac.AppKit.NSWindowController
- [MonoMac.Foundation.Register("MainWindowController")]
- public partial class MainWindowController {
- }
-}
diff --git a/SparkleShare/Mac/SparkleShare/MainWindowController.cs b/SparkleShare/Mac/SparkleShare/MainWindowController.cs
deleted file mode 100644
index 22f30d23..00000000
--- a/SparkleShare/Mac/SparkleShare/MainWindowController.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-
-namespace SparkleShare
-{
- public partial class MainWindowController : MonoMac.AppKit.NSWindowController
- {
- #region Constructors
-
- // Called when created from unmanaged code
- public MainWindowController (IntPtr handle) : base(handle)
- {
- Initialize ();
- }
-
- // Called when created directly from a XIB file
- [Export("initWithCoder:")]
- public MainWindowController (NSCoder coder) : base(coder)
- {
- Initialize ();
- }
-
- // Call to load from the XIB/NIB file
- public MainWindowController () : base("MainWindow")
- {
- Initialize ();
- }
-
- // Shared initialization code
- void Initialize ()
- {
- }
-
- #endregion
-
- //strongly typed window accessor
- public new MainWindow Window {
- get { return (MainWindow)base.Window; }
- }
- }
-}
-
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/idle-active.png b/SparkleShare/Mac/SparkleShare/Pixmaps/idle-active.png
new file mode 100644
index 00000000..ca826a08
Binary files /dev/null and b/SparkleShare/Mac/SparkleShare/Pixmaps/idle-active.png differ
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/idle.png b/SparkleShare/Mac/SparkleShare/Pixmaps/idle.png
new file mode 100644
index 00000000..ebb7f00b
Binary files /dev/null and b/SparkleShare/Mac/SparkleShare/Pixmaps/idle.png differ
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/idle0.png b/SparkleShare/Mac/SparkleShare/Pixmaps/idle0.png
new file mode 100644
index 00000000..0070a165
Binary files /dev/null and b/SparkleShare/Mac/SparkleShare/Pixmaps/idle0.png differ
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/idle1.png b/SparkleShare/Mac/SparkleShare/Pixmaps/idle1.png
new file mode 100644
index 00000000..863cc299
Binary files /dev/null and b/SparkleShare/Mac/SparkleShare/Pixmaps/idle1.png differ
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/idle2.png b/SparkleShare/Mac/SparkleShare/Pixmaps/idle2.png
new file mode 100644
index 00000000..7b8cdcfc
Binary files /dev/null and b/SparkleShare/Mac/SparkleShare/Pixmaps/idle2.png differ
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/idle3.png b/SparkleShare/Mac/SparkleShare/Pixmaps/idle3.png
new file mode 100644
index 00000000..c4eaa098
Binary files /dev/null and b/SparkleShare/Mac/SparkleShare/Pixmaps/idle3.png differ
diff --git a/SparkleShare/Mac/SparkleShare/Pixmaps/idle4.png b/SparkleShare/Mac/SparkleShare/Pixmaps/idle4.png
new file mode 100644
index 00000000..a53e2261
Binary files /dev/null and b/SparkleShare/Mac/SparkleShare/Pixmaps/idle4.png differ
diff --git a/SparkleShare/Mac/SparkleShare/sparkleshare-idle-focus.png b/SparkleShare/Mac/SparkleShare/Pixmaps/sparkleshare-idle-focus.png
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/sparkleshare-idle-focus.png
rename to SparkleShare/Mac/SparkleShare/Pixmaps/sparkleshare-idle-focus.png
diff --git a/SparkleShare/Mac/SparkleShare/sparkleshare-idle.png b/SparkleShare/Mac/SparkleShare/Pixmaps/sparkleshare-idle.png
similarity index 100%
rename from SparkleShare/Mac/SparkleShare/sparkleshare-idle.png
rename to SparkleShare/Mac/SparkleShare/Pixmaps/sparkleshare-idle.png
diff --git a/SparkleShare/Mac/SparkleShare/SparkleLog.cs b/SparkleShare/Mac/SparkleShare/SparkleLog.cs
new file mode 100644
index 00000000..4052ce8b
--- /dev/null
+++ b/SparkleShare/Mac/SparkleShare/SparkleLog.cs
@@ -0,0 +1,128 @@
+// SparkleShare, an instant update workflow to Git.
+// Copyright (C) 2010 Hylke Bons
+//
+// 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 .
+
+
+using System;
+using System.Drawing;
+using MonoMac.Foundation;
+using MonoMac.AppKit;
+using MonoMac.ObjCRuntime;
+using MonoMac.WebKit;
+
+namespace SparkleShare {
+
+ public class SparkleLog : NSWindow {
+
+ public readonly string LocalPath;
+
+ private WebView WebView;
+ private NSButton CloseButton;
+ private NSButton OpenFolderButton;
+
+ public SparkleLog (IntPtr handle) : base (handle) { }
+
+ public SparkleLog (string path) : base ()
+ {
+
+ LocalPath = path;
+
+ Delegate = new LogDelegate ();
+
+ SetFrame (new RectangleF (0, 0, 480, 640), true);
+
+ Center ();
+
+ StyleMask = (NSWindowStyle.Closable |
+ NSWindowStyle.Miniaturizable |
+ NSWindowStyle.Titled);
+
+ MaxSize = new SizeF (480, 640);
+ MinSize = new SizeF (480, 640);
+ HasShadow = true;
+ BackingType = NSBackingStore.Buffered;
+
+
+ ContentView.AddSubview (CreateEventLog ());
+
+ OpenFolderButton = new NSButton (new RectangleF (16, 12, 120, 31)) {
+ Title = "Open Folder",
+ BezelStyle = NSBezelStyle.Rounded
+ };
+
+ OpenFolderButton.Activated += delegate {
+ SparkleShare.Controller.OpenSparkleShareFolder (LocalPath);
+ };
+
+ ContentView.AddSubview (OpenFolderButton);
+
+
+ CloseButton = new NSButton (new RectangleF (480 - 120 - 16, 12, 120, 31)) {
+ Title = "Close",
+ BezelStyle = NSBezelStyle.Rounded
+ };
+
+ CloseButton.Activated += delegate {
+ InvokeOnMainThread (delegate {
+ PerformClose (this);
+ });
+ };
+
+ ContentView.AddSubview (CloseButton);
+
+
+ string name = System.IO.Path.GetFileName (LocalPath);
+ Title = String.Format ("Recent Events in ‘{0}’", name);
+
+ OrderFrontRegardless ();
+
+ }
+
+
+ public void UpdateEventLog ()
+ {
+
+ }
+
+
+ private WebView CreateEventLog ()
+ {
+
+ RectangleF frame = new RectangleF (0, 12 + 31 + 16, 480, 640 - (12 + 31 + 16));
+
+ WebView = new WebView (frame, "", "");
+ WebView.MainFrameUrl = "http://www.google.nl/";
+
+ return WebView;
+
+ }
+
+ }
+
+
+ public class LogDelegate : NSWindowDelegate {
+
+ public override void WillClose (NSNotification notification)
+ {
+
+ InvokeOnMainThread (delegate {
+ SparkleUI.OpenLogs.Remove ((SparkleLog) notification.Object);
+ });
+
+ }
+
+ }
+
+}
diff --git a/SparkleShare/Mac/SparkleShare/SparkleMacController.cs b/SparkleShare/Mac/SparkleShare/SparkleMacController.cs
new file mode 100644
index 00000000..3937009b
--- /dev/null
+++ b/SparkleShare/Mac/SparkleShare/SparkleMacController.cs
@@ -0,0 +1,95 @@
+// SparkleShare, an instant update workflow to Git.
+// Copyright (C) 2010 Hylke Bons
+//
+// 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 .
+
+
+using MonoMac.Foundation;
+using MonoMac.AppKit;
+using MonoMac.ObjCRuntime;
+using SparkleLib;
+using System;
+using System.Diagnostics;
+using System.IO;
+
+namespace SparkleShare {
+
+ public class SparkleMacController : SparkleController {
+
+ public override void EnableSystemAutostart ()
+ {
+
+ // N/A
+
+ }
+
+
+ // Installs a launcher so the user can launch SparkleShare
+ // from the Internet category if needed
+ public override void InstallLauncher ()
+ {
+
+ // N/A
+
+ }
+
+
+ // Adds the SparkleShare folder to the user's
+ // list of bookmarked places
+ public override void AddToBookmarks ()
+ {
+
+
+
+ }
+
+
+ // Creates the SparkleShare folder in the user's home folder
+ public override bool CreateSparkleShareFolder ()
+ {
+
+ if (!Directory.Exists (SparklePaths.SparklePath)) {
+
+ Directory.CreateDirectory (SparklePaths.SparklePath);
+
+ NSWorkspace.SharedWorkspace.SetIconforFile (NSImage.ImageNamed ("sparkleshare.icns"),
+ SparklePaths.SparklePath, 0);
+
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ }
+
+
+ // Opens the SparkleShare folder or an (optional) subfolder
+ public override void OpenSparkleShareFolder (string subfolder)
+ {
+
+ string folder = Path.Combine (SparklePaths.SparklePath, subfolder);
+
+ Process process = new Process ();
+ process.StartInfo.Arguments = folder.Replace (" ", "\\ "); // Escape space-characters
+ process.StartInfo.FileName = "open";
+ process.Start ();
+
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/SparkleShare/Mac/SparkleShare/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare/SparkleShare.csproj
index 8387f87f..50a86364 100644
--- a/SparkleShare/Mac/SparkleShare/SparkleShare.csproj
+++ b/SparkleShare/Mac/SparkleShare/SparkleShare.csproj
@@ -44,27 +44,26 @@
False
+
-
- MainWindow.xib
-
-
- MainWindow.xib
-
-
- MainWindow.xib
-
-
-
- MainMenu.xib
-
MainMenu.xib
+
+
+
+
+ SparkleShare.cs
+
+
+ SparkleController.cs
+
+
+
+
-
@@ -73,8 +72,19 @@
-
-
+
+
+
+
+
+
+
+
+
+
+ Pixmaps\side-splash.png
+
+
@@ -82,4 +92,7 @@
SparkleLib
+
+
+
\ No newline at end of file
diff --git a/SparkleShare/Mac/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleShare/SparkleStatusIcon.cs
new file mode 100644
index 00000000..9357f7f7
--- /dev/null
+++ b/SparkleShare/Mac/SparkleShare/SparkleStatusIcon.cs
@@ -0,0 +1,399 @@
+// SparkleShare, an instant update workflow to Git.
+// Copyright (C) 2010 Hylke Bons
+//
+// 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 .
+
+using System;
+using System.Drawing;
+using System.Timers;
+using MonoMac.Foundation;
+using MonoMac.AppKit;
+using MonoMac.ObjCRuntime;
+using Mono.Unix;
+
+namespace SparkleShare {
+
+ // The statusicon that stays in the
+ // user's notification area
+ public class SparkleStatusIcon : NSObject {
+
+ private Timer Animation;
+ private int FrameNumber;
+ private string StateText;
+
+ private NSStatusItem StatusItem;
+ private NSMenu Menu;
+ private NSMenuItem StateMenuItem;
+ private NSMenuItem FolderMenuItem;
+ private NSMenuItem [] FolderMenuItems;
+ private NSMenuItem SyncMenuItem;
+ private NSMenuItem NotificationsMenuItem;
+ private NSMenuItem AboutMenuItem;
+
+ private delegate void Task ();
+ private EventHandler [] Tasks;
+
+
+ // Short alias for the translations
+ public static string _ (string s)
+ {
+ return Catalog.GetString (s);
+ }
+
+
+ public SparkleStatusIcon () : base ()
+ {
+
+ Animation = CreateAnimation ();
+
+ StatusItem = NSStatusBar.SystemStatusBar.CreateStatusItem (28);
+ StatusItem.HighlightMode = true;
+
+
+ SetNormalState ();
+ CreateMenu ();
+
+ Menu.Delegate = new SparkleStatusIconMenuDelegate ();
+
+
+ SparkleShare.Controller.FolderSizeChanged += delegate {
+ InvokeOnMainThread (delegate {
+ UpdateMenu ();
+ });
+ };
+
+ SparkleShare.Controller.FolderListChanged += delegate {
+ InvokeOnMainThread (delegate {
+ SetNormalState ();
+ CreateMenu ();
+ });
+ };
+
+ SparkleShare.Controller.OnIdle += delegate {
+ InvokeOnMainThread (delegate {
+ SetNormalState ();
+ UpdateMenu ();
+ });
+ };
+
+ SparkleShare.Controller.OnSyncing += delegate {
+ InvokeOnMainThread (delegate {
+ SetAnimationState ();
+ UpdateMenu ();
+ });
+ };
+
+ SparkleShare.Controller.OnError += delegate {
+ InvokeOnMainThread (delegate {
+ SetNormalState (true);
+ UpdateMenu ();
+ });
+ };
+
+ }
+
+
+ // Creates the Animation that handles the syncing animation
+ private Timer CreateAnimation ()
+ {
+
+ FrameNumber = 0;
+
+ Timer Animation = new Timer () {
+ Interval = 35
+ };
+
+ Animation.Elapsed += delegate {
+
+ if (FrameNumber < 4)
+ FrameNumber++;
+ else
+ FrameNumber = 0;
+
+ InvokeOnMainThread (delegate {
+
+ StatusItem.AlternateImage = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle" + FrameNumber + ".png");
+ StatusItem.AlternateImage.Size = new SizeF (16, 16);
+
+ StatusItem.Image = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle" + FrameNumber + ".png");
+ StatusItem.Image.Size = new SizeF (16, 16);
+
+ });
+
+ };
+
+ return Animation;
+
+ }
+
+
+ // Creates the menu that is popped up when the
+ // user clicks the status icon
+ public void CreateMenu ()
+ {
+
+ Menu = new NSMenu ();
+
+ StateMenuItem = new NSMenuItem () {
+ Title = StateText
+ };
+
+ Menu.AddItem (StateMenuItem);
+ Menu.AddItem (NSMenuItem.SeparatorItem);
+
+
+ FolderMenuItem = new NSMenuItem () {
+ Title = "SparkleShare"
+ };
+
+ FolderMenuItem.Activated += delegate {
+ SparkleShare.Controller.OpenSparkleShareFolder ();
+ };
+
+ //FolderMenuItem.Image = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/sparkleshare.icns");
+ FolderMenuItem.Image = NSImage.ImageNamed ("NSFolder");
+ FolderMenuItem.Image.Size = new SizeF (16, 16);
+
+ Menu.AddItem (FolderMenuItem);
+
+
+ if (SparkleShare.Controller.Folders.Count > 0) {
+
+ FolderMenuItems = new NSMenuItem [SparkleShare.Controller.Folders.Count];
+ Tasks = new EventHandler [SparkleShare.Controller.Folders.Count];
+
+ int i = 0;
+
+ foreach (string path in SparkleShare.Controller.Folders) {
+
+// if (repo.HasUnsyncedChanges)
+// folder_action.IconName = "dialog-error";
+
+ NSMenuItem item = new NSMenuItem ();
+
+ item.Title = System.IO.Path.GetFileName (path);
+ item.Image = NSImage.ImageNamed ("NSFolder");
+ item.Image.Size = new SizeF (16, 16);
+
+ Tasks [i] = OpenEventLogDelegate(item.Title);
+
+ FolderMenuItems [i] = item;
+ FolderMenuItems [i].Activated += Tasks [i];
+ Menu.AddItem (FolderMenuItems [i]);
+
+ i++;
+
+ };
+
+ } else {
+
+ // TODO: No Remote Folders Yet
+
+ }
+
+ Menu.AddItem (NSMenuItem.SeparatorItem);
+
+
+ SyncMenuItem = new NSMenuItem () {
+ Title = "Add Remote Folder..."
+ };
+
+ if (SparkleShare.Controller.FirstRun)
+ SyncMenuItem.Enabled = false;
+
+ SyncMenuItem.Activated += delegate {
+ SparkleWindow w = new SparkleWindow ();
+ };
+
+ Menu.AddItem (SyncMenuItem);
+
+
+ Menu.AddItem (NSMenuItem.SeparatorItem);
+
+
+ NotificationsMenuItem = new NSMenuItem () {
+ Title = "Show Notifications"
+ };
+
+ if (SparkleShare.Controller.NotificationsEnabled)
+ NotificationsMenuItem.State = NSCellStateValue.On;
+
+ NotificationsMenuItem.Activated += delegate {
+
+ SparkleShare.Controller.ToggleNotifications ();
+
+ if (SparkleShare.Controller.NotificationsEnabled)
+ NotificationsMenuItem.State = NSCellStateValue.On;
+ else
+ NotificationsMenuItem.State = NSCellStateValue.Off;
+
+ };
+
+ Menu.AddItem (NotificationsMenuItem);
+
+
+ Menu.AddItem (NSMenuItem.SeparatorItem);
+
+
+ AboutMenuItem = new NSMenuItem () {
+ Title = "About"
+ };
+
+ AboutMenuItem.Activated += delegate {
+ // TODO
+ };
+
+ Menu.AddItem (AboutMenuItem);
+
+ StatusItem.Menu = Menu;
+ StatusItem.Menu.Update ();
+ Console.WriteLine ("MENU UPDATED");
+
+ }
+
+
+ // A method reference that makes sure that opening the
+ // event log for each repository works correctly
+ private EventHandler OpenEventLogDelegate (string path)
+ {
+
+ return delegate {
+
+ SparkleLog log = SparkleUI.OpenLogs.Find (delegate (SparkleLog l) {
+ return l.LocalPath.Equals (path);
+ });
+
+ // Check whether the log is already open, create a new one if
+ // that's not the case or present it to the user if it is
+ if (log == null) {
+
+ InvokeOnMainThread (delegate {
+ SparkleUI.OpenLogs.Add (new SparkleLog (path));
+ });
+
+ } else {
+
+ InvokeOnMainThread (delegate {
+ log.OrderFrontRegardless ();
+ });
+
+ }
+
+ };
+
+ }
+
+
+ public void UpdateMenu ()
+ {
+
+ StateMenuItem.Title = StateText;
+
+ }
+
+
+ // The state when there's nothing going on
+ private void SetNormalState ()
+ {
+
+ SetNormalState (false);
+
+ }
+
+
+ // The state when there's nothing going on
+ private void SetNormalState (bool error)
+ {
+
+ Animation.Stop ();
+
+ if (SparkleShare.Controller.Folders.Count == 0) {
+
+ StateText = _("Welcome to SparkleShare!");
+ InvokeOnMainThread (delegate {
+
+ StatusItem.Image = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle.png");
+ StatusItem.Image.Size = new SizeF (16, 16);
+
+ StatusItem.AlternateImage = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle-active.png");
+ StatusItem.AlternateImage.Size = new SizeF (16, 16);
+
+ });
+
+ } else {
+
+ if (error) {
+
+ StateText = _("Not everything is synced");
+ InvokeOnMainThread (delegate {
+ //Pixbuf = SparkleUIHelpers.GetIcon ("sparkleshare-syncing-error", 24);
+ });
+
+ } else {
+
+ StateText = _("Up to date") + " (" + SparkleShare.Controller.FolderSize + ")";
+ InvokeOnMainThread (delegate {
+
+ StatusItem.Image = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle.png");
+ StatusItem.Image.Size = new SizeF (16, 16);
+
+ StatusItem.AlternateImage = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/idle-active.png");
+ StatusItem.AlternateImage.Size = new SizeF (16, 16);
+
+ });
+
+ }
+
+ }
+
+ }
+
+
+ // The state when animating
+ private void SetAnimationState ()
+ {
+
+ StateText = _("Syncing…");
+
+ if (!Animation.Enabled)
+ Animation.Start ();
+
+ }
+
+ }
+
+
+ public class SparkleStatusIconMenuDelegate : NSMenuDelegate {
+
+ public override void MenuWillHighlightItem (NSMenu menu, NSMenuItem item) { }
+
+ public override void MenuWillOpen (NSMenu menu)
+ {
+
+ Console.WriteLine ("OPENED");
+
+ InvokeOnMainThread (delegate {
+
+ foreach (SparkleLog log in SparkleUI.OpenLogs)
+ log.OrderFrontRegardless ();
+
+ });
+
+ }
+
+ }
+
+}
+
+
diff --git a/SparkleShare/Mac/SparkleShare/SparkleUI.cs b/SparkleShare/Mac/SparkleShare/SparkleUI.cs
index 8ce3cf2f..f551d6dd 100644
--- a/SparkleShare/Mac/SparkleShare/SparkleUI.cs
+++ b/SparkleShare/Mac/SparkleShare/SparkleUI.cs
@@ -8,164 +8,58 @@
//
// 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
+// 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 Gtk;
-using Mono.Unix;
-using Mono.Unix.Native;
-using SparkleLib;
+
using System;
using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading;
+using System.Drawing;
+using System.Timers;
+using MonoMac.Foundation;
+using MonoMac.AppKit;
+using MonoMac.ObjCRuntime;
+using MonoMac.WebKit;
namespace SparkleShare {
- public class SparkleUI {
-
+ public partial class AppDelegate : NSApplicationDelegate {
+ // Workaround to be able to work with SparkleUI as the main class
+ }
+
+
+ public class SparkleUI : AppDelegate
+ {
+
public static SparkleStatusIcon StatusIcon;
public static List OpenLogs;
-
- // Short alias for the translations
- public static string _(string s)
- {
- return Catalog.GetString (s);
- }
-
-
+
+
public SparkleUI ()
{
- // Initialize the application
- Application.Init ();
+ NSApplication.Init ();
- // Create the statusicon
+ NSApplication.SharedApplication.applicationIconImage
+ = NSImage.ImageNamed ("sparkleshare.icns");
+
+ OpenLogs = new List ();
StatusIcon = new SparkleStatusIcon ();
-
- // Keep track of which event logs are open
- SparkleUI.OpenLogs = new List ();
-
- SparkleShare.Controller.OnFirstRun += delegate {
- Application.Invoke (delegate {
-
- SparkleIntro intro = new SparkleIntro ();
- intro.ShowAll ();
-
- });
- };
-
- SparkleShare.Controller.OnInvitation += delegate (string invitation_file_path) {
- Application.Invoke (delegate {
-
- SparkleInvitation invitation = new SparkleInvitation (invitation_file_path);
- invitation.Present ();
-
- });
- };
-
- // Show a bubble when there are new changes
- SparkleShare.Controller.NotificationRaised += delegate (SparkleCommit commit, string repository_path) {
-
- string file_name = "";
- string message = null;
-
- if (commit.Added.Count > 0) {
-
- foreach (string added in commit.Added) {
- file_name = added;
- break;
- }
-
- message = String.Format (_("added ‘{0}’"), file_name);
-
- }
-
- if (commit.Edited.Count > 0) {
-
- foreach (string modified in commit.Edited) {
- file_name = modified;
- break;
- }
-
- message = String.Format (_("edited ‘{0}’"), file_name);
-
- }
-
- if (commit.Deleted.Count > 0) {
-
- foreach (string removed in commit.Deleted) {
- file_name = removed;
- break;
- }
-
- message = String.Format (_("deleted ‘{0}’"), file_name);
-
- }
-
- int changes_count = (commit.Added.Count +
- commit.Edited.Count +
- commit.Deleted.Count);
-
- if (changes_count > 1)
- message += " + " + (changes_count - 1);
-
-
- Application.Invoke (delegate {
-
- SparkleBubble bubble = new SparkleBubble (commit.UserName, message);
-
- string avatar_file_path = SparkleUIHelpers.GetAvatar (commit.UserEmail, 32);
-
- if (avatar_file_path != null)
- bubble.Icon = new Gdk.Pixbuf (avatar_file_path);
- else
- bubble.Icon = SparkleUIHelpers.GetIcon ("avatar-default", 32);
-
-// bubble.AddAction ("", "Show Events", delegate {
-
-// SparkleLog log = new SparkleLog (repository_path);
-// log.ShowAll ();
-
-// });
-
-// bubble.Show ();
-
- });
-
- };
-
- // Show a bubble when there was a conflict
- SparkleShare.Controller.ConflictNotificationRaised += delegate {
- Application.Invoke (delegate {
-
- string title = _("Ouch! Mid-air collision!");
- string subtext = _("Don't worry, SparkleShare made a copy of each conflicting file.");
-
- SparkleBubble bubble = new SparkleBubble(title, subtext);
-// bubble.Show ();
-
- });
- };
}
-
- // Runs the application
+
public void Run ()
{
-
- Application.Run ();
-
+
+ NSApplication.Main (new string [0]);
+
}
-
+
}
-}
\ No newline at end of file
+}
diff --git a/SparkleShare/Mac/SparkleShare/SparkleWindow.cs b/SparkleShare/Mac/SparkleShare/SparkleWindow.cs
new file mode 100644
index 00000000..053687f5
--- /dev/null
+++ b/SparkleShare/Mac/SparkleShare/SparkleWindow.cs
@@ -0,0 +1,69 @@
+// SparkleShare, an instant update workflow to Git.
+// Copyright (C) 2010 Hylke Bons
+//
+// 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 .
+
+
+using System;
+using System.Drawing;
+using MonoMac.Foundation;
+using MonoMac.AppKit;
+using MonoMac.ObjCRuntime;
+using MonoMac.WebKit;
+
+namespace SparkleShare {
+
+ public class SparkleWindow : NSWindow {
+
+ public readonly string LocalPath;
+
+ private NSImage SideSplash;
+
+ public SparkleWindow () : base ()
+ {
+
+ SetFrame (new RectangleF (0, 0, 640, 480), true);
+
+ Center ();
+
+ StyleMask = (NSWindowStyle.Closable |
+ NSWindowStyle.Miniaturizable |
+ NSWindowStyle.Titled);
+
+ MaxSize = new SizeF (640, 480);
+ MinSize = new SizeF (640, 480);
+ HasShadow = true;
+ BackingType = NSBackingStore.Buffered;
+
+ SideSplash = new NSImage (NSBundle.MainBundle.ResourcePath + "/Pixmaps/side-splash.png");
+ SideSplash.Size = new SizeF (150, 480);
+
+
+ NSText tv = new NSText (new RectangleF (200, 200, 200, 200)) {
+ Value = "TEST"
+ };
+
+ ContentView.AddSubview (new NSImageView (new RectangleF (0, 0, 150, 480)) { Image = SideSplash});
+ ContentView.AddSubview (new NSTextField (new RectangleF (200, 100, 128, 31)) { BezelStyle = NSTextFieldBezelStyle.Rounded});
+
+
+
+ NSApplication.SharedApplication.ActivateIgnoringOtherApps (true);
+ MakeKeyAndOrderFront (this);
+
+ }
+
+ }
+
+}
diff --git a/SparkleShare/Mac/SparkleShare/sparkleshare.icns b/SparkleShare/Mac/SparkleShare/sparkleshare.icns
new file mode 100644
index 00000000..c5501667
Binary files /dev/null and b/SparkleShare/Mac/SparkleShare/sparkleshare.icns differ
diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs
index eb6d00f4..25f5b16e 100644
--- a/SparkleShare/SparkleController.cs
+++ b/SparkleShare/SparkleController.cs
@@ -14,6 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
+
using Mono.Unix;
using SparkleLib;
using System;
@@ -25,6 +26,10 @@ using System.Threading;
using System.Text.RegularExpressions;
using System.Xml;
+using System.Net;
+using System.Security.Cryptography;
+using System.Text;
+
namespace SparkleShare {
public abstract class SparkleController {
@@ -106,8 +111,7 @@ namespace SparkleShare {
// Remove the repository when a delete event occurs
watcher.Deleted += delegate (object o, FileSystemEventArgs args) {
- if (Directory.Exists (args.FullPath))
- RemoveRepository (args.FullPath);
+ RemoveRepository (args.FullPath);
};
@@ -204,20 +208,21 @@ namespace SparkleShare {
}
- public List GetLog (string path)
+ public List GetLog (string name)
{
+ string path = Path.Combine (SparklePaths.SparklePath, name);
int log_size = 30;
- List list = new List ();
+ List list = new List ();
foreach (SparkleRepo repo in Repositories) {
if (repo.LocalPath.Equals (path)) {
foreach (SparkleCommit commit in repo.GetCommits (log_size))
- list.Add ((ChangeSet) commit);
-
+ list.Add (commit);
+
return list;
}
@@ -229,6 +234,179 @@ namespace SparkleShare {
}
+ public string GetHTMLLog (string name)
+ {
+
+ List commits = GetLog (name);
+
+ List activity_days = new List ();
+
+ foreach (SparkleCommit commit in commits) {
+
+ GetAvatar (commit.UserEmail, 32);
+
+ bool commit_inserted = false;
+ foreach (ActivityDay stored_activity_day in activity_days) {
+
+ if (stored_activity_day.DateTime.Year == commit.DateTime.Year &&
+ stored_activity_day.DateTime.Month == commit.DateTime.Month &&
+ stored_activity_day.DateTime.Day == commit.DateTime.Day) {
+
+ stored_activity_day.Add (commit);
+ commit_inserted = true;
+ break;
+
+ }
+
+ }
+
+ if (!commit_inserted) {
+
+ ActivityDay activity_day = new ActivityDay (commit.DateTime);
+ activity_day.Add (commit);
+ activity_days.Add (activity_day);
+
+ }
+
+ }
+
+
+
+
+ StreamReader reader;
+
+ reader = new StreamReader (Defines.PREFIX + "/share/sparkleshare/html/event-log.html");
+ string event_log_html = reader.ReadToEnd ();
+ reader.Close ();
+
+ reader = new StreamReader (Defines.PREFIX + "/share/sparkleshare/html/day-entry.html");
+ string day_entry_html = reader.ReadToEnd ();
+ reader.Close ();
+
+ reader = new StreamReader (Defines.PREFIX + "/share/sparkleshare/html/event-entry.html");
+ string event_entry_html = reader.ReadToEnd ();
+ reader.Close ();
+
+
+
+
+ string event_log = "";
+
+ foreach (ActivityDay activity_day in activity_days) {
+
+ string event_entries = "";
+
+ foreach (SparkleCommit change_set in activity_day) {
+
+ string event_entry = "";
+
+ if (change_set.Edited.Count > 0) {
+
+ event_entry += "- Edited
";
+
+ foreach (string file_path in change_set.Edited) {
+
+ if (File.Exists (SparkleHelpers.CombineMore (SparklePaths.SparklePath ,name , file_path))) {
+
+ event_entry += "- " + file_path + "
";
+
+ } else {
+
+ event_entry += "- " + SparkleHelpers.CombineMore (SparklePaths.SparklePath, name, file_path) + "
";
+
+ }
+
+ }
+
+ }
+
+
+ if (change_set.Added.Count > 0) {
+
+ event_entry += "- Added
";
+
+ foreach (string file_path in change_set.Added) {
+
+ if (File.Exists (SparkleHelpers.CombineMore (SparklePaths.SparklePath ,name , file_path))) {
+
+ event_entry += "- " + file_path + "
";
+
+ } else {
+
+ event_entry += "- " + SparkleHelpers.CombineMore (SparklePaths.SparklePath ,name , file_path) + "
";
+
+ }
+
+ }
+
+ }
+
+ if (change_set.Deleted.Count > 0) {
+
+ event_entry += "- Deleted
";
+
+ foreach (string file_path in change_set.Deleted) {
+
+ if (File.Exists (SparkleHelpers.CombineMore (SparklePaths.SparklePath ,name , file_path))) {
+
+ event_entry += "- " + file_path + "
";
+
+ } else {
+
+ event_entry += "- " + SparkleHelpers.CombineMore (SparklePaths.SparklePath ,name , file_path) + "
";
+
+ }
+
+ }
+
+ }
+Console.WriteLine(GetAvatar (change_set.UserEmail, 32));
+ event_entry += "
";
+ event_entries += event_entry_html.Replace ("", event_entry)
+ .Replace ("", change_set.UserName)
+ .Replace ("", "file://" +GetAvatar (change_set.UserEmail, 32) )
+ .Replace ("", change_set.DateTime.ToString ("H:mm"));
+
+ }
+
+
+
+ string day_entry = "";
+
+ DateTime today = DateTime.Now;
+ DateTime yesterday = DateTime.Now.AddDays (-1);
+
+ if (today.Day == activity_day.DateTime.Day &&
+ today.Month == activity_day.DateTime.Month &&
+ today.Year == activity_day.DateTime.Year) {
+
+ day_entry = day_entry_html.Replace ("", "Today");
+
+ } else if (yesterday.Day == activity_day.DateTime.Day &&
+ yesterday.Month == activity_day.DateTime.Month &&
+ yesterday.Year == activity_day.DateTime.Year) {
+
+ day_entry = day_entry_html.Replace ("", "Yesterday");
+
+ } else {
+
+ day_entry = day_entry_html.Replace ("",
+ "" + activity_day.DateTime.ToString ("ddd MMM d, yyyy") + "");
+
+ }
+
+ event_log += day_entry.Replace ("", event_entries);
+
+
+ }
+
+ string html = event_log_html.Replace ("", event_log);
+
+ return html;
+
+ }
+
+
// Creates a folder in the user's home folder to store configuration
private void CreateConfigurationFolders ()
{
@@ -820,6 +998,76 @@ namespace SparkleShare {
}
+
+
+ // Gets the avatar for a specific email address and size
+ public static string GetAvatar (string email, int size)
+ {
+
+ string avatar_path = SparkleHelpers.CombineMore (SparklePaths.SparkleLocalIconPath,
+ size + "x" + size, "status");
+
+ if (!Directory.Exists (avatar_path)) {
+
+ Directory.CreateDirectory (avatar_path);
+ SparkleHelpers.DebugInfo ("Config", "Created '" + avatar_path + "'");
+
+ }
+
+ string avatar_file_path = SparkleHelpers.CombineMore (avatar_path, "avatar-" + email);
+
+ if (File.Exists (avatar_file_path)) {
+
+ return avatar_file_path;
+
+ } else {
+
+ // Let's try to get the person's gravatar for next time
+ WebClient web_client = new WebClient ();
+ Uri uri = new Uri ("http://www.gravatar.com/avatar/" + GetMD5 (email) +
+ ".jpg?s=" + size + "&d=404");
+
+ string tmp_file_path = SparkleHelpers.CombineMore (SparklePaths.SparkleTmpPath, email + size);
+
+ if (!File.Exists (tmp_file_path)) {
+
+ web_client.DownloadFileAsync (uri, tmp_file_path);
+
+ web_client.DownloadFileCompleted += delegate {
+
+ if (File.Exists (avatar_file_path))
+ File.Delete (avatar_file_path);
+
+ FileInfo tmp_file_info = new FileInfo (tmp_file_path);
+
+ if (tmp_file_info.Length > 255)
+ File.Move (tmp_file_path, avatar_file_path);
+
+ };
+
+ }
+
+ // Fall back to a generic icon if there is no gravatar
+ if (File.Exists (avatar_file_path))
+ return avatar_file_path;
+ else
+ return null;
+
+ }
+
+ }
+
+
+ // Creates an MD5 hash of input
+ public static string GetMD5 (string s)
+ {
+ MD5 md5 = new MD5CryptoServiceProvider ();
+ Byte[] bytes = ASCIIEncoding.Default.GetBytes (s);
+ Byte[] encodedBytes = md5.ComputeHash (bytes);
+ return BitConverter.ToString (encodedBytes).ToLower ().Replace ("-", "");
+ }
+
+
}
@@ -827,4 +1075,21 @@ namespace SparkleShare {
}
+
+ // All commits that happened on a day
+ public class ActivityDay : List
+ {
+
+ public DateTime DateTime;
+
+ public ActivityDay (DateTime date_time)
+ {
+
+ DateTime = date_time;
+ DateTime = new DateTime (DateTime.Year, DateTime.Month, DateTime.Day);
+
+ }
+
+ }
+
}
\ No newline at end of file
diff --git a/SparkleShare/SparkleDialog.cs b/SparkleShare/SparkleDialog.cs
index 6189788e..ba2eb681 100644
--- a/SparkleShare/SparkleDialog.cs
+++ b/SparkleShare/SparkleDialog.cs
@@ -194,9 +194,9 @@ GNU Lesser General Public License for more details."; */
vbox.PackStart (new HSeparator (), false, false, 0);
vbox.PackStart (button_bar, false, false, 0);
- string image_path = SparkleHelpers.CombineMore (Defines.PREFIX, "share", "pixmaps",
- "sparkleshare-about.png");
-
+ string image_path = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "sparkleshare",
+ "pixmaps", "sparkleshare-about.png");
+ System.Console.WriteLine(image_path);
wrapper.PackStart (new Image (image_path), false, false, 0);
wrapper.PackStart (vbox, true, true, 0);
diff --git a/SparkleShare/SparkleLinController.cs b/SparkleShare/SparkleLinController.cs
index ba26ecae..228278a4 100644
--- a/SparkleShare/SparkleLinController.cs
+++ b/SparkleShare/SparkleLinController.cs
@@ -146,7 +146,7 @@ namespace SparkleShare {
Directory.CreateDirectory (SparklePaths.SparklePath);
SparkleHelpers.DebugInfo ("Controller", "Created '" + SparklePaths.SparklePath + "'");
- string icon_file_path = SparkleHelpers.CombineMore (Defines.PREFIX, "share", "icons", "hicolor",
+ string icon_file_path = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "icons", "hicolor",
"48x48", "apps", "folder-sparkleshare.png");
string gvfs_command_path = SparkleHelpers.CombineMore (Path.VolumeSeparatorChar.ToString (),
@@ -196,4 +196,4 @@ namespace SparkleShare {
}
-}
\ No newline at end of file
+}
diff --git a/SparkleShare/SparkleShare.cs b/SparkleShare/SparkleShare.cs
index e2579056..5e707832 100644
--- a/SparkleShare/SparkleShare.cs
+++ b/SparkleShare/SparkleShare.cs
@@ -25,6 +25,7 @@ using SparkleLib;
using SparkleLib.Options;
using System.Text;
+
namespace SparkleShare {
// This is SparkleShare!
@@ -83,8 +84,8 @@ namespace SparkleShare {
if (show_help)
ShowHelp (p);
-
- switch (Environment.OSVersion.Platform) {
+
+ switch (SparkleShare.Platform) {
case PlatformID.Unix:
SetProcessName ("sparkleshare");
@@ -148,6 +149,11 @@ namespace SparkleShare {
}
+
+ // Strange magic needed by SetProcessName ()
+ [DllImport ("libc")]
+ private static extern int prctl (int option, byte [] arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5);
+
// Sets the Unix process name to 'sparkleshare' instead of 'mono'
private static void SetProcessName (string name)
@@ -169,12 +175,43 @@ namespace SparkleShare {
}
}
-
-
- // Strange magic needed by SetProcessName
- [DllImport ("libc")]
- private static extern int prctl (int option, byte [] arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5);
+
+ // Strange magic needed by Platform ()
+ [DllImport ("libc")]
+ static extern int uname (IntPtr buf);
+
+
+ // This fixes the PlatformID enumeration for MacOSX in Environment.OSVersion.Platform,
+ // which is intentionally broken in Mono for hystorical reasons
+ 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;
+
+ }
+
+ }
+
}
}
diff --git a/SparkleShare/SparkleWindow.cs b/SparkleShare/SparkleWindow.cs
index 4860f88a..5183f480 100644
--- a/SparkleShare/SparkleWindow.cs
+++ b/SparkleShare/SparkleWindow.cs
@@ -48,7 +48,7 @@ namespace SparkleShare {
HBox = new HBox (false, 6);
- string image_path = SparkleHelpers.CombineMore (Defines.PREFIX, "share", "sparkleshare",
+ string image_path = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "sparkleshare",
"pixmaps", "side-splash.png");
Image side_splash = new Image (image_path);
diff --git a/data/sparkleshare-gnome.svg b/data/sparkleshare-gnome.svg
index 820af8c3..a7d050e3 100644
--- a/data/sparkleshare-gnome.svg
+++ b/data/sparkleshare-gnome.svg
@@ -16,7 +16,7 @@
inkscape:export-xdpi="90.000000"
inkscape:export-ydpi="90.000000"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:version="0.47 r22583"
+ inkscape:version="0.48.0 r9654"
sodipodi:docname="sparkleshare-gnome.svg"
sodipodi:version="0.32"
style="display:inline;enable-background:new"
@@ -30,9 +30,9 @@
guidetolerance="10000"
height="300px"
id="base"
- inkscape:current-layer="layer18"
- inkscape:cx="452.99246"
- inkscape:cy="152.00765"
+ inkscape:current-layer="layer20"
+ inkscape:cx="363.28616"
+ inkscape:cy="119.67008"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:pageopacity="0.0"
@@ -40,9 +40,9 @@
inkscape:showpageshadow="false"
inkscape:snap-bbox="true"
inkscape:snap-nodes="false"
- inkscape:window-height="805"
- inkscape:window-width="1332"
- inkscape:window-x="412"
+ inkscape:window-height="778"
+ inkscape:window-width="1280"
+ inkscape:window-x="0"
inkscape:window-y="0"
inkscape:zoom="1"
objecttolerance="10000"
@@ -2561,6 +2561,46 @@
inkscape:label="small sizes"
id="layer20"
inkscape:groupmode="layer">
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+