beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

mac window: fix coding style and whitespace

Browse source
This commit is contained in:
Hylke Bons 2011-05-13 00:58:39 +01:00
parent 24e58b1e25
commit de5f86b3a4
3 changed files with 103 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

224
SparkleShare/Mac/SparkleWindow.cs
View file

@ -28,142 +28,122 @@ using Mono.Unix;
namespace SparkleShare { namespace SparkleShare {
public class SparkleWindow : NSWindow { public class SparkleWindow : NSWindow {
private NSImage SideSplash;
private NSImageView SideSplashView;
public List <NSButton> Buttons; public List <NSButton> Buttons;
public string Header; public string Header;
public string Description; public string Description;
private NSTextField HeaderTextField;
private NSTextField DescriptionTextField;
private NSImage SideSplash;
public SparkleWindow () : base () private NSImageView SideSplashView;
{ private NSTextField HeaderTextField;
private NSTextField DescriptionTextField;
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)
};
Buttons = new List <NSButton> (); public SparkleWindow () : base ()
{
SetFrame (new RectangleF (0, 0, 640, 380), true);
StyleMask = NSWindowStyle.Titled;
HeaderTextField = new NSTextField () { MaxSize = new SizeF (640, 380);
Frame = new RectangleF (190, Frame.Height - 100, Frame.Width, 48), MinSize = new SizeF (640, 380);
BackgroundColor = NSColor.WindowBackground, HasShadow = true;
Bordered = false, BackingType = NSBackingStore.Buffered;
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
};
Center ();
NSApplication.SharedApplication.ActivateIgnoringOtherApps (true);
MakeKeyAndOrderFront (this);
OrderFrontRegardless ();
} string side_splash_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
"Pixmaps", "side-splash.png");
SideSplash = new NSImage (side_splash_path) {
public void Reset () { Size = new SizeF (150, 407)
};
ContentView.Subviews = new NSView [0];
Buttons = new List <NSButton> (); SideSplashView = new NSImageView () {
Image = SideSplash,
Header = ""; Frame = new RectangleF (0, 0, 150, 407)
Description = ""; };
} Buttons = new List <NSButton> ();
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 <NSButton> ();
Header = "";
Description = "";
}
public void ShowAll () { public void ShowAll ()
{
HeaderTextField.StringValue = Header; HeaderTextField.StringValue = Header;
DescriptionTextField.StringValue = Description; DescriptionTextField.StringValue = Description;
ContentView.AddSubview (HeaderTextField); ContentView.AddSubview (HeaderTextField);
if (!Description.Equals ("")) if (!Description.Equals (""))
ContentView.AddSubview (DescriptionTextField); ContentView.AddSubview (DescriptionTextField);
ContentView.AddSubview (SideSplashView); ContentView.AddSubview (SideSplashView);
int i = 1; int i = 1;
if (Buttons.Count > 0) {
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; // Make the button a bit wider if the text is
// likely to be longer
foreach (NSButton button in Buttons) { if (button.Title.Contains (" "))
button.Frame = new RectangleF (Frame.Width - 30 - (105 * i), 12, 120, 32);
button.BezelStyle = NSBezelStyle.Rounded;
button.Frame = new RectangleF (Frame.Width - 15 - (105 * i) , 12, 105, 32); button.Font = SparkleUI.Font;
ContentView.AddSubview (button);
if (button.Title.Contains (" ")) i++;
button.Frame = new RectangleF (Frame.Width - 30 - (105 * i) , 12, 120, 32); }
}
button.Font = SparkleUI.Font; }
ContentView.AddSubview (button);
i++;
}
}
}
public override void OrderFrontRegardless () public override void OrderFrontRegardless ()
{ {
NSApplication.SharedApplication.AddWindowsItem (this, "SparkleShare Setup", false);
NSApplication.SharedApplication.AddWindowsItem (this, "SparkleShare Setup", false); base.OrderFrontRegardless ();
base.OrderFrontRegardless (); }
}
public override void PerformClose (NSObject sender) public override void PerformClose (NSObject sender)
{ {
OrderOut (this);
OrderOut (this); NSApplication.SharedApplication.RemoveWindowsItem (this);
NSApplication.SharedApplication.RemoveWindowsItem (this); return;
return; }
}
}
}
} }

1
SparkleShare/SparkleController.cs
View file

@ -182,7 +182,6 @@ namespace SparkleShare {
// TODO: remove this later // TODO: remove this later
private void MigrateConfig () { 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"); string old_global_config_file_path = Path.Combine (SparklePaths.SparkleConfigPath, "config");
StreamReader reader = new StreamReader (old_global_config_file_path); StreamReader reader = new StreamReader (old_global_config_file_path);

2
SparkleShare/SparkleShare.cs
View file

@ -145,7 +145,7 @@ namespace SparkleShare {
// Strange magic needed by SetProcessName () // Strange magic needed by SetProcessName ()
[DllImport ("libc")] [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' // Sets the Unix process name to 'sparkleshare' instead of 'mono'