From e1633aba8eefaf75696953747395044165d08764 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 2 Dec 2012 22:21:59 +0000 Subject: [PATCH] linux: fix build --- SparkleShare/Mac/SparkleAbout.cs | 99 +++++++++++++------------- SparkleShare/Mac/SparkleStatusIcon.cs | 8 +-- SparkleShare/SparkleAboutController.cs | 1 + 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/SparkleShare/Mac/SparkleAbout.cs b/SparkleShare/Mac/SparkleAbout.cs index f654d7ec..583357f2 100755 --- a/SparkleShare/Mac/SparkleAbout.cs +++ b/SparkleShare/Mac/SparkleAbout.cs @@ -136,7 +136,6 @@ namespace SparkleShare { new PointF (this.report_problem_link.Frame.X + this.report_problem_link.Frame.Width + 10, 25), this.debug_log_link.Frame.Size); - ContentView.AddSubview (this.about_image_view); ContentView.AddSubview (this.version_text_field); ContentView.AddSubview (this.updates_text_field); @@ -169,58 +168,58 @@ namespace SparkleShare { return; } - } - public class SparkleAboutDelegate : NSWindowDelegate { + private class SparkleAboutDelegate : NSWindowDelegate { + + public override bool WindowShouldClose (NSObject sender) + { + (sender as SparkleAbout).Controller.WindowClosed (); + return false; + } + } - public override bool WindowShouldClose (NSObject sender) - { - (sender as SparkleAbout).Controller.WindowClosed (); - return false; - } - } - - - public class SparkleLink : NSTextField { - - private NSUrl url; - - - public SparkleLink (string text, string address) : base () - { - this.url = new NSUrl (address); - - AllowsEditingTextAttributes = true; - BackgroundColor = NSColor.White; - Bordered = false; - DrawsBackground = false; - Editable = false; - Selectable = false; - - NSData name_data = NSData.FromString ("" + text + ""); - - NSDictionary name_dictionary = new NSDictionary(); - NSAttributedString name_attributes = new NSAttributedString (name_data, new NSUrl ("file://"), out name_dictionary); - - NSMutableAttributedString s = new NSMutableAttributedString (); - s.Append (name_attributes); - - Cell.AttributedStringValue = s; - SizeToFit (); - } - - - public override void MouseUp (NSEvent e) - { - Program.Controller.OpenWebsite (this.url.ToString ()); - } - - - public override void ResetCursorRects () - { - AddCursorRect (Bounds, NSCursor.PointingHandCursor); + + private class SparkleLink : NSTextField { + + private NSUrl url; + + + public SparkleLink (string text, string address) : base () + { + this.url = new NSUrl (address); + + AllowsEditingTextAttributes = true; + BackgroundColor = NSColor.White; + Bordered = false; + DrawsBackground = false; + Editable = false; + Selectable = false; + + NSData name_data = NSData.FromString ("" + text + ""); + + NSDictionary name_dictionary = new NSDictionary(); + NSAttributedString name_attributes = new NSAttributedString (name_data, new NSUrl ("file://"), out name_dictionary); + + NSMutableAttributedString s = new NSMutableAttributedString (); + s.Append (name_attributes); + + Cell.AttributedStringValue = s; + SizeToFit (); + } + + + public override void MouseUp (NSEvent e) + { + Program.Controller.OpenWebsite (this.url.ToString ()); + } + + + public override void ResetCursorRects () + { + AddCursorRect (Bounds, NSCursor.PointingHandCursor); + } } } } diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs index 1222cbfc..ae7167c8 100755 --- a/SparkleShare/Mac/SparkleStatusIcon.cs +++ b/SparkleShare/Mac/SparkleStatusIcon.cs @@ -179,11 +179,11 @@ namespace SparkleShare { if (Controller.RecentEventsItemEnabled) - this.recent_events_item.Activated += Controller.RecentEventsClicked; + this.recent_events_item.Activated += delegate { Controller.RecentEventsClicked (); }; - this.add_item.Activated += Controller.AddHostedProjectClicked; - this.about_item.Activated += Controller.AboutClicked; - this.quit_item.Activated += Controller.QuitClicked; + this.add_item.Activated += delegate { Controller.AddHostedProjectClicked (); }; + this.about_item.Activated += delegate { Controller.AboutClicked (); }; + this.quit_item.Activated += delegate { Controller.QuitClicked (); }; this.menu.AddItem (this.state_item); diff --git a/SparkleShare/SparkleAboutController.cs b/SparkleShare/SparkleAboutController.cs index febec364..19b38317 100755 --- a/SparkleShare/SparkleAboutController.cs +++ b/SparkleShare/SparkleAboutController.cs @@ -73,6 +73,7 @@ namespace SparkleShare { UpdateLabelEvent ("You are running the latest version."); } catch { + UpdateLabelEvent ("Version check failed."); } } }