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

mac ui: Remove unused method

Browse source
This commit is contained in:
Hylke Bons 2016-03-31 15:44:54 +01:00
parent 37769da70f
commit 1423c2d4ca
7 changed files with 15 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -33,6 +33,7 @@ missing
build/m4/shave/shave
build/m4/*.m4
build/m4/shave/shave-libtool
Sparkles/InstallationInfo.Directory.cs
SparkleShare/Linux/sparkleshare
SparkleShare/Mac/git*
gnome-doc-utils.make

4
SparkleShare/Mac/Controller.cs
View file

@ -138,7 +138,7 @@ namespace SparkleShare {
public override void SetFolderIcon ()
{
/* if (Environment.OSVersion.Version.Major >= 14) {
if (Environment.OSVersion.Version.Major >= 14) {
NSWorkspace.SharedWorkspace.SetIconforFile (
NSImage.ImageNamed ("sparkleshare-folder-yosemite.icns"),
SparkleShare.Controller.FoldersPath, 0);
@ -147,7 +147,7 @@ namespace SparkleShare {
NSWorkspace.SharedWorkspace.SetIconforFile (
NSImage.ImageNamed ("sparkleshare-folder.icns"),
SparkleShare.Controller.FoldersPath, 0);
}*/
}
}

18
SparkleShare/Mac/SparkleShare.Mac.csproj
View file

@ -148,18 +148,9 @@
<Content Include="..\Common\HTML\event-log.html">
<Link>HTML\event-log.html</Link>
</Content>
<Content Include="Resources\sparkleshare-folder.icns">
<Link>Resources\sparkleshare-folder.icns</Link>
</Content>
<Content Include="Resources\sparkleshare-app.icns">
<Link>Resources\sparkleshare-app.icns</Link>
</Content>
<Content Include="..\Common\HTML\jquery.js">
<Link>HTML\jquery.js</Link>
</Content>
<Content Include="Resources\sparkleshare-folder-yosemite.icns">
<Link>Resources\sparkleshare-folder-yosemite.icns</Link>
</Content>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
@ -264,6 +255,15 @@
<BundleResource Include="..\Common\Pixmaps\text-balloon%402x.png">
<Link>Resources\text-balloon%402x.png</Link>
</BundleResource>
<BundleResource Include="Resources\sparkleshare-app.icns">
<Link>Resources\sparkleshare-app.icns</Link>
</BundleResource>
<BundleResource Include="Resources\sparkleshare-folder.icns">
<Link>Resources\sparkleshare-folder.icns</Link>
</BundleResource>
<BundleResource Include="Resources\sparkleshare-folder-yosemite.icns">
<Link>Resources\sparkleshare-folder-yosemite.icns</Link>
</BundleResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Sparkles\Sparkles.csproj">

8
SparkleShare/Mac/UserInterface/About.cs
View file

@ -144,10 +144,6 @@ namespace SparkleShare {
{
NSApplication.SharedApplication.ActivateIgnoringOtherApps (true);
MakeKeyAndOrderFront (this);
if (SparkleShare.UI != null)
SparkleShare.UI.UpdateDockIconVisibility ();
base.OrderFrontRegardless ();
}
@ -155,10 +151,6 @@ namespace SparkleShare {
public override void PerformClose (NSObject sender)
{
base.OrderOut (this);
if (SparkleShare.UI != null)
SparkleShare.UI.UpdateDockIconVisibility ();
return;
}

10
SparkleShare/Mac/UserInterface/EventLog.cs
View file

@ -329,7 +329,7 @@ namespace SparkleShare {
{
string pixmaps_path = "file://" + NSBundle.MainBundle.ResourcePath;
html = html.Replace ("<!-- $body-font-family -->", "Helvetica Neue");
html = html.Replace ("<!-- $body-font-family -->", UserInterface.FontName);
html = html.Replace ("<!-- $day-entry-header-font-size -->", "13.6px");
html = html.Replace ("<!-- $body-font-size -->", "13.4px");
html = html.Replace ("<!-- $secondary-font-color -->", "#bbb");
@ -368,10 +368,6 @@ namespace SparkleShare {
{
NSApplication.SharedApplication.ActivateIgnoringOtherApps (true);
MakeKeyAndOrderFront (this);
if (SparkleShare.UI != null)
SparkleShare.UI.UpdateDockIconVisibility ();
base.OrderFrontRegardless ();
}
@ -379,10 +375,6 @@ namespace SparkleShare {
public override void PerformClose (NSObject sender)
{
base.OrderOut (this);
if (SparkleShare.UI != null)
SparkleShare.UI.UpdateDockIconVisibility ();
return;
}
}

11
SparkleShare/Mac/UserInterface/Note.cs
View file

@ -197,10 +197,6 @@ namespace SparkleShare {
{
NSApplication.SharedApplication.ActivateIgnoringOtherApps (true);
MakeKeyAndOrderFront (this);
if (SparkleShare.UI != null)
SparkleShare.UI.UpdateDockIconVisibility ();
base.OrderFrontRegardless ();
}
@ -208,20 +204,17 @@ namespace SparkleShare {
public override void PerformClose (NSObject sender)
{
base.OrderOut (this);
if (SparkleShare.UI != null)
SparkleShare.UI.UpdateDockIconVisibility ();
return;
}
public override bool AcceptsFirstResponder ()
{
return true;
}
private class SparkleNoteDelegate : NSWindowDelegate {
class SparkleNoteDelegate : NSWindowDelegate {
public override bool WindowShouldClose (NSObject sender)
{

10
SparkleShare/Mac/UserInterface/SetupWindow.cs
View file

@ -70,9 +70,6 @@ namespace SparkleShare {
};
this.header_text_field.Cell.LineBreakMode = NSLineBreakMode.TruncatingTail;
if (SparkleShare.UI != null)
SparkleShare.UI.UpdateDockIconVisibility ();
}
@ -128,10 +125,6 @@ namespace SparkleShare {
NSApplication.SharedApplication.AddWindowsItem (this, "SparkleShare Setup", false);
NSApplication.SharedApplication.ActivateIgnoringOtherApps (true);
MakeKeyAndOrderFront (this);
if (SparkleShare.UI != null)
SparkleShare.UI.UpdateDockIconVisibility ();
OrderFrontRegardless ();
}
@ -141,9 +134,6 @@ namespace SparkleShare {
OrderOut (this);
NSApplication.SharedApplication.RemoveWindowsItem (this);
if (SparkleShare.UI != null)
SparkleShare.UI.UpdateDockIconVisibility ();
return;
}