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

linux: Add .csproj

Browse source
This commit is contained in:
Hylke Bons 2016-04-01 09:15:47 +01:00
parent 2523cb1f74
commit ea0e6c1654
13 changed files with 159 additions and 323 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SparkleShare.sln
View file

@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sparkles.Git", "Sparkles\Gi
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Windows", "SparkleShare\Windows\SparkleShare.Windows.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Windows", "SparkleShare\Windows\SparkleShare.Windows.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Linux", "SparkleShare\Linux\SparkleShare.Linux.csproj", "{5714D3CA-88A6-4330-A29D-4CA90D1D193C}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
@ -40,6 +42,12 @@ Global
{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU
{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU
{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Release|Any CPU.Build.0 = Release|Any CPU
{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.ReleaseDist|Any CPU.ActiveCfg = Release|Any CPU
{5714D3CA-88A6-4330-A29D-4CA90D1D193C}.ReleaseDist|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0 Policies = $0

6
SparkleShare/Common/BaseController.cs
View file

@ -250,13 +250,13 @@ namespace SparkleShare {
} else if (reopen_attempt_counts > 1) { } else if (reopen_attempt_counts > 1) {
AlertNotificationRaised ("Hello!", "SparkleShare sits right here, as a status icon."); AlertNotificationRaised ("Hello!", "SparkleShare sits right here, as a status icon.");
reopen_attempt_counts = 0; reopen_attempt_counts = 0;
} else { } else {
reopen_attempt_counts++; reopen_attempt_counts++;
} }
} }
public void UIHasLoaded () public void UIHasLoaded ()
{ {
if (this.lost_folders_path) { if (this.lost_folders_path) {

7
SparkleShare/Linux/Bubbles.cs
View file

@ -18,7 +18,7 @@
using System; using System;
using Gtk; using Gtk;
using Notifications; //using Notifications;
using Sparkles; using Sparkles;
@ -27,7 +27,7 @@ namespace SparkleShare {
public class SparkleBubbles { public class SparkleBubbles {
public SparkleBubblesController Controller = new SparkleBubblesController (); public SparkleBubblesController Controller = new SparkleBubblesController ();
/*
public SparkleBubbles () public SparkleBubbles ()
{ {
@ -60,7 +60,6 @@ namespace SparkleShare {
Logger.LogInfo ("Notification", "Error showing notification: ", e); Logger.LogInfo ("Notification", "Error showing notification: ", e);
} }
}); });
} }*/
} }
} }

8
SparkleShare/Linux/EventLog.cs
View file

@ -35,7 +35,7 @@ namespace SparkleShare {
private HBox layout_horizontal; private HBox layout_horizontal;
private ScrolledWindow scrolled_window; private ScrolledWindow scrolled_window;
private VBox spinner_wrapper; private VBox spinner_wrapper;
private Spinner spinner; // private Spinner spinner;
// private WebView web_view; // private WebView web_view;
private int pos_x, pos_y; private int pos_x, pos_y;
@ -65,7 +65,7 @@ namespace SparkleShare {
layout_sizes.PackStart (this.history_label, false, false, 0); layout_sizes.PackStart (this.history_label, false, false, 0);
VBox layout_vertical = new VBox (false, 0); VBox layout_vertical = new VBox (false, 0);
this.spinner = new Spinner (); // this.spinner = new Spinner ();
this.spinner_wrapper = new VBox (); this.spinner_wrapper = new VBox ();
this.content_wrapper = new EventBox (); this.content_wrapper = new EventBox ();
this.scrolled_window = new ScrolledWindow (); this.scrolled_window = new ScrolledWindow ();
@ -84,8 +84,8 @@ namespace SparkleShare {
this.spinner_wrapper.PackStart (new Label(""), true, true, 0); this.spinner_wrapper.PackStart (new Label(""), true, true, 0);
this.spinner_wrapper.PackStart (this.spinner, false, false, 0); this.spinner_wrapper.PackStart (this.spinner, false, false, 0);
this.spinner_wrapper.PackStart (new Label(""), true, true, 0); this.spinner_wrapper.PackStart (new Label(""), true, true, 0);
this.spinner.SetSizeRequest (24, 24); // this.spinner.SetSizeRequest (24, 24);
this.spinner.Start (); // this.spinner.Start ();
this.content_wrapper.Add (this.spinner_wrapper); this.content_wrapper.Add (this.spinner_wrapper);

2
SparkleShare/Linux/Setup.cs
View file

@ -698,7 +698,7 @@ namespace SparkleShare {
private void RenderServiceColumn (TreeViewColumn column, CellRenderer cell, private void RenderServiceColumn (TreeViewColumn column, CellRenderer cell,
ITreeModel model, TreeIter iter) TreeModel model, TreeIter iter)
{ {
string markup = (string) model.GetValue (iter, 2); string markup = (string) model.GetValue (iter, 2);
TreeSelection selection = (column.TreeView as TreeView).Selection; TreeSelection selection = (column.TreeView as TreeView).Selection;

428
SparkleShare/Linux/SparkleShare.Linux.csproj
View file

@ -1,299 +1,129 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion> <ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{CF5BC8DB-A633-4FCC-8A3E-E3AC9B59FABC}</ProjectGuid> <ProjectGuid>{5714D3CA-88A6-4330-A29D-4CA90D1D193C}</ProjectGuid>
<ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <OutputType>Exe</OutputType>
<OutputType>Exe</OutputType> <RootNamespace>SparkleShare.Linux</RootNamespace>
<RootNamespace>SparkleShare</RootNamespace> <AssemblyName>SparkleShare.Linux</AssemblyName>
<AssemblyName>SparkleShare</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<ReleaseVersion> </PropertyGroup>
</ReleaseVersion> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<SuppressXamMacMigration>True</SuppressXamMacMigration> <DebugSymbols>true</DebugSymbols>
<SuppressXamMacUpsell>True</SuppressXamMacUpsell> <DebugType>full</DebugType>
</PropertyGroup> <Optimize>false</Optimize>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <OutputPath>bin\Debug</OutputPath>
<DebugType>none</DebugType> <DefineConstants>DEBUG;</DefineConstants>
<Optimize>False</Optimize> <ErrorReport>prompt</ErrorReport>
<OutputPath>bin\Release</OutputPath> <WarningLevel>4</WarningLevel>
<ErrorReport>prompt</ErrorReport> <ExternalConsole>true</ExternalConsole>
<WarningLevel>4</WarningLevel> </PropertyGroup>
<CustomCommands> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<CustomCommands> <Optimize>true</Optimize>
<Command type="AfterBuild" command="${ProjectDir}/postBuild.sh ${TargetDir}/${SolutionName}.app" /> <OutputPath>bin\Release</OutputPath>
</CustomCommands> <ErrorReport>prompt</ErrorReport>
</CustomCommands> <WarningLevel>4</WarningLevel>
<EnableCodeSigning>False</EnableCodeSigning> <ExternalConsole>true</ExternalConsole>
<CreatePackage>False</CreatePackage> </PropertyGroup>
<EnablePackageSigning>False</EnablePackageSigning> <ItemGroup>
<IncludeMonoRuntime>false</IncludeMonoRuntime> <Reference Include="System" />
<ConsolePause>False</ConsolePause> <Reference Include="System.Net" />
<UseSGen>false</UseSGen> <Reference Include="Mono.Posix" />
<UseRefCounting>false</UseRefCounting> <Reference Include="System.Xml" />
<Profiling>false</Profiling> <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</PropertyGroup> <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Optimize>False</Optimize> <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<OutputPath>bin\Debug</OutputPath> </ItemGroup>
<DefineConstants>DEBUG</DefineConstants> <ItemGroup>
<ErrorReport>prompt</ErrorReport> <ProjectReference Include="..\..\Sparkles\Git\Sparkles.Git.csproj">
<WarningLevel>4</WarningLevel> <Project>{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}</Project>
<CustomCommands> <Name>Sparkles.Git</Name>
<CustomCommands> </ProjectReference>
<Command type="AfterBuild" command="${ProjectDir}/postBuild.sh ${TargetDir}/${SolutionName}.app" /> <ProjectReference Include="..\..\Sparkles\Sparkles.csproj">
</CustomCommands> <Project>{2C914413-B31C-4362-93C7-1AE34F09112A}</Project>
</CustomCommands> <Name>Sparkles</Name>
<EnableCodeSigning>False</EnableCodeSigning> </ProjectReference>
<CreatePackage>False</CreatePackage> </ItemGroup>
<EnablePackageSigning>False</EnablePackageSigning> <ItemGroup>
<IncludeMonoRuntime>false</IncludeMonoRuntime> <Folder Include="UserInterface\" />
<ConsolePause>False</ConsolePause> <Folder Include="Controllers\" />
<DebugSymbols>true</DebugSymbols> </ItemGroup>
<UseSGen>false</UseSGen> <ItemGroup>
<UseRefCounting>false</UseRefCounting> <None Include="..\Common\HTML\day-entry.html">
<Profiling>false</Profiling> <Link>HTML\day-entry.html</Link>
</PropertyGroup> </None>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseDist|AnyCPU' "> <None Include="..\Common\HTML\event-entry.html">
<Optimize>false</Optimize> <Link>HTML\event-entry.html</Link>
<OutputPath>bin\ReleaseDist</OutputPath> </None>
<WarningLevel>4</WarningLevel> <None Include="..\Common\HTML\event-log.html">
<UseSGen>false</UseSGen> <Link>HTML\event-log.html</Link>
<IncludeMonoRuntime>false</IncludeMonoRuntime> </None>
<EnablePackageSigning>false</EnablePackageSigning> <None Include="..\Common\HTML\jquery.js">
<CustomCommands> <Link>HTML\jquery.js</Link>
<CustomCommands> </None>
<Command type="AfterBuild" command="${ProjectDir}/postBuild.sh ${TargetDir}/${SolutionName}.app" /> </ItemGroup>
<Command type="AfterBuild" command="${ProjectDir}/packReleaseDist.sh ${TargetDir}/${SolutionName}.app" /> <ItemGroup>
</CustomCommands> <Compile Include="..\Common\Avatars.cs">
</CustomCommands> <Link>UserInterface\Avatars.cs</Link>
<EnableCodeSigning>false</EnableCodeSigning> </Compile>
<CreatePackage>false</CreatePackage> <Compile Include="About.cs">
<UseRefCounting>false</UseRefCounting> <Link>UserInterface\About.cs</Link>
<Profiling>false</Profiling> </Compile>
</PropertyGroup> <Compile Include="Bubbles.cs">
<ItemGroup> <Link>UserInterface\Bubbles.cs</Link>
<Reference Include="System" /> </Compile>
<Reference Include="System.Xml" /> <Compile Include="Note.cs">
<Reference Include="System.Drawing" /> <Link>UserInterface\Note.cs</Link>
<Reference Include="System.Net" /> </Compile>
<Reference Include="Mono.Posix" /> <Compile Include="Setup.cs">
<Reference Include="MonoMac"> <Link>UserInterface\Setup.cs</Link>
<HintPath>..\..\..\monomac\src\MonoMac.dll</HintPath> </Compile>
</Reference> <Compile Include="SetupWindow.cs">
</ItemGroup> <Link>UserInterface\SetupWindow.cs</Link>
<ItemGroup> </Compile>
<Compile Include="AppDelegate.cs"> <Compile Include="StatusIcon.cs">
<DependentUpon>MainMenu.xib</DependentUpon> <Link>UserInterface\StatusIcon.cs</Link>
</Compile> </Compile>
<Compile Include="MainMenu.xib.designer.cs"> <Compile Include="UserInterface.cs">
<DependentUpon>MainMenu.xib</DependentUpon> <Link>UserInterface\UserInterface.cs</Link>
</Compile> </Compile>
<Compile Include="..\Common\SparkleShare.cs"> <Compile Include="UserInterfaceHelpers.cs">
<Link>SparkleShare.cs</Link> <Link>UserInterface\UserInterfaceHelpers.cs</Link>
</Compile> </Compile>
<Compile Include="MacWatcher.cs" /> <Compile Include="..\Common\SparkleShare.cs">
<Compile Include="..\Common\Plugin.cs"> <Link>SparkleShare.cs</Link>
<Link>Plugin.cs</Link> </Compile>
</Compile> <Compile Include="..\Common\AboutController.cs">
<Compile Include="..\Common\Invite.cs"> <Link>Controllers\AboutController.cs</Link>
<Link>Invite.cs</Link> </Compile>
</Compile> <Compile Include="..\Common\BaseController.cs">
<Compile Include="..\Common\Avatars.cs" /> <Link>Controllers\BaseController.cs</Link>
<Compile Include="..\Common\AboutController.cs"> </Compile>
<Link>Controllers\AboutController.cs</Link> <Compile Include="..\Common\BubblesController.cs">
</Compile> <Link>Controllers\BubblesController.cs</Link>
<Compile Include="..\Common\BubblesController.cs"> </Compile>
<Link>Controllers\BubblesController.cs</Link> <Compile Include="..\Common\EventLogController.cs">
</Compile> <Link>Controllers\EventLogController.cs</Link>
<Compile Include="..\Common\EventLogController.cs"> </Compile>
<Link>Controllers\EventLogController.cs</Link> <Compile Include="..\Common\NoteController.cs">
</Compile> <Link>Controllers\NoteController.cs</Link>
<Compile Include="..\Common\NoteController.cs"> </Compile>
<Link>Controllers\NoteController.cs</Link> <Compile Include="..\Common\SetupController.cs">
</Compile> <Link>Controllers\SetupController.cs</Link>
<Compile Include="..\Common\SetupController.cs"> </Compile>
<Link>Controllers\SetupController.cs</Link> <Compile Include="..\Common\StatusIconController.cs">
</Compile> <Link>Controllers\StatusIconController.cs</Link>
<Compile Include="..\Common\StatusIconController.cs"> </Compile>
<Link>Controllers\StatusIconController.cs</Link> <Compile Include="Controller.cs">
</Compile> <Link>Controllers\Controller.cs</Link>
<Compile Include="UserInterface\About.cs" /> </Compile>
<Compile Include="UserInterface\Bubbles.cs" /> <Compile Include="EventLog.cs">
<Compile Include="UserInterface\EventLog.cs" /> <Link>UserInterface\EventLog.cs</Link>
<Compile Include="UserInterface\Note.cs" /> </Compile>
<Compile Include="UserInterface\Setup.cs" /> </ItemGroup>
<Compile Include="UserInterface\SetupWindow.cs" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Compile Include="UserInterface\StatusIcon.cs" /> </Project>
<Compile Include="UserInterface\UserInterface.cs" />
<Compile Include="Controllers\Controller.cs" />
<Compile Include="..\Common\BaseController.cs">
<Link>Controllers\BaseController.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<InterfaceDefinition 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="..\Common\HTML\day-entry.html">
<Link>HTML\day-entry.html</Link>
</Content>
<Content Include="..\Common\HTML\event-entry.html">
<Link>HTML\event-entry.html</Link>
</Content>
<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\" />
<Folder Include="HTML\" />
<Folder Include="Presets\" />
<Folder Include="Controllers\" />
<Folder Include="UserInterface\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Sparkles\Sparkles.csproj">
<Project>{2C914413-B31C-4362-93C7-1AE34F09112A}</Project>
<Name>Sparkles</Name>
</ProjectReference>
<ProjectReference Include="..\..\Sparkles\Git\Sparkles.Git.csproj">
<Project>{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}</Project>
<Name>Sparkles.Git</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BundleResource Include="..\Common\Pixmaps\side-splash.png">
<Link>Resources\side-splash.png</Link>
</BundleResource>
<BundleResource Include="..\Linux\Pixmaps\icons\document-added-12.png">
<Link>Resources\document-added-12.png</Link>
</BundleResource>
<BundleResource Include="..\Linux\Pixmaps\icons\document-edited-12.png">
<Link>Resources\document-edited-12.png</Link>
</BundleResource>
<BundleResource Include="..\Linux\Pixmaps\icons\document-deleted-12.png">
<Link>Resources\document-deleted-12.png</Link>
</BundleResource>
<BundleResource Include="..\Linux\Pixmaps\icons\document-moved-12.png">
<Link>Resources\document-moved-12.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Pixmaps\about.png">
<Link>Resources\about.png</Link>
</BundleResource>
<BundleResource Include="Resources\tutorial-slide-3.png">
<Link>Resources\tutorial-slide-3.png</Link>
</BundleResource>
<BundleResource Include="Resources\process-syncing-down.png" />
<BundleResource Include="Resources\process-syncing-error.png" />
<BundleResource Include="Resources\process-syncing-idle.png" />
<BundleResource Include="Resources\process-syncing-up.png" />
<BundleResource Include="Resources\process-syncing.png" />
<BundleResource Include="..\Common\Pixmaps\user-icon-default.png">
<Link>Resources\user-icon-default.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Pixmaps\side-splash%402x.png">
<Link>Resources\side-splash%402x.png</Link>
</BundleResource>
<BundleResource Include="Resources\process-syncing-down%402x.png" />
<BundleResource Include="Resources\process-syncing-error%402x.png" />
<BundleResource Include="Resources\process-syncing-idle%402x.png" />
<BundleResource Include="Resources\process-syncing-up%402x.png" />
<BundleResource Include="Resources\process-syncing%402x.png" />
<BundleResource Include="..\Common\Pixmaps\about%402x.png">
<Link>Resources\about%402x.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Pixmaps\tutorial-slide-1.png">
<Link>Resources\tutorial-slide-1.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Pixmaps\tutorial-slide-1%402x.png">
<Link>Resources\tutorial-slide-1%402x.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Pixmaps\tutorial-slide-2.png">
<Link>Resources\tutorial-slide-2.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Pixmaps\tutorial-slide-2%402x.png">
<Link>Resources\tutorial-slide-2%402x.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\bitbucket%402x.png">
<Link>Presets\bitbucket%402x.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\github%402x.png">
<Link>Presets\github%402x.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\gitorious%402x.png">
<Link>Presets\gitorious%402x.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\own-server%402x.png">
<Link>Presets\own-server%402x.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\ssnet%402x.png">
<Link>Presets\ssnet%402x.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\bitbucket.xml">
<Link>Presets\bitbucket.xml</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\github.xml">
<Link>Presets\github.xml</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\gitorious.xml">
<Link>Presets\gitorious.xml</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\own-server.xml">
<Link>Presets\own-server.xml</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\bitbucket.png">
<Link>Presets\bitbucket.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\github.png">
<Link>Presets\github.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\gitorious.png">
<Link>Presets\gitorious.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\own-server.png">
<Link>Presets\own-server.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\ssnet.png">
<Link>Presets\ssnet.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\ssnet.xml">
<Link>Presets\ssnet.xml</Link>
</BundleResource>
<BundleResource Include="Resources\tutorial-slide-3%402x.png" />
<BundleResource Include="..\Common\Presets\planio.png">
<Link>Presets\planio.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\planio.xml">
<Link>Presets\planio.xml</Link>
</BundleResource>
<BundleResource Include="..\Common\Presets\planio%402x.png">
<Link>Presets\planio%402x.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Pixmaps\text-balloon.png">
<Link>Resources\text-balloon.png</Link>
</BundleResource>
<BundleResource Include="..\Common\Pixmaps\text-balloon%402x.png">
<Link>Resources\text-balloon%402x.png</Link>
</BundleResource>
</ItemGroup>
</Project>

5
SparkleShare/Linux/UserInterfaceHelpers.cs
View file

@ -64,7 +64,7 @@ namespace SparkleShare {
} }
public static Gdk.Color RGBAToColor (Gdk.RGBA rgba) { public static Gdk.Color RGBAToColor (Gdk.Rgb rgba) {
return new Gdk.Color () { return new Gdk.Color () {
Red = (ushort) (rgba.Red * 65535), Red = (ushort) (rgba.Red * 65535),
Green = (ushort) (rgba.Green * 65535), Green = (ushort) (rgba.Green * 65535),
@ -73,7 +73,7 @@ namespace SparkleShare {
} }
public static string RGBAToHex (Gdk.RGBA rgba) public static string RGBAToHex (Gdk.Rgb rgba)
{ {
return ColorToHex (RGBAToColor (rgba)); return ColorToHex (RGBAToColor (rgba));
} }
@ -92,4 +92,3 @@ namespace SparkleShare {
} }
} }
} }

7
SparkleShare/Mac/SparkleShare.Mac.csproj
View file

@ -95,10 +95,6 @@
<Link>SparkleShare.cs</Link> <Link>SparkleShare.cs</Link>
</Compile> </Compile>
<Compile Include="MacWatcher.cs" /> <Compile Include="MacWatcher.cs" />
<Compile Include="..\Common\Invite.cs">
<Link>Invite.cs</Link>
</Compile>
<Compile Include="..\Common\Avatars.cs" />
<Compile Include="..\Common\AboutController.cs"> <Compile Include="..\Common\AboutController.cs">
<Link>Controllers\AboutController.cs</Link> <Link>Controllers\AboutController.cs</Link>
</Compile> </Compile>
@ -129,6 +125,9 @@
<Link>Controllers\BaseController.cs</Link> <Link>Controllers\BaseController.cs</Link>
</Compile> </Compile>
<Compile Include="Controller.cs" /> <Compile Include="Controller.cs" />
<Compile Include="..\Common\Avatars.cs">
<Link>UserInterface\Avatars.cs</Link>
</Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<InterfaceDefinition Include="MainMenu.xib" /> <InterfaceDefinition Include="MainMenu.xib" />

3
SparkleShare/Mac/UserInterface/Setup.cs
View file

@ -20,11 +20,12 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using Mono.Unix;
using MonoMac.Foundation; using MonoMac.Foundation;
using MonoMac.AppKit; using MonoMac.AppKit;
using MonoMac.WebKit; using MonoMac.WebKit;
using Mono.Unix; using Sparkles;
namespace SparkleShare { namespace SparkleShare {

4
SparkleShare/Common/Invite.cs → Sparkles/Invite.cs
View file

@ -21,9 +21,7 @@ using System.Net;
using System.Text; using System.Text;
using System.Xml; using System.Xml;
using Sparkles; namespace Sparkles {
namespace SparkleShare {
public class SparkleInvite : XmlDocument { public class SparkleInvite : XmlDocument {

1
Sparkles/Makefile.am
View file

@ -13,6 +13,7 @@ SOURCES = \
Command.cs \ Command.cs \
Configuration.cs \ Configuration.cs \
Extensions.cs \ Extensions.cs \
Invite.cs \
ListenerFactory.cs \ ListenerFactory.cs \
Logger.cs \ Logger.cs \
Preset.cs \ Preset.cs \

2
Sparkles/Preset.cs
View file

@ -20,7 +20,7 @@ using System.Xml;
using IO = System.IO; using IO = System.IO;
namespace SparkleShare { namespace Sparkles {
public class Preset : XmlDocument { public class Preset : XmlDocument {

1
Sparkles/Sparkles.csproj
View file

@ -72,6 +72,7 @@
</Compile> </Compile>
<Compile Include="InstallationInfo.cs" /> <Compile Include="InstallationInfo.cs" />
<Compile Include="Preset.cs" /> <Compile Include="Preset.cs" />
<Compile Include="Invite.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Fetcher\" /> <Folder Include="Fetcher\" />