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

Merge branch 'config_nightly' of https://github.com/markusstoll/SparkleShare into config_nightly

Browse source 
* 'config_nightly' of https://github.com/markusstoll/SparkleShare:
  Fix usage of NSImage - object cannot be reused after setting Size NSImage does the caching for us anyway
  Fix Project settings for Release
This commit is contained in:
Markus Stoll 2014-11-25 00:33:17 +01:00
parent 4b9037d08b 6e855c8fe3
commit 65c69a1510
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SparkleShare/Mac/SparkleShare.csproj
View file

@ -29,7 +29,7 @@
<EnableCodeSigning>False</EnableCodeSigning>
<CreatePackage>False</CreatePackage>
<EnablePackageSigning>False</EnablePackageSigning>
<IncludeMonoRuntime>false</IncludeMonoRuntime>
<IncludeMonoRuntime>True</IncludeMonoRuntime>
<ConsolePause>False</ConsolePause>
<CodeSigningKey>Mac Developer</CodeSigningKey>
<PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>

7
SparkleShare/Mac/SparkleStatusIcon.cs
View file

@ -47,7 +47,7 @@ namespace SparkleShare {
private NSImage folder_image = NSImage.ImageNamed ("NSFolder");
private NSImage caution_image = NSImage.ImageNamed ("NSCaution");
private NSImage sparkleshare_image = NSImage.ImageNamed ("sparkleshare-folder");
private string sparkleshare_image_name = "sparkleshare-folder.icns";
public SparkleStatusIcon ()
@ -57,7 +57,8 @@ namespace SparkleShare {
this.status_item.Image.Template = true;
if (Environment.OSVersion.Version.Major >= 14)
this.sparkleshare_image = NSImage.ImageNamed ("sparkleshare-folder-yosemite");
this.sparkleshare_image_name = "sparkleshare-folder-yosemite.icns";
CreateMenu ();
@ -113,7 +114,7 @@ namespace SparkleShare {
Enabled = true
};
this.folder_item.Image = this.sparkleshare_image;
this.folder_item.Image = NSImage.ImageNamed(this.sparkleshare_image_name);
this.folder_item.Image.Size = new SizeF (16, 16);
this.add_item = new NSMenuItem () {