From 6f58758bd02e66b25134cc129c2d8a88155acd73 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Tue, 16 Nov 2010 00:56:21 +0000 Subject: [PATCH] [listener] Fix crash due to empty username --- SparkleLib/SparkleListener.cs | 2 +- .../SparkleShare/AppDelegate.cs | 0 .../{Cocoa => Mac}/SparkleShare/Info.plist | 0 .../{Cocoa => Mac}/SparkleShare/Main.cs | 0 .../{Cocoa => Mac}/SparkleShare/MainMenu.xib | 0 .../SparkleShare/MainMenu.xib.designer.cs | 0 .../{Cocoa => Mac}/SparkleShare/MainWindow.cs | 0 .../SparkleShare/MainWindow.xib | 0 .../SparkleShare/MainWindow.xib.designer.cs | 0 .../SparkleShare/MainWindowController.cs | 0 .../SparkleShare/SparkleShare.csproj | 0 .../SparkleShare/SparkleShare.sln | 0 SparkleShare/Mac/SparkleShare/SparkleUI.cs | 128 ++++++++++++++++++ .../SparkleShare/sparkleshare-idle-focus.png | Bin .../SparkleShare/sparkleshare-idle.png | Bin SparkleShare/SparkleController.cs | 4 +- SparkleShare/SparkleLinController.cs | 2 +- SparkleShare/SparkleShare.cs | 5 +- SparkleShare/SparkleUI.cs | 4 +- lib/TODO | 1 + 20 files changed, 138 insertions(+), 8 deletions(-) rename SparkleShare/{Cocoa => Mac}/SparkleShare/AppDelegate.cs (100%) rename SparkleShare/{Cocoa => Mac}/SparkleShare/Info.plist (100%) rename SparkleShare/{Cocoa => Mac}/SparkleShare/Main.cs (100%) rename SparkleShare/{Cocoa => Mac}/SparkleShare/MainMenu.xib (100%) rename SparkleShare/{Cocoa => Mac}/SparkleShare/MainMenu.xib.designer.cs (100%) rename SparkleShare/{Cocoa => Mac}/SparkleShare/MainWindow.cs (100%) rename SparkleShare/{Cocoa => Mac}/SparkleShare/MainWindow.xib (100%) rename SparkleShare/{Cocoa => Mac}/SparkleShare/MainWindow.xib.designer.cs (100%) rename SparkleShare/{Cocoa => Mac}/SparkleShare/MainWindowController.cs (100%) rename SparkleShare/{Cocoa => Mac}/SparkleShare/SparkleShare.csproj (100%) rename SparkleShare/{Cocoa => Mac}/SparkleShare/SparkleShare.sln (100%) create mode 100644 SparkleShare/Mac/SparkleShare/SparkleUI.cs rename SparkleShare/{Cocoa => Mac}/SparkleShare/sparkleshare-idle-focus.png (100%) rename SparkleShare/{Cocoa => Mac}/SparkleShare/sparkleshare-idle.png (100%) create mode 100644 lib/TODO diff --git a/SparkleLib/SparkleListener.cs b/SparkleLib/SparkleListener.cs index eef45c4b..9494c59f 100644 --- a/SparkleLib/SparkleListener.cs +++ b/SparkleLib/SparkleListener.cs @@ -41,7 +41,7 @@ namespace SparkleLib { Server = server; Channel = channel; - Nick = "test"; //nick.Replace ("@", "_at_").Replace (".", "_dot_"); + Nick = nick.Replace ("@", "_at_").Replace (".", "_dot_"); // Keep the nick short if (Nick.Length > 9) diff --git a/SparkleShare/Cocoa/SparkleShare/AppDelegate.cs b/SparkleShare/Mac/SparkleShare/AppDelegate.cs similarity index 100% rename from SparkleShare/Cocoa/SparkleShare/AppDelegate.cs rename to SparkleShare/Mac/SparkleShare/AppDelegate.cs diff --git a/SparkleShare/Cocoa/SparkleShare/Info.plist b/SparkleShare/Mac/SparkleShare/Info.plist similarity index 100% rename from SparkleShare/Cocoa/SparkleShare/Info.plist rename to SparkleShare/Mac/SparkleShare/Info.plist diff --git a/SparkleShare/Cocoa/SparkleShare/Main.cs b/SparkleShare/Mac/SparkleShare/Main.cs similarity index 100% rename from SparkleShare/Cocoa/SparkleShare/Main.cs rename to SparkleShare/Mac/SparkleShare/Main.cs diff --git a/SparkleShare/Cocoa/SparkleShare/MainMenu.xib b/SparkleShare/Mac/SparkleShare/MainMenu.xib similarity index 100% rename from SparkleShare/Cocoa/SparkleShare/MainMenu.xib rename to SparkleShare/Mac/SparkleShare/MainMenu.xib diff --git a/SparkleShare/Cocoa/SparkleShare/MainMenu.xib.designer.cs b/SparkleShare/Mac/SparkleShare/MainMenu.xib.designer.cs similarity index 100% rename from SparkleShare/Cocoa/SparkleShare/MainMenu.xib.designer.cs rename to SparkleShare/Mac/SparkleShare/MainMenu.xib.designer.cs diff --git a/SparkleShare/Cocoa/SparkleShare/MainWindow.cs b/SparkleShare/Mac/SparkleShare/MainWindow.cs similarity index 100% rename from SparkleShare/Cocoa/SparkleShare/MainWindow.cs rename to SparkleShare/Mac/SparkleShare/MainWindow.cs diff --git a/SparkleShare/Cocoa/SparkleShare/MainWindow.xib b/SparkleShare/Mac/SparkleShare/MainWindow.xib similarity index 100% rename from SparkleShare/Cocoa/SparkleShare/MainWindow.xib rename to SparkleShare/Mac/SparkleShare/MainWindow.xib diff --git a/SparkleShare/Cocoa/SparkleShare/MainWindow.xib.designer.cs b/SparkleShare/Mac/SparkleShare/MainWindow.xib.designer.cs similarity index 100% rename from SparkleShare/Cocoa/SparkleShare/MainWindow.xib.designer.cs rename to SparkleShare/Mac/SparkleShare/MainWindow.xib.designer.cs diff --git a/SparkleShare/Cocoa/SparkleShare/MainWindowController.cs b/SparkleShare/Mac/SparkleShare/MainWindowController.cs similarity index 100% rename from SparkleShare/Cocoa/SparkleShare/MainWindowController.cs rename to SparkleShare/Mac/SparkleShare/MainWindowController.cs diff --git a/SparkleShare/Cocoa/SparkleShare/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare/SparkleShare.csproj similarity index 100% rename from SparkleShare/Cocoa/SparkleShare/SparkleShare.csproj rename to SparkleShare/Mac/SparkleShare/SparkleShare.csproj diff --git a/SparkleShare/Cocoa/SparkleShare/SparkleShare.sln b/SparkleShare/Mac/SparkleShare/SparkleShare.sln similarity index 100% rename from SparkleShare/Cocoa/SparkleShare/SparkleShare.sln rename to SparkleShare/Mac/SparkleShare/SparkleShare.sln diff --git a/SparkleShare/Mac/SparkleShare/SparkleUI.cs b/SparkleShare/Mac/SparkleShare/SparkleUI.cs new file mode 100644 index 00000000..30ab976b --- /dev/null +++ b/SparkleShare/Mac/SparkleShare/SparkleUI.cs @@ -0,0 +1,128 @@ +using System; +using System.Drawing; +using MonoMac.Foundation; +using MonoMac.AppKit; +using MonoMac.ObjCRuntime; +using SparkleLib; + +namespace SparkleShare +{ + + [MonoMac.Foundation.Register("AppDelegate")] + public class SparkleUI : NSApplicationDelegate + { + public void Run () { + NSApplication.Main (new string [1] {""}); + } +public SparkleUI () {NSApplication.Init (); + + Console.WriteLine("HI!2"); + // SparkleFetcher fetch = new SparkleFetcher ("", ""); + //SparkleRepo repo = new SparkleRepo ("/Users/hbons/Code/SparkleShare"); + + // SparkleStatusIcon = new SparkleStatusIcon (); + + + var 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 (16, 16); + statusItem.AlternateImage.Size = new SizeF (16, 16); + + NSMenu menu = new NSMenu() {}; + menu.AddItem (new NSMenuItem () { Title="Up to date (102 MB)", Enabled = true }); + menu.AddItem (NSMenuItem.SeparatorItem); + + var item = new NSMenuItem () { + Title="SparkleShare", Enabled = true, + Action = new Selector ("ddd") + }; + + item.Activated += delegate { + Console.WriteLine ("DDDD"); + }; + + item.Image = NSImage.ImageNamed ("NSFolder"); + item.Image.Size = new SizeF (16, 16); + + menu.AddItem (item); + + var tmp = new NSMenuItem () { + Title="gnome-design", Enabled = true, + Action = new Selector ("ddd") + }; + + tmp.Activated += delegate { + Console.WriteLine ("DDDD"); + }; + + tmp.Image = NSImage.ImageNamed ("NSFolder"); + tmp.Image.Size = new SizeF (16, 16); + + menu.AddItem (tmp); + menu.AddItem (NSMenuItem.SeparatorItem); + + Console.WriteLine (item.Action.Name); + + NSMenuItem sync_menu_item = new NSMenuItem () { + Title = "Sync Remote Folder..." + }; + + sync_menu_item.Activated += delegate { + Console.WriteLine ("DDDD"); + }; + + menu.AddItem (sync_menu_item); + menu.AddItem (NSMenuItem.SeparatorItem); + + NSMenuItem notifications_menu_item = new NSMenuItem () { + Title = "Show Notifications", + State = NSCellStateValue.On + }; + + notifications_menu_item.Activated += delegate { + statusItem.Image = NSImage.ImageNamed ("NSComputer"); + if (notifications_menu_item.State == NSCellStateValue.On) + notifications_menu_item.State = NSCellStateValue.Off; + else + notifications_menu_item.State = NSCellStateValue.On; + }; + + menu.AddItem (notifications_menu_item); + menu.AddItem (NSMenuItem.SeparatorItem); + + NSMenuItem about_menu_item = new NSMenuItem () { + Title = "About" + }; + + about_menu_item.Activated += delegate { + Console.WriteLine ("DDDD"); + statusItem.Title = "bla"; + }; + + menu.AddItem (about_menu_item); + menu.AddItem (NSMenuItem.SeparatorItem); + + NSMenuItem quit_menu_item = new NSMenuItem () { + Title = "Quit" + }; + quit_menu_item.Activated += delegate { + Console.WriteLine ("DDDD"); + Environment.Exit (0); + }; + + menu.AddItem (quit_menu_item); + + + + statusItem.Menu = menu; + statusItem.HighlightMode = true; + } + } +} + + + diff --git a/SparkleShare/Cocoa/SparkleShare/sparkleshare-idle-focus.png b/SparkleShare/Mac/SparkleShare/sparkleshare-idle-focus.png similarity index 100% rename from SparkleShare/Cocoa/SparkleShare/sparkleshare-idle-focus.png rename to SparkleShare/Mac/SparkleShare/sparkleshare-idle-focus.png diff --git a/SparkleShare/Cocoa/SparkleShare/sparkleshare-idle.png b/SparkleShare/Mac/SparkleShare/sparkleshare-idle.png similarity index 100% rename from SparkleShare/Cocoa/SparkleShare/sparkleshare-idle.png rename to SparkleShare/Mac/SparkleShare/sparkleshare-idle.png diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 10b7867f..da55eadc 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -63,7 +63,7 @@ namespace SparkleShare { public SparkleController () { - + Console.WriteLine (SparkleShare.UserName + "<<<<<<"); SetProcessName ("sparkleshare"); InstallLauncher (); @@ -498,4 +498,4 @@ namespace SparkleShare { } -} +} \ No newline at end of file diff --git a/SparkleShare/SparkleLinController.cs b/SparkleShare/SparkleLinController.cs index 70b261c1..e40d0d4f 100644 --- a/SparkleShare/SparkleLinController.cs +++ b/SparkleShare/SparkleLinController.cs @@ -177,4 +177,4 @@ namespace SparkleShare { } -} +} \ No newline at end of file diff --git a/SparkleShare/SparkleShare.cs b/SparkleShare/SparkleShare.cs index 46365136..2779f00e 100644 --- a/SparkleShare/SparkleShare.cs +++ b/SparkleShare/SparkleShare.cs @@ -30,8 +30,8 @@ namespace SparkleShare { public static SparkleController Controller; public static SparkleUI UI; - public static string UserName; - public static string UserEmail; + public static string UserName = ""; + public static string UserEmail = ""; // Short alias for the translations @@ -174,6 +174,7 @@ namespace SparkleShare { StreamReader reader = new StreamReader (global_config_file_path); + // TODO: Properly look at the variable name // Discard the first two lines reader.ReadLine (); reader.ReadLine (); diff --git a/SparkleShare/SparkleUI.cs b/SparkleShare/SparkleUI.cs index d83c1336..8ce3cf2f 100644 --- a/SparkleShare/SparkleUI.cs +++ b/SparkleShare/SparkleUI.cs @@ -50,7 +50,7 @@ namespace SparkleShare { // Create the statusicon StatusIcon = new SparkleStatusIcon (); - // Keep track of event logs are open + // Keep track of which event logs are open SparkleUI.OpenLogs = new List (); SparkleShare.Controller.OnFirstRun += delegate { @@ -168,4 +168,4 @@ namespace SparkleShare { } -} +} \ No newline at end of file diff --git a/lib/TODO b/lib/TODO new file mode 100644 index 00000000..9aae26c4 --- /dev/null +++ b/lib/TODO @@ -0,0 +1 @@ +Move GitSharp, NotifySharp and SmartIrc4Net to here