convert to vs2010, fix about dialog background
This commit is contained in:
wimh
parent
e11ba04bfb
commit
614629ec0d
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -9,6 +9,7 @@
|
|||
*.bak
|
||||
*.suo
|
||||
*.sln.cache
|
||||
*.user
|
||||
po/POTFILES
|
||||
Makefile.in
|
||||
Makefile
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
|
|
@ -11,9 +11,11 @@
|
|||
<AssemblyName>SparkleLib</AssemblyName>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<OldToolsVersion>3.5</OldToolsVersion>
|
||||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
|
|
@ -26,10 +28,8 @@
|
|||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
<WarningLevel>4</WarningLevel>
|
||||
<ConsolePause>false</ConsolePause>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>none</DebugType>
|
||||
|
|
@ -49,6 +50,7 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<ConsolePause>false</ConsolePause>
|
||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -117,9 +119,15 @@
|
|||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
|
||||
<Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 2.0 %28x86%29</ProductName>
|
||||
|
|
@ -135,6 +143,11 @@
|
|||
<ProductName>.NET Framework 3.5</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Defines.tt">
|
||||
|
|
@ -166,4 +179,4 @@
|
|||
<PropertyGroup>
|
||||
<PreBuildEvent>$(ProjectDir)transform_tt.cmd</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
@ -53,15 +53,14 @@ namespace SparkleShare {
|
|||
Title = _("About SparkleShare");
|
||||
AppPaintable = true;
|
||||
|
||||
// TODO: Should be able to do without referencing SparkleLib...
|
||||
//string image_path = SparkleLib.SparkleHelpers.CombineMore (SparkleLib.Defines.DATAROOTDIR,
|
||||
// "sparkleshare", "pixmaps", "about.png");
|
||||
|
||||
MemoryStream MemStream = new MemoryStream();
|
||||
Icons.about.Save(MemStream, System.Drawing.Imaging.ImageFormat.Png);
|
||||
MemStream.Seek(0, SeekOrigin.Begin);
|
||||
Realize ();
|
||||
//Gdk.Pixbuf buf = new Gdk.Pixbuf (image_path);
|
||||
//Gdk.Pixmap map, map2;
|
||||
//buf.RenderPixmapAndMask (out map, out map2, 255);
|
||||
//GdkWindow.SetBackPixmap (map, false);
|
||||
Gdk.Pixbuf buf = new Gdk.Pixbuf(MemStream);
|
||||
Gdk.Pixmap map, map2;
|
||||
buf.RenderPixmapAndMask (out map, out map2, 255);
|
||||
GdkWindow.SetBackPixmap (map, false);
|
||||
|
||||
CreateAbout ();
|
||||
|
||||
|
|
|
|||
67
SparkleShare/Windows/Icons.Designer.cs
generated
67
SparkleShare/Windows/Icons.Designer.cs
generated
|
|
@ -1,7 +1,7 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:2.0.50727.4211
|
||||
// Runtime Version:4.0.30319.225
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
|
|
@ -19,7 +19,7 @@ namespace SparkleShare {
|
|||
// class via a tool like ResGen or Visual Studio.
|
||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||
// with the /str option, or rebuild your VS project.
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
internal class Icons {
|
||||
|
|
@ -60,6 +60,13 @@ namespace SparkleShare {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap about {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("about", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap avatar_default {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("avatar_default", resourceCulture);
|
||||
|
|
@ -165,13 +172,6 @@ namespace SparkleShare {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap folder_sparkleshare_16_mist {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("folder_sparkleshare_16_mist", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap folder_sparkleshare_22 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("folder_sparkleshare_22", resourceCulture);
|
||||
|
|
@ -179,13 +179,6 @@ namespace SparkleShare {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap folder_sparkleshare_22_mist {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("folder_sparkleshare_22_mist", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap folder_sparkleshare_24 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("folder_sparkleshare_24", resourceCulture);
|
||||
|
|
@ -193,13 +186,6 @@ namespace SparkleShare {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap folder_sparkleshare_24_mist {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("folder_sparkleshare_24_mist", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap folder_sparkleshare_256 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("folder_sparkleshare_256", resourceCulture);
|
||||
|
|
@ -207,13 +193,6 @@ namespace SparkleShare {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap folder_sparkleshare_256_mist {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("folder_sparkleshare_256_mist", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap folder_sparkleshare_32 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("folder_sparkleshare_32", resourceCulture);
|
||||
|
|
@ -221,13 +200,6 @@ namespace SparkleShare {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap folder_sparkleshare_32_mist {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("folder_sparkleshare_32_mist", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap folder_sparkleshare_48 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("folder_sparkleshare_48", resourceCulture);
|
||||
|
|
@ -235,13 +207,6 @@ namespace SparkleShare {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap folder_sparkleshare_48_mist {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("folder_sparkleshare_48_mist", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap idle0 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("idle0", resourceCulture);
|
||||
|
|
@ -319,13 +284,6 @@ namespace SparkleShare {
|
|||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap process_syncing_sparkleshare_24_mist {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("process_syncing_sparkleshare_24_mist", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap process_syncing_sparkleshare_i_24 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("process_syncing_sparkleshare_i_24", resourceCulture);
|
||||
|
|
@ -388,5 +346,12 @@ namespace SparkleShare {
|
|||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
internal static System.Drawing.Bitmap sparkleshare_windows_status {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("sparkleshare_windows_status", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -228,9 +228,15 @@
|
|||
</data>
|
||||
<data name="sparkleshare_syncing_error_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\..\data\icons\sparkleshare-syncing-error-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="sparkleshare_windows_status" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\..\data\icons\sparkleshare-windows-status.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="sparkleshare" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\..\data\icons\sparkleshare.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\..\data\about.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="avatar_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\..\data\avatar-default.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
|
|
@ -11,9 +11,11 @@
|
|||
<RootNamespace>SparkleShare</RootNamespace>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<OldToolsVersion>3.5</OldToolsVersion>
|
||||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
|
|
@ -26,10 +28,8 @@
|
|||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
|
|
@ -40,6 +40,7 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>none</DebugType>
|
||||
|
|
@ -47,6 +48,7 @@
|
|||
<OutputPath>..\..\bin</OutputPath>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
|
|
@ -127,6 +129,11 @@
|
|||
<VisualStudio />
|
||||
</ProjectExtensions>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 2.0 %28x86%29</ProductName>
|
||||
|
|
@ -142,8 +149,14 @@
|
|||
<ProductName>.NET Framework 3.5</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
|
||||
<Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -180,4 +193,4 @@
|
|||
<ItemGroup>
|
||||
<None Include="Resources\sparkleshare.ico" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 10.00
|
||||
# Visual Studio 2008
|
||||
Microsoft Visual Studio Solution File, Format Version 11.00
|
||||
# Visual Studio 2010
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShare.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "..\..\SparkleLib\windows\SparkleLib.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}"
|
||||
|
|
|
|||
Loading…
Reference in a new issue