From de5f86b3a4a8da36d85c2009ce29cb7d699d2cea Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Fri, 13 May 2011 00:58:39 +0100 Subject: [PATCH] mac window: fix coding style and whitespace --- SparkleShare/Mac/SparkleWindow.cs | 224 ++++++++++++++---------------- SparkleShare/SparkleController.cs | 1 - SparkleShare/SparkleShare.cs | 2 +- 3 files changed, 103 insertions(+), 124 deletions(-) diff --git a/SparkleShare/Mac/SparkleWindow.cs b/SparkleShare/Mac/SparkleWindow.cs index d3fec5e1..868203ff 100644 --- a/SparkleShare/Mac/SparkleWindow.cs +++ b/SparkleShare/Mac/SparkleWindow.cs @@ -28,142 +28,122 @@ using Mono.Unix; namespace SparkleShare { - public class SparkleWindow : NSWindow { - - private NSImage SideSplash; - private NSImageView SideSplashView; + public class SparkleWindow : NSWindow { - public List Buttons; - public string Header; - public string Description; - - private NSTextField HeaderTextField; - private NSTextField DescriptionTextField; + public List Buttons; + public string Header; + public string Description; - - public SparkleWindow () : base () - { - - SetFrame (new RectangleF (0, 0, 640, 380), true); - - StyleMask = NSWindowStyle.Titled; - MaxSize = new SizeF (640, 380); - MinSize = new SizeF (640, 380); - HasShadow = true; - BackingType = NSBackingStore.Buffered; - - Center (); - - string side_splash_path = Path.Combine (NSBundle.MainBundle.ResourcePath, - "Pixmaps", "side-splash.png"); - - SideSplash = new NSImage (side_splash_path) { - Size = new SizeF (150, 407) - }; - - SideSplashView = new NSImageView () { - Image = SideSplash, - Frame = new RectangleF (0, 0, 150, 407) - }; + private NSImage SideSplash; + private NSImageView SideSplashView; + private NSTextField HeaderTextField; + private NSTextField DescriptionTextField; - Buttons = new List (); + public SparkleWindow () : base () + { + SetFrame (new RectangleF (0, 0, 640, 380), true); - - HeaderTextField = new NSTextField () { - Frame = new RectangleF (190, Frame.Height - 100, Frame.Width, 48), - BackgroundColor = NSColor.WindowBackground, - Bordered = false, - Editable = false, - Font = NSFontManager.SharedFontManager.FontWithFamily - ("Lucida Grande", NSFontTraitMask.Bold, 0, 15) - }; - - DescriptionTextField = new NSTextField () { - Frame = new RectangleF (190, Frame.Height - 155 , 640 - 240, 64), - BackgroundColor = NSColor.WindowBackground, - Bordered = false, - Editable = false, - Font = SparkleUI.Font - }; + StyleMask = NSWindowStyle.Titled; + MaxSize = new SizeF (640, 380); + MinSize = new SizeF (640, 380); + HasShadow = true; + BackingType = NSBackingStore.Buffered; - - NSApplication.SharedApplication.ActivateIgnoringOtherApps (true); - MakeKeyAndOrderFront (this); - - OrderFrontRegardless (); + Center (); - } + string side_splash_path = Path.Combine (NSBundle.MainBundle.ResourcePath, + "Pixmaps", "side-splash.png"); - - public void Reset () { - - ContentView.Subviews = new NSView [0]; - Buttons = new List (); - - Header = ""; - Description = ""; - - } + SideSplash = new NSImage (side_splash_path) { + Size = new SizeF (150, 407) + }; + + SideSplashView = new NSImageView () { + Image = SideSplash, + Frame = new RectangleF (0, 0, 150, 407) + }; + + Buttons = new List (); + + HeaderTextField = new NSTextField () { + Frame = new RectangleF (190, Frame.Height - 100, Frame.Width, 48), + BackgroundColor = NSColor.WindowBackground, + Bordered = false, + Editable = false, + Font = NSFontManager.SharedFontManager.FontWithFamily + ("Lucida Grande", NSFontTraitMask.Bold, 0, 15) + }; + + DescriptionTextField = new NSTextField () { + Frame = new RectangleF (190, Frame.Height - 155 , 640 - 240, 64), + BackgroundColor = NSColor.WindowBackground, + Bordered = false, + Editable = false, + Font = SparkleUI.Font + }; + + NSApplication.SharedApplication.ActivateIgnoringOtherApps (true); + MakeKeyAndOrderFront (this); + + OrderFrontRegardless (); + } + + + public void Reset () + { + ContentView.Subviews = new NSView [0]; + Buttons = new List (); + Header = ""; + Description = ""; + } - public void ShowAll () { - - HeaderTextField.StringValue = Header; - DescriptionTextField.StringValue = Description; - - ContentView.AddSubview (HeaderTextField); + public void ShowAll () + { + HeaderTextField.StringValue = Header; + DescriptionTextField.StringValue = Description; + + ContentView.AddSubview (HeaderTextField); - if (!Description.Equals ("")) - ContentView.AddSubview (DescriptionTextField); - - ContentView.AddSubview (SideSplashView); - - int i = 1; - - if (Buttons.Count > 0) { + if (!Description.Equals ("")) + ContentView.AddSubview (DescriptionTextField); + + ContentView.AddSubview (SideSplashView); + + int i = 1; + if (Buttons.Count > 0) { + DefaultButtonCell = Buttons [0].Cell; + + foreach (NSButton button in Buttons) { + button.BezelStyle = NSBezelStyle.Rounded; + button.Frame = new RectangleF (Frame.Width - 15 - (105 * i), 12, 105, 32); - DefaultButtonCell = Buttons [0].Cell; - - foreach (NSButton button in Buttons) { - - button.BezelStyle = NSBezelStyle.Rounded; - button.Frame = new RectangleF (Frame.Width - 15 - (105 * i) , 12, 105, 32); - - if (button.Title.Contains (" ")) - button.Frame = new RectangleF (Frame.Width - 30 - (105 * i) , 12, 120, 32); - - button.Font = SparkleUI.Font; - - ContentView.AddSubview (button); - - i++; - - } - - } - - } + // Make the button a bit wider if the text is + // likely to be longer + if (button.Title.Contains (" ")) + button.Frame = new RectangleF (Frame.Width - 30 - (105 * i), 12, 120, 32); + + button.Font = SparkleUI.Font; + ContentView.AddSubview (button); + i++; + } + } + } - public override void OrderFrontRegardless () - { - - NSApplication.SharedApplication.AddWindowsItem (this, "SparkleShare Setup", false); - base.OrderFrontRegardless (); - - } + public override void OrderFrontRegardless () + { + NSApplication.SharedApplication.AddWindowsItem (this, "SparkleShare Setup", false); + base.OrderFrontRegardless (); + } - public override void PerformClose (NSObject sender) - { - - OrderOut (this); - NSApplication.SharedApplication.RemoveWindowsItem (this); - return; - - } - - } - + public override void PerformClose (NSObject sender) + { + OrderOut (this); + NSApplication.SharedApplication.RemoveWindowsItem (this); + return; + } + } } diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index c7c09189..ab89e073 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -182,7 +182,6 @@ namespace SparkleShare { // TODO: remove this later private void MigrateConfig () { - string global_config_file_path = Path.Combine (SparklePaths.SparkleConfigPath, "config.xml"); string old_global_config_file_path = Path.Combine (SparklePaths.SparkleConfigPath, "config"); StreamReader reader = new StreamReader (old_global_config_file_path); diff --git a/SparkleShare/SparkleShare.cs b/SparkleShare/SparkleShare.cs index 6f941a50..cfb491e9 100644 --- a/SparkleShare/SparkleShare.cs +++ b/SparkleShare/SparkleShare.cs @@ -145,7 +145,7 @@ namespace SparkleShare { // Strange magic needed by SetProcessName () [DllImport ("libc")] - private static extern int prctl (int option, byte [] arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5); + 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'