diff --git a/SparkleLib/SparkleRepo.cs b/SparkleLib/SparkleRepo.cs
index beca70a8..aed2fa56 100644
--- a/SparkleLib/SparkleRepo.cs
+++ b/SparkleLib/SparkleRepo.cs
@@ -15,11 +15,6 @@
// along with this program. If not, see .
-using GitSharp;
-using GitSharp.Commands;
-using GitSharp.Core.Transport;
-using Meebey.SmartIrc4net;
-using Mono.Unix;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -27,6 +22,12 @@ using System.IO;
using System.Text.RegularExpressions;
using System.Timers;
+using GitSharp;
+using GitSharp.Commands;
+using GitSharp.Core.Transport;
+using Meebey.SmartIrc4net;
+using Mono.Unix;
+
namespace SparkleLib {
public class SparkleRepo : Repository {
diff --git a/SparkleShare/Mac/MainMenu.xib b/SparkleShare/Mac/MainMenu.xib
index 472b3d05..54551193 100644
--- a/SparkleShare/Mac/MainMenu.xib
+++ b/SparkleShare/Mac/MainMenu.xib
@@ -12,7 +12,7 @@
534
+
@@ -1768,7 +1776,7 @@
- 534
+ 538
diff --git a/SparkleShare/Mac/SparkleLog.cs b/SparkleShare/Mac/SparkleLog.cs
index db997d35..b2c24238 100644
--- a/SparkleShare/Mac/SparkleLog.cs
+++ b/SparkleShare/Mac/SparkleLog.cs
@@ -17,13 +17,13 @@
using System;
using System.Drawing;
+using System.IO;
+
using MonoMac.Foundation;
using MonoMac.AppKit;
using MonoMac.ObjCRuntime;
using MonoMac.WebKit;
-using System.IO;
-
namespace SparkleShare {
public class SparkleLog : NSWindow {
diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj
index dcb392ce..6d2a74a9 100644
--- a/SparkleShare/Mac/SparkleShare.csproj
+++ b/SparkleShare/Mac/SparkleShare.csproj
@@ -101,6 +101,7 @@
SparkleShare.cs
+
diff --git a/SparkleShare/Mac/SparkleUI.cs b/SparkleShare/Mac/SparkleUI.cs
index 46d348a6..31ac0e89 100644
--- a/SparkleShare/Mac/SparkleUI.cs
+++ b/SparkleShare/Mac/SparkleUI.cs
@@ -20,6 +20,7 @@ using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Timers;
+
using MonoMac.Foundation;
using MonoMac.AppKit;
using MonoMac.ObjCRuntime;
@@ -28,35 +29,27 @@ using MonoMac.WebKit;
namespace SparkleShare {
public partial class AppDelegate : NSApplicationDelegate {
-
- public override void WillBecomeActive (NSNotification notification)
- {
-
- SparkleUI.NewEvents = 0;
- NSApplication.SharedApplication.DockTile.BadgeLabel = null;
-
- }
-
+
}
-
+
public class SparkleUI : AppDelegate
{
-
+
public static SparkleStatusIcon StatusIcon;
public static List OpenLogs;
public static int NewEvents;
public static SparkleIntro Intro;
public static NSFont Font;
+ public SparkleAbout About;
-
public SparkleUI ()
{
-
+
NSApplication.Init ();
SetSparkleIcon ();
-
+
// TODO: Getting crashes when I remove this
NSApplication.SharedApplication.ApplicationIconImage
= NSImage.ImageNamed ("sparkleshare.icns");
@@ -64,17 +57,18 @@ namespace SparkleShare {
Font = NSFontManager.SharedFontManager.FontWithFamily
("Lucida Grande", NSFontTraitMask.Condensed, 0, 13);
-
+
OpenLogs = new List ();
StatusIcon = new SparkleStatusIcon ();
-
+
NewEvents = 0;
-
+
+
SparkleShare.Controller.NotificationRaised += delegate {
-
+
InvokeOnMainThread (delegate {
-
+
NewEvents++;
NSApplication.SharedApplication.DockTile.BadgeLabel = NewEvents.ToString ();
@@ -124,7 +118,7 @@ namespace SparkleShare {
public void SetSparkleIcon ()
{
-
+
string folder_icon_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
"sparkleshare-mac.icns");
@@ -132,17 +126,34 @@ namespace SparkleShare {
NSWorkspace.SharedWorkspace.SetIconforFile (folder_icon,
SparkleShare.Controller.SparklePath, 0);
-
+
}
-
-
+
+
public void Run ()
{
-
- NSApplication.Main (new string [0]);
-
+
+ NSApplication.Main (new string [0]);
+
}
-
+
+
+ public override void WillBecomeActive (NSNotification notification)
+ {
+
+ NewEvents = 0;
+ NSApplication.SharedApplication.DockTile.BadgeLabel = null;
+
+ }
+
+ public override void OrderFrontStandardAboutPanel (NSObject sender)
+ {
+
+ // FIXME: Doesn't work
+ About = new SparkleAbout ();
+
+ }
+
}
}