From 24840717bf587cd825637762a358d543839e3ed9 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Tue, 20 Sep 2011 17:59:14 +0100 Subject: [PATCH] kind of works on lion --- SparkleShare/Mac/Info.plist | 4 ++-- SparkleShare/Mac/MainMenu.xib.designer.cs | 2 +- SparkleShare/Mac/SparkleShare.csproj | 11 +++++---- SparkleShare/Program.cs | 10 ++++---- SparkleShare/SparkleController.cs | 2 +- SparkleShare/SparkleShare.sln | 28 ---------------------- data/icons/avatar-default.png | Bin 0 -> 1938 bytes 7 files changed, 15 insertions(+), 42 deletions(-) delete mode 100644 SparkleShare/SparkleShare.sln create mode 100644 data/icons/avatar-default.png diff --git a/SparkleShare/Mac/Info.plist b/SparkleShare/Mac/Info.plist index 8117ef38..97d1ab96 100644 --- a/SparkleShare/Mac/Info.plist +++ b/SparkleShare/Mac/Info.plist @@ -2,8 +2,6 @@ - CFBundleExecutable - CFBundleIconFile sparkleshare CFBundleIdentifier @@ -12,6 +10,8 @@ SparkleShare LSMinimumSystemVersion 10.6 + CFBundleVersion + 1 NSMainNibFile MainMenu NSPrincipalClass diff --git a/SparkleShare/Mac/MainMenu.xib.designer.cs b/SparkleShare/Mac/MainMenu.xib.designer.cs index 01952cd1..1ce6227d 100644 --- a/SparkleShare/Mac/MainMenu.xib.designer.cs +++ b/SparkleShare/Mac/MainMenu.xib.designer.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // This code was generated by a tool. -// Mono Runtime Version: 2.0.50727.1433 +// Mono Runtime Version: 4.0.30319.1 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj index 3b398306..fcea732f 100644 --- a/SparkleShare/Mac/SparkleShare.csproj +++ b/SparkleShare/Mac/SparkleShare.csproj @@ -62,7 +62,7 @@ False ..\..\bin\Meebey.SmartIrc4net.dll - + False ..\..\bin\SparkleLib.dll @@ -106,12 +106,18 @@ SparkleAboutController.cs + + SparkleExtensions.cs + + + Pixmaps\avatar-default.png + @@ -128,9 +134,6 @@ Pixmaps\side-splash.png - - Pixmaps\avatar-default.png - sparkleshare-mac.icns diff --git a/SparkleShare/Program.cs b/SparkleShare/Program.cs index f8368984..cfbd0ce0 100644 --- a/SparkleShare/Program.cs +++ b/SparkleShare/Program.cs @@ -23,7 +23,7 @@ using System.Runtime.InteropServices; using System.Text; using Mono.Unix; -using Mono.Unix.Native; +//using Mono.Unix.Native; using SparkleLib; using SparkleLib.Options; @@ -46,7 +46,7 @@ namespace SparkleShare { public static void Main (string [] args) { // Don't allow running as root on Linux or Mac - if ((SparkleBackend.Platform == PlatformID.Unix || + /* if ((SparkleBackend.Platform == PlatformID.Unix || SparkleBackend.Platform == PlatformID.MacOSX) && new UnixUserInfo (UnixEnvironment.UserName).UserId == 0) { @@ -54,7 +54,7 @@ namespace SparkleShare { Console.WriteLine (_("Things would go utterly wrong.")); Environment.Exit (-1); } - + */ // Parse the command line options bool show_help = false; OptionSet option_set = new OptionSet () { @@ -90,9 +90,7 @@ namespace SparkleShare { // Initialize the controller this way so that // there aren't any exceptions in the OS specific UI's - Controller = (SparkleController) Activator.CreateInstance ( - Type.GetType ("SparkleShare.Sparkle" + controller_name + "Controller")); - + Controller = new SparkleMacController (); Controller.Initialize (); if (Controller != null) { diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 4915ae23..d003fac1 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -1055,7 +1055,7 @@ namespace SparkleShare { this.fetcher.ProgressChanged += delegate (double percentage) { - if (FolderFetching != null) + if (FolderFetching != null) FolderFetching (percentage); }; diff --git a/SparkleShare/SparkleShare.sln b/SparkleShare/SparkleShare.sln deleted file mode 100644 index 7f23f4cf..00000000 --- a/SparkleShare/SparkleShare.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -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}" -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 - {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 - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = SparkleShare.csproj - outputpath = ..\bin - name = SparkleShare - EndGlobalSection -EndGlobal diff --git a/data/icons/avatar-default.png b/data/icons/avatar-default.png new file mode 100644 index 0000000000000000000000000000000000000000..b4f31d43d025a16357b15a45b9799e0685a05dd3 GIT binary patch literal 1938 zcmV;D2W|L?P)AW3d!Z|pJm-v9sr7j#8fbU}4=Xm4@= zOkr?uAVXnnVQpb;_A~AM$+%F3Eumz(pS~MHx7XQF8Yn3&E-Iq1-;vE`!veKge6R+4ENe%=8z?R= zgtK?MKO=wx2RhahlZ zWPJIw;TE?Co0~;6O_@M-B9!Bjgh$g<91lF2my_erHGK_c`64R-x~8ql@#P>vNFaza zh5;c7qN&|(hx|9QK*3ocA;VIjy-L)Jcu+Mh zk~IKP6gp$EI~Do)d042C&PEm}a{>U6unq(+ibRHyB=VhEXTfwL-VqrY5sa#5OOcU| z=_XgnS~?F{Z73WOrlu1eSpyI``Q+J-v#N|uYZW0NL%>W*UjtrIl+c+o9jYR7C$k37 z+}s?BC*u2BTU(QEw|5S~tVuJ0IGt{E?D(;yAoBZKT8@S8s}zR@!cAANb&qvkxS)Hz zzBHli96(s)@p#br&Q86r@7CDu;b_x+HKR`t?ptT0*|%{dzYrb@+lz3G-@I`n5emfy z3J}o(rzfPOEGt;^<7jwzL@y}~h&F~kp=ipNAMDum=e+=+nhrIsz%hOj*K_~!Whq&7F^n7N`H! zby>L5)fH2a{`}5&cU~qXH3IOZKsPW& zqho0N?{RV{KQA8@6f8i&hk_^=tir-`k=N@XX$qEs5`Db&dqGu{EnBy4YlY%D7Xa$B z&kw#;US4r%!_&{Okjo(0+(KsS$HmB~`GO!4aPR|Ohr>?%4;f(829#13K)|_EKm8~T zh6di*@m~E`)@BMoeSLj-UO`^h_BXe??RMz-AXGQ~3{O%U2^i~)1fX->WHW z7{N)CRxStvo|p$Tj_2BDmEt7Fw_Ul~lYrUIxGX*5sgyg6b_?Z~Nwr?%-DdtbTxOlM zS~lDXquuozw-OvLoStQY=f~m>&j{p>P;|^X<{ZCT0>GEr@gr~L>e`R1g2658*RN-b ziWX8{j}L3$Bws{8@bLizSz}E})>sZ11O)!ZtsIRE-`0Qs