Add Mac solution file and restructure
This commit is contained in:
Hylke Bons
parent
5a3958f73e
commit
9094ee945e
21
SparkleShare/Mac/AppDelegate.cs
Normal file
21
SparkleShare/Mac/AppDelegate.cs
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
using System;
|
||||
using System.Drawing;
|
||||
using MonoMac.Foundation;
|
||||
using MonoMac.AppKit;
|
||||
using MonoMac.ObjCRuntime;
|
||||
|
||||
namespace test2
|
||||
{
|
||||
public partial class AppDelegate : NSApplicationDelegate
|
||||
{
|
||||
|
||||
public AppDelegate ()
|
||||
{
|
||||
}
|
||||
|
||||
public override void FinishedLaunching (NSObject notification)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3,12 +3,7 @@
|
|||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>sparkleshare.icns</string>
|
||||
<key>LSEnvironment</key>
|
||||
<dict>
|
||||
<key>PATH</key>
|
||||
<string>/opt/local/bin</string>
|
||||
</dict>
|
||||
<string>sparkleshare</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.sparkleshare.sparkleshare</string>
|
||||
<key>CFBundleName</key>
|
||||
|
|
@ -21,7 +16,5 @@
|
|||
<string>MainMenu</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string>NSApplication</string>
|
||||
<key>LSBackgroundOnly</key>
|
||||
<false/>
|
||||
</dict>
|
||||
</plist>
|
||||
2245
SparkleShare/Mac/MainMenu.xib
Normal file
2245
SparkleShare/Mac/MainMenu.xib
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -128,8 +128,7 @@ namespace SparkleShare {
|
|||
html = html.Replace ("<!-- $a-color -->", "#0085cf");
|
||||
html = html.Replace ("<!-- $no-buddy-icon-background-image -->",
|
||||
"file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "avatar-default.png"));
|
||||
|
||||
Console.WriteLine (html);
|
||||
|
||||
WebView.MainFrame.LoadHtmlString (html, new NSUrl (""));
|
||||
|
||||
Update ();
|
||||
160
SparkleShare/Mac/SparkleShare.csproj
Normal file
160
SparkleShare/Mac/SparkleShare.csproj
Normal file
|
|
@ -0,0 +1,160 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>10.0.0</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}</ProjectGuid>
|
||||
<ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>SparkleShare</RootNamespace>
|
||||
<AssemblyName>SparkleShare</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug</OutputPath>
|
||||
<DefineConstants>DEBUG</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<ConsolePause>false</ConsolePause>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>none</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Release</OutputPath>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<ConsolePause>false</ConsolePause>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="System.Core">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml.Linq">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="System.Drawing">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="MonoMac">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="SparkleLib, Version=0.2.0.0, Culture=neutral, PublicKeyToken=null">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\bin\SparkleLib.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Mono.Posix">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="DiffieHellman, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\bin\DiffieHellman.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="GitSharp.Core, Version=0.3.0.0, Culture=neutral, PublicKeyToken=null">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\bin\GitSharp.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="GitSharp, Version=0.3.0.0, Culture=neutral, PublicKeyToken=null">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\bin\GitSharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Meebey.SmartIrc4net, Version=0.4.5.0, Culture=neutral, PublicKeyToken=7868485fbf407e0f">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\bin\Meebey.SmartIrc4net.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Org.Mentalis.Security, Version=1.0.13.715, Culture=neutral, PublicKeyToken=null">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\bin\Org.Mentalis.Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Tamir.SharpSSH, Version=1.1.1.13, Culture=neutral, PublicKeyToken=null">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\bin\Tamir.SharpSSH.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="AppDelegate.cs">
|
||||
<DependentUpon>MainMenu.xib</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="MainMenu.xib.designer.cs">
|
||||
<DependentUpon>MainMenu.xib</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="..\SparkleController.cs">
|
||||
<Link>SparkleController.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="SparkleWindow.cs" />
|
||||
<Compile Include="SparkleIntro.cs" />
|
||||
<Compile Include="SparkleLog.cs" />
|
||||
<Compile Include="SparkleMacController.cs" />
|
||||
<Compile Include="SparkleStatusIcon.cs" />
|
||||
<Compile Include="SparkleUI.cs" />
|
||||
<Compile Include="..\SparkleShare.cs">
|
||||
<Link>SparkleShare.cs</Link>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Page Include="MainMenu.xib" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Info.plist" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
|
||||
<ItemGroup>
|
||||
<Content Include="..\..\data\html\day-entry.html">
|
||||
<Link>HTML\day-entry.html</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\data\html\event-entry.html">
|
||||
<Link>HTML\event-entry.html</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\data\html\event-log.html">
|
||||
<Link>HTML\event-log.html</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\data\side-splash.png">
|
||||
<Link>Pixmaps\side-splash.png</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\data\avatar-default.png">
|
||||
<Link>Pixmaps\avatar-default.png</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\data\sparkleshare-mac.icns">
|
||||
<Link>sparkleshare-mac.icns</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\data\sparkleshare.icns">
|
||||
<Link>sparkleshare.icns</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\data\idle-active.png">
|
||||
<Link>Pixmaps\idle-active.png</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\data\idle.png">
|
||||
<Link>Pixmaps\idle.png</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\data\idle0.png">
|
||||
<Link>Pixmaps\idle0.png</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\data\idle1.png">
|
||||
<Link>Pixmaps\idle1.png</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\data\idle2.png">
|
||||
<Link>Pixmaps\idle2.png</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\data\idle3.png">
|
||||
<Link>Pixmaps\idle3.png</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\data\idle4.png">
|
||||
<Link>Pixmaps\idle4.png</Link>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Pixmaps\" />
|
||||
<Folder Include="HTML\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
20
SparkleShare/Mac/SparkleShare.sln
Normal file
20
SparkleShare/Mac/SparkleShare.sln
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 11.00
|
||||
# Visual Studio 2010
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShare.csproj", "{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(MonoDevelopProperties) = preSolution
|
||||
StartupItem = SparkleShare.csproj
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -1,298 +0,0 @@
|
|||
//
|
||||
// Layout.cs
|
||||
//
|
||||
// Author:
|
||||
// Michael Hutchinson <mhutchinson@novell.com>
|
||||
//
|
||||
// Copyright (c) 2010 Novell, Inc.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
// THE SOFTWARE.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using MonoMac.AppKit;
|
||||
using System.Linq;
|
||||
namespace MonoDevelop.Platform.Mac
|
||||
{
|
||||
interface ILayout
|
||||
{
|
||||
LayoutRequest BeginLayout ();
|
||||
void EndLayout (LayoutRequest request, PointF origin, SizeF allocation);
|
||||
}
|
||||
|
||||
class LayoutRequest
|
||||
{
|
||||
public SizeF Size { get; set; }
|
||||
public bool Visible { get; set; }
|
||||
public bool ExpandWidth { get; set; }
|
||||
public bool ExpandHeight { get; set; }
|
||||
}
|
||||
|
||||
abstract class LayoutBox : IEnumerable<ILayout>, ILayout
|
||||
{
|
||||
List<ILayout> children = new List<ILayout> ();
|
||||
|
||||
public float Spacing { get; set; }
|
||||
public float PadLeft { get; set; }
|
||||
public float PadRight { get; set; }
|
||||
public float PadTop { get; set; }
|
||||
public float PadBottom { get; set; }
|
||||
public LayoutAlign Align { get; set; }
|
||||
|
||||
public LayoutDirection Direction { get; set; }
|
||||
|
||||
public LayoutBox (LayoutDirection direction, float spacing) : this (direction, spacing, 0)
|
||||
{
|
||||
}
|
||||
|
||||
public LayoutBox (LayoutDirection direction, float spacing, float padding)
|
||||
{
|
||||
PadLeft = PadRight = PadTop = PadBottom = padding;
|
||||
this.Direction = direction;
|
||||
this.Spacing = spacing;
|
||||
this.Align = LayoutAlign.Center;
|
||||
}
|
||||
|
||||
public int Count { get { return children.Count; } }
|
||||
|
||||
bool IsHorizontal { get { return Direction == LayoutDirection.Horizontal; } }
|
||||
|
||||
public IEnumerator<ILayout> GetEnumerator ()
|
||||
{
|
||||
return children.GetEnumerator ();
|
||||
}
|
||||
|
||||
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator ()
|
||||
{
|
||||
return children.GetEnumerator ();
|
||||
}
|
||||
|
||||
public void Add (ILayout child)
|
||||
{
|
||||
children.Add (child);
|
||||
OnChildAdded (child);
|
||||
}
|
||||
|
||||
ContainerLayoutRequest request = new ContainerLayoutRequest ();
|
||||
|
||||
public virtual LayoutRequest BeginLayout ()
|
||||
{
|
||||
float width = 0;
|
||||
float height = 0;
|
||||
|
||||
request.ChildRequests.Clear ();
|
||||
request.ChildRequests.AddRange (children.Select (c => c.BeginLayout ()));
|
||||
|
||||
foreach (var r in request.ChildRequests) {
|
||||
if (!r.Visible)
|
||||
continue;
|
||||
request.Visible = true;
|
||||
if (r.ExpandWidth)
|
||||
request.ExpandWidth = true;
|
||||
if (r.ExpandHeight)
|
||||
request.ExpandHeight = true;
|
||||
|
||||
if (IsHorizontal) {
|
||||
if (width != 0)
|
||||
width += Spacing;
|
||||
width += r.Size.Width;
|
||||
height = Math.Max (height, r.Size.Height);
|
||||
} else {
|
||||
if (height != 0)
|
||||
height += Spacing;
|
||||
height += r.Size.Height;
|
||||
width = Math.Max (width, r.Size.Width);
|
||||
}
|
||||
}
|
||||
|
||||
request.Size = new SizeF (width + PadLeft + PadRight, height + PadTop + PadBottom);
|
||||
return request;
|
||||
}
|
||||
|
||||
public virtual void EndLayout (LayoutRequest request, PointF origin, SizeF allocation)
|
||||
{
|
||||
var childRequests = ((ContainerLayoutRequest) request).ChildRequests;
|
||||
|
||||
allocation = new SizeF (allocation.Width - PadLeft - PadRight, allocation.Height - PadBottom - PadTop);
|
||||
origin = new PointF (origin.X + PadLeft, origin.Y + PadBottom);
|
||||
|
||||
var size = request.Size;
|
||||
size.Height -= (PadTop + PadBottom);
|
||||
size.Width -= (PadLeft + PadRight);
|
||||
|
||||
int wExpandCount = 0;
|
||||
int hExpandCount = 0;
|
||||
int visibleCount = 0;
|
||||
foreach (var childRequest in childRequests) {
|
||||
if (childRequest.Visible)
|
||||
visibleCount++;
|
||||
else
|
||||
continue;
|
||||
if (childRequest.ExpandWidth)
|
||||
wExpandCount++;
|
||||
if (childRequest.ExpandHeight)
|
||||
hExpandCount++;
|
||||
}
|
||||
|
||||
float wExpand = 0;
|
||||
if (allocation.Width > size.Width) {
|
||||
wExpand = allocation.Width - size.Width;
|
||||
if (wExpandCount > 0)
|
||||
wExpand /= wExpandCount;
|
||||
}
|
||||
float hExpand = 0;
|
||||
if (allocation.Height > size.Height) {
|
||||
hExpand = allocation.Height - size.Height;
|
||||
if (hExpandCount > 0)
|
||||
hExpand /= hExpandCount;
|
||||
}
|
||||
|
||||
if (Direction == LayoutDirection.Horizontal) {
|
||||
float pos = PadLeft;
|
||||
if (wExpandCount == 0) {
|
||||
if (Align == LayoutAlign.End)
|
||||
pos += wExpand;
|
||||
else if (Align == LayoutAlign.Center)
|
||||
pos += wExpand / 2;
|
||||
}
|
||||
for (int i = 0; i < childRequests.Count; i++) {
|
||||
var child = children[i];
|
||||
var childReq = childRequests[i];
|
||||
if (!childReq.Visible)
|
||||
continue;
|
||||
|
||||
var childSize = new SizeF (childReq.Size.Width, allocation.Height);
|
||||
if (childReq.ExpandWidth) {
|
||||
childSize.Width += wExpand;
|
||||
} else if (hExpandCount == 0 && Align == LayoutAlign.Fill) {
|
||||
childSize.Width += wExpand / visibleCount;
|
||||
}
|
||||
|
||||
child.EndLayout (childReq, new PointF (pos, origin.Y), childSize);
|
||||
pos += childSize.Width + Spacing;
|
||||
}
|
||||
} else {
|
||||
float pos = PadBottom;
|
||||
if (hExpandCount == 0) {
|
||||
if (Align == LayoutAlign.End)
|
||||
pos += hExpand;
|
||||
else if (Align == LayoutAlign.Center)
|
||||
pos += hExpand / 2;
|
||||
}
|
||||
for (int i = 0; i < childRequests.Count; i++) {
|
||||
var child = children[i];
|
||||
var childReq = childRequests[i];
|
||||
if (!childReq.Visible)
|
||||
continue;
|
||||
|
||||
var childSize = new SizeF (allocation.Width, childReq.Size.Height);
|
||||
if (childReq.ExpandHeight) {
|
||||
childSize.Height += hExpand;
|
||||
} else if (hExpandCount == 0 && Align == LayoutAlign.Fill) {
|
||||
childSize.Height += hExpand / visibleCount;
|
||||
}
|
||||
|
||||
child.EndLayout (childReq, new PointF (origin.X, pos), childSize);
|
||||
pos += childSize.Height + Spacing;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract void OnChildAdded (ILayout child);
|
||||
|
||||
class ContainerLayoutRequest : LayoutRequest
|
||||
{
|
||||
public List<LayoutRequest> ChildRequests = new List<LayoutRequest> ();
|
||||
}
|
||||
}
|
||||
|
||||
public enum LayoutAlign
|
||||
{
|
||||
Begin, Center, End, Fill
|
||||
}
|
||||
|
||||
public enum LayoutDirection
|
||||
{
|
||||
Horizontal, Vertical
|
||||
}
|
||||
|
||||
abstract class LayoutAlignment : ILayout
|
||||
{
|
||||
public LayoutAlignment ()
|
||||
{
|
||||
XAlign = YAlign = LayoutAlign.Center;
|
||||
}
|
||||
|
||||
public LayoutAlign XAlign { get; set; }
|
||||
public LayoutAlign YAlign { get; set; }
|
||||
public bool ExpandHeight { get; set; }
|
||||
public bool ExpandWidth { get; set; }
|
||||
public float MinHeight { get; set; }
|
||||
public float MinWidth { get; set; }
|
||||
public float PadLeft { get; set; }
|
||||
public float PadRight { get; set; }
|
||||
public float PadTop { get; set; }
|
||||
public float PadBottom { get; set; }
|
||||
public bool Visible { get; set; }
|
||||
|
||||
LayoutRequest request = new LayoutRequest ();
|
||||
|
||||
public virtual LayoutRequest BeginLayout ()
|
||||
{
|
||||
request.Size = new SizeF (MinWidth + PadLeft + PadRight, MinHeight + PadTop + PadBottom);
|
||||
request.ExpandHeight = this.ExpandHeight;
|
||||
request.ExpandWidth = this.ExpandWidth;
|
||||
request.Visible = this.Visible;
|
||||
return request;
|
||||
}
|
||||
|
||||
public virtual void EndLayout (LayoutRequest request, PointF origin, SizeF allocation)
|
||||
{
|
||||
var frame = new RectangleF (origin.X + PadLeft, origin.Y + PadBottom,
|
||||
allocation.Width - PadLeft - PadRight, allocation.Height - PadTop - PadBottom);
|
||||
|
||||
if (allocation.Height > request.Size.Height) {
|
||||
if (YAlign != LayoutAlign.Fill) {
|
||||
frame.Height = request.Size.Height - PadTop - PadBottom;
|
||||
if (YAlign == LayoutAlign.Center) {
|
||||
frame.Y += (allocation.Height - request.Size.Height) / 2;
|
||||
} else if (YAlign == LayoutAlign.End) {
|
||||
frame.Y += (allocation.Height - request.Size.Height);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (allocation.Width > request.Size.Width) {
|
||||
if (XAlign != LayoutAlign.Fill) {
|
||||
frame.Width = request.Size.Width - PadLeft - PadRight;
|
||||
if (XAlign == LayoutAlign.Center) {
|
||||
frame.X += (allocation.Width - request.Size.Width) / 2;
|
||||
} else if (XAlign == LayoutAlign.End) {
|
||||
frame.X += (allocation.Width - request.Size.Width);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
OnLayoutEnded (frame);
|
||||
}
|
||||
|
||||
protected abstract void OnLayoutEnded (RectangleF frame);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,190 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
|
||||
<data>
|
||||
<int key="IBDocument.SystemTarget">1060</int>
|
||||
<string key="IBDocument.SystemVersion">10D573</string>
|
||||
<string key="IBDocument.InterfaceBuilderVersion">762</string>
|
||||
<string key="IBDocument.AppKitVersion">1038.29</string>
|
||||
<string key="IBDocument.HIToolboxVersion">460.00</string>
|
||||
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
|
||||
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<string key="NS.object.0">762</string>
|
||||
</object>
|
||||
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<integer value="2"/>
|
||||
</object>
|
||||
<object class="NSArray" key="IBDocument.PluginDependencies">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="IBDocument.Metadata">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys" id="0">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
</object>
|
||||
<object class="NSMutableArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSCustomObject" id="1001">
|
||||
<string key="NSClassName">MainWindowController</string>
|
||||
</object>
|
||||
<object class="NSCustomObject" id="1003">
|
||||
<string key="NSClassName">FirstResponder</string>
|
||||
</object>
|
||||
<object class="NSCustomObject" id="1004">
|
||||
<string key="NSClassName">NSApplication</string>
|
||||
</object>
|
||||
<object class="NSWindowTemplate" id="748157544">
|
||||
<int key="NSWindowStyleMask">15</int>
|
||||
<int key="NSWindowBacking">2</int>
|
||||
<string key="NSWindowRect">{{131, 74}, {606, 354}}</string>
|
||||
<int key="NSWTFlags">611844096</int>
|
||||
<string key="NSWindowTitle">Window</string>
|
||||
<string key="NSWindowClass">MainWindow</string>
|
||||
<nil key="NSViewClass"/>
|
||||
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
|
||||
<object class="NSView" key="NSWindowView" id="312036702">
|
||||
<reference key="NSNextResponder"/>
|
||||
<int key="NSvFlags">256</int>
|
||||
<string key="NSFrameSize">{606, 354}</string>
|
||||
<reference key="NSSuperview"/>
|
||||
</object>
|
||||
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
|
||||
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBObjectContainer" key="IBDocument.Objects">
|
||||
<object class="NSMutableArray" key="connectionRecords">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBOutletConnection" key="connection">
|
||||
<string key="label">window</string>
|
||||
<reference key="source" ref="1001"/>
|
||||
<reference key="destination" ref="748157544"/>
|
||||
</object>
|
||||
<int key="connectionID">6</int>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBMutableOrderedSet" key="objectRecords">
|
||||
<object class="NSArray" key="orderedObjects">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">0</int>
|
||||
<reference key="object" ref="0"/>
|
||||
<reference key="children" ref="1000"/>
|
||||
<nil key="parent"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">-2</int>
|
||||
<reference key="object" ref="1001"/>
|
||||
<reference key="parent" ref="0"/>
|
||||
<string key="objectName">File's Owner</string>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">-1</int>
|
||||
<reference key="object" ref="1003"/>
|
||||
<reference key="parent" ref="0"/>
|
||||
<string key="objectName">First Responder</string>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">-3</int>
|
||||
<reference key="object" ref="1004"/>
|
||||
<reference key="parent" ref="0"/>
|
||||
<string key="objectName">Application</string>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">2</int>
|
||||
<reference key="object" ref="748157544"/>
|
||||
<object class="NSMutableArray" key="children">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<reference ref="312036702"/>
|
||||
</object>
|
||||
<reference key="parent" ref="0"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">3</int>
|
||||
<reference key="object" ref="312036702"/>
|
||||
<reference key="parent" ref="748157544"/>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="flattenedProperties">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>-1.IBPluginDependency</string>
|
||||
<string>-2.IBPluginDependency</string>
|
||||
<string>-3.IBPluginDependency</string>
|
||||
<string>2.IBEditorWindowLastContentRect</string>
|
||||
<string>2.IBPluginDependency</string>
|
||||
<string>2.IBWindowTemplateEditedContentRect</string>
|
||||
<string>2.NSWindowTemplate.visibleAtLaunch</string>
|
||||
<string>3.IBPluginDependency</string>
|
||||
</object>
|
||||
<object class="NSMutableArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<string>{{319, 371}, {606, 354}}</string>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<string>{{319, 371}, {606, 354}}</string>
|
||||
<boolean value="YES"/>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="unlocalizedProperties">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<reference key="dict.sortedKeys" ref="0"/>
|
||||
<object class="NSMutableArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
</object>
|
||||
</object>
|
||||
<nil key="activeLocalization"/>
|
||||
<object class="NSMutableDictionary" key="localizations">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<reference key="dict.sortedKeys" ref="0"/>
|
||||
<object class="NSMutableArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
</object>
|
||||
</object>
|
||||
<nil key="sourceID"/>
|
||||
<int key="maxID">6</int>
|
||||
</object>
|
||||
<object class="IBClassDescriber" key="IBDocument.Classes">
|
||||
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">MainWindow</string>
|
||||
<string key="superclassName">NSWindow</string>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
<string key="majorKey">IBUserSource</string>
|
||||
<string key="minorKey"/>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">MainWindowController</string>
|
||||
<string key="superclassName">NSWindowController</string>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
<string key="majorKey">IBUserSource</string>
|
||||
<string key="minorKey"/>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<int key="IBDocument.localizationMode">0</int>
|
||||
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
|
||||
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
|
||||
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
|
||||
<integer value="3000" key="NS.object.0"/>
|
||||
</object>
|
||||
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
|
||||
<nil key="IBDocument.LastKnownRelativeProjectPath"/>
|
||||
<int key="IBDocument.defaultPropertyAccessControl">3</int>
|
||||
</data>
|
||||
</archive>
|
||||
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.21022</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{709CB8F4-F82F-4C94-B4E2-DC502087525B}</ProjectGuid>
|
||||
<ProjectTypeGuids>{1C533B1C-72DD-4CB1-9F6B-BF11D93BCFBE};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>SparkleShare</RootNamespace>
|
||||
<AssemblyName>SparkleShare</AssemblyName>
|
||||
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug</OutputPath>
|
||||
<DefineConstants>DEBUG</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<ConsolePause>false</ConsolePause>
|
||||
<EnvironmentVariables>
|
||||
<EnvironmentVariables>
|
||||
<Variable name="PATH" value="/opt/local/bin" />
|
||||
</EnvironmentVariables>
|
||||
</EnvironmentVariables>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>none</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Release</OutputPath>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<ConsolePause>false</ConsolePause>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="MonoMac">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="Mono.Posix" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="MainMenu.xib.designer.cs">
|
||||
<DependentUpon>MainMenu.xib</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Layout.cs" />
|
||||
<Compile Include="SparkleLog.cs" />
|
||||
<Compile Include="SparkleStatusIcon.cs" />
|
||||
<Compile Include="..\..\SparkleShare.cs">
|
||||
<Link>SparkleShare.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="..\..\SparkleController.cs">
|
||||
<Link>SparkleController.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="SparkleMacController.cs" />
|
||||
<Compile Include="SparkleUI.cs" />
|
||||
<Compile Include="SparkleWindow.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Page Include="MainMenu.xib" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Info.plist" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
|
||||
<ItemGroup>
|
||||
<Content Include="Pixmaps\idle.png" />
|
||||
<Content Include="Pixmaps\idle0.png" />
|
||||
<Content Include="Pixmaps\idle2.png" />
|
||||
<Content Include="Pixmaps\idle-active.png" />
|
||||
<Content Include="Pixmaps\idle1.png" />
|
||||
<Content Include="Pixmaps\idle4.png" />
|
||||
<Content Include="Pixmaps\idle3.png" />
|
||||
<Content Include="Pixmaps\sparkleshare-idle.png" />
|
||||
<Content Include="Pixmaps\sparkleshare-idle-focus.png" />
|
||||
<Content Include="..\..\..\data\side-splash.png">
|
||||
<Link>Pixmaps\side-splash.png</Link>
|
||||
</Content>
|
||||
<Content Include="sparkleshare.icns" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\SparkleLib\SparkleLib.csproj">
|
||||
<Project>{2C914413-B31C-4362-93C7-1AE34F09112A}</Project>
|
||||
<Name>SparkleLib</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Pixmaps\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 10.00
|
||||
# Visual Studio 2008
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShare.csproj", "{709CB8F4-F82F-4C94-B4E2-DC502087525B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "..\..\..\SparkleLib\SparkleLib.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{2C914413-B31C-4362-93C7-1AE34F09112A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2C914413-B31C-4362-93C7-1AE34F09112A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{709CB8F4-F82F-4C94-B4E2-DC502087525B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{709CB8F4-F82F-4C94-B4E2-DC502087525B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{709CB8F4-F82F-4C94-B4E2-DC502087525B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{709CB8F4-F82F-4C94-B4E2-DC502087525B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(MonoDevelopProperties) = preSolution
|
||||
StartupItem = SparkleShare.csproj
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -178,7 +178,7 @@ namespace SparkleShare {
|
|||
|
||||
|
||||
string folder_icon_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
|
||||
"sparkleshare.icns");
|
||||
"sparkleshare-mac.icns");
|
||||
|
||||
FolderMenuItem.Image = new NSImage (folder_icon_path);
|
||||
FolderMenuItem.Image.Size = new SizeF (16, 16);
|
||||
|
|
@ -126,7 +126,7 @@ namespace SparkleShare {
|
|||
{
|
||||
|
||||
string folder_icon_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
|
||||
"sparkleshare.icns");
|
||||
"sparkleshare-mac.icns");
|
||||
|
||||
NSImage folder_icon = new NSImage (folder_icon_path);
|
||||
|
||||
|
|
@ -165,7 +165,7 @@ namespace SparkleShare {
|
|||
|
||||
// The location of the user's public key for SparkleShare
|
||||
string public_key_file_path = SparkleHelpers.CombineMore (SparklePaths.HomePath, ".ssh",
|
||||
"sparkleshare." + SparkleShare.Controller.UserEmail + ".key.pub");
|
||||
"sparkleshare." + UserEmail + ".key.pub");
|
||||
|
||||
if (!File.Exists (public_key_file_path))
|
||||
return false;
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 732 B After Width: | Height: | Size: 732 B |
|
Before Width: | Height: | Size: 797 B After Width: | Height: | Size: 797 B |
|
Before Width: | Height: | Size: 803 B After Width: | Height: | Size: 803 B |
|
Before Width: | Height: | Size: 822 B After Width: | Height: | Size: 822 B |
|
Before Width: | Height: | Size: 818 B After Width: | Height: | Size: 818 B |
|
Before Width: | Height: | Size: 831 B After Width: | Height: | Size: 831 B |
|
Before Width: | Height: | Size: 826 B After Width: | Height: | Size: 826 B |
Binary file not shown.
|
Before Width: | Height: | Size: 283 B After Width: | Height: | Size: 283 B |
|
Before Width: | Height: | Size: 216 B After Width: | Height: | Size: 216 B |
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 313 KiB |
BIN
data/sparkleshare-mac.icns
Normal file
BIN
data/sparkleshare-mac.icns
Normal file
Binary file not shown.
2513
data/sparkleshare-mac.svg
Normal file
2513
data/sparkleshare-mac.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 779 KiB |
1064
data/sparkleshare-osx.svg
Normal file
1064
data/sparkleshare-osx.svg
Normal file
File diff suppressed because it is too large
Load diff
|
After Width: | Height: | Size: 52 KiB |
Loading…
Reference in a new issue