diff --git a/SparkleLib/Git/SparkleLib.Git.csproj b/SparkleLib/Git/SparkleLib.Git.csproj index e4cfacd0..21633838 100644 --- a/SparkleLib/Git/SparkleLib.Git.csproj +++ b/SparkleLib/Git/SparkleLib.Git.csproj @@ -11,7 +11,6 @@ SparkleLib.Git SparkleLib.Git 512 - pdbonly diff --git a/SparkleLib/SparkleLib.csproj b/SparkleLib/SparkleLib.csproj index 1da7ee15..345c0d69 100644 --- a/SparkleLib/SparkleLib.csproj +++ b/SparkleLib/SparkleLib.csproj @@ -9,7 +9,6 @@ Library SparkleLib SparkleLib - none diff --git a/SparkleShare/Linux/SparkleAbout.cs b/SparkleShare/Linux/SparkleAbout.cs index 7e091937..81a0fae2 100755 --- a/SparkleShare/Linux/SparkleAbout.cs +++ b/SparkleShare/Linux/SparkleAbout.cs @@ -44,7 +44,7 @@ namespace SparkleShare { Title = "About SparkleShare"; AppPaintable = true; - string image_path = new string [] { Program.UI.AssetsPath, "pixmaps", "about.png" }.Combine (); + string image_path = new string [] { SparkleUI.AssetsPath, "pixmaps", "about.png" }.Combine (); Realize (); Gdk.Pixbuf buf = new Gdk.Pixbuf (image_path); diff --git a/SparkleShare/Linux/SparkleEventLog.cs b/SparkleShare/Linux/SparkleEventLog.cs index b94cdcef..8f28fc09 100755 --- a/SparkleShare/Linux/SparkleEventLog.cs +++ b/SparkleShare/Linux/SparkleEventLog.cs @@ -246,8 +246,8 @@ namespace SparkleShare { if (html == null) return; - string pixmaps_path = IO.Path.Combine (Program.UI.AssetsPath, "pixmaps"); - string icons_path = new string [] {Program.UI.AssetsPath, "icons", + string pixmaps_path = IO.Path.Combine (SparkleUI.AssetsPath, "pixmaps"); + string icons_path = new string [] {SparkleUI.AssetsPath, "icons", "hicolor", "12x12", "status"}.Combine (); html = html.Replace ("", (double) (Style.FontDescription.Size / 1024 + 3) + "px"); diff --git a/SparkleShare/Linux/SparkleShare.csproj b/SparkleShare/Linux/SparkleShare.csproj index a0f5513f..d4f46339 100644 --- a/SparkleShare/Linux/SparkleShare.csproj +++ b/SparkleShare/Linux/SparkleShare.csproj @@ -1,7 +1,7 @@ - + - Debug + Release AnyCPU 8.0.50727 {728483AA-E34B-4441-BF2C-C8BC2901E4E0} @@ -9,15 +9,7 @@ SparkleShare 2.0 SparkleShare - - - true - full - false - ..\bin - DEBUG - prompt - 4 + v2.0 none diff --git a/SparkleShare/Linux/SparkleShare.sln b/SparkleShare/Linux/SparkleShare.sln index 241c51e8..4a198ba4 100644 --- a/SparkleShare/Linux/SparkleShare.sln +++ b/SparkleShare/Linux/SparkleShare.sln @@ -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\SparkleLib.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}" @@ -9,20 +9,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib.Git", "..\..\Spa EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Debug|Any CPU.Build.0 = Debug|Any CPU {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.ActiveCfg = Release|Any CPU {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}.Release|Any CPU.Build.0 = Release|Any CPU - {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 - {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU {728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection diff --git a/SparkleShare/Linux/SparkleUI.cs b/SparkleShare/Linux/SparkleUI.cs index 5065239b..a5dcf6f0 100644 --- a/SparkleShare/Linux/SparkleUI.cs +++ b/SparkleShare/Linux/SparkleUI.cs @@ -30,7 +30,7 @@ namespace SparkleShare { public SparkleSetup Setup; public SparkleAbout About; - public string AssetsPath = Defines.INSTALL_DIR; + public static string AssetsPath = Defines.INSTALL_DIR; public SparkleUI () diff --git a/SparkleShare/Linux/SparkleUIHelpers.cs b/SparkleShare/Linux/SparkleUIHelpers.cs index 94f0e908..bd2596a3 100755 --- a/SparkleShare/Linux/SparkleUIHelpers.cs +++ b/SparkleShare/Linux/SparkleUIHelpers.cs @@ -27,7 +27,7 @@ namespace SparkleShare { public static Gdk.Pixbuf GetIcon (string name, int size) { IconTheme icon_theme = new IconTheme (); - icon_theme.AppendSearchPath (Path.Combine (Program.UI.AssetsPath, "icons")); + icon_theme.AppendSearchPath (Path.Combine (SparkleUI.AssetsPath, "icons")); try { return icon_theme.LoadIcon (name, size, IconLookupFlags.GenericFallback); @@ -45,7 +45,7 @@ namespace SparkleShare { public static Image GetImage (string name) { - string image_path = new string [] { Program.UI.AssetsPath, "pixmaps", name }.Combine (); + string image_path = new string [] { SparkleUI.AssetsPath, "pixmaps", name }.Combine (); return new Image (image_path); }