From 758bfe62a913b167d058a62f509b15dfda85f2df Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Thu, 23 Feb 2012 01:25:50 +0100 Subject: [PATCH] Point to the right location for the avatars on Linux --- SparkleLib/SparkleConfig.cs | 7 ++-- SparkleShare/Mac/SparkleShare.csproj | 44 ++++++++++----------- SparkleShare/SparkleControllerBase.cs | 3 +- SparkleShare/SparkleEventLog.cs | 7 ++-- data/Makefile.am | 11 ++++++ data/{icons/avatar-1.png => avatar-a.png} | Bin data/{icons/avatar-2.png => avatar-b.png} | Bin data/{icons/avatar-3.png => avatar-c.png} | Bin data/{icons/avatar-4.png => avatar-d.png} | Bin data/{icons/avatar-5.png => avatar-e.png} | Bin data/{icons/avatar-6.png => avatar-f.png} | Bin data/{icons/avatar-7.png => avatar-g.png} | Bin data/{icons/avatar-8.png => avatar-h.png} | Bin data/{icons/avatar-9.png => avatar-i.png} | Bin data/{icons/avatar-10.png => avatar-j.png} | Bin data/{icons/avatar-11.png => avatar-k.png} | Bin data/icons/Makefile.am | 2 +- 17 files changed, 44 insertions(+), 30 deletions(-) rename data/{icons/avatar-1.png => avatar-a.png} (100%) rename data/{icons/avatar-2.png => avatar-b.png} (100%) rename data/{icons/avatar-3.png => avatar-c.png} (100%) rename data/{icons/avatar-4.png => avatar-d.png} (100%) rename data/{icons/avatar-5.png => avatar-e.png} (100%) rename data/{icons/avatar-6.png => avatar-f.png} (100%) rename data/{icons/avatar-7.png => avatar-g.png} (100%) rename data/{icons/avatar-8.png => avatar-h.png} (100%) rename data/{icons/avatar-9.png => avatar-i.png} (100%) rename data/{icons/avatar-10.png => avatar-j.png} (100%) rename data/{icons/avatar-11.png => avatar-k.png} (100%) diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index ca01f402..57a677b2 100755 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -150,9 +150,10 @@ namespace SparkleLib { "sparkleshare." + email + ".key.pub" ); - SparkleUser user = new SparkleUser (name, email) { - PublicKey = File.ReadAllText (pubkey_file_path) - }; + SparkleUser user = new SparkleUser (name, email); + + if (File.Exists (pubkey_file_path)) + user.PublicKey = File.ReadAllText (pubkey_file_path); return user; } diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj index cc48b6fe..38fac9b1 100755 --- a/SparkleShare/Mac/SparkleShare.csproj +++ b/SparkleShare/Mac/SparkleShare.csproj @@ -326,38 +326,38 @@ Pixmaps\avatar-default.png - - Pixmaps\avatar-1.png + + Pixmaps\avatar-a.png - - Pixmaps\avatar-2.png + + Pixmaps\avatar-b.png - - Pixmaps\avatar-3.png + + Pixmaps\avatar-c.png - - Pixmaps\avatar-4.png + + Pixmaps\avatar-d.png - - Pixmaps\avatar-5.png + + Pixmaps\avatar-e.png - - Pixmaps\avatar-6.png + + Pixmaps\avatar-f.png - - Pixmaps\avatar-7.png + + Pixmaps\avatar-g.png - - Pixmaps\avatar-8.png + + Pixmaps\avatar-h.png - - Pixmaps\avatar-9.png + + Pixmaps\avatar-i.png - - Pixmaps\avatar-10.png + + Pixmaps\avatar-j.png - - Pixmaps\avatar-11.png + + Pixmaps\avatar-k.png diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs index 6d87f9ff..3e5bfbb4 100755 --- a/SparkleShare/SparkleControllerBase.cs +++ b/SparkleShare/SparkleControllerBase.cs @@ -1154,8 +1154,9 @@ namespace SparkleShare { string hash = "0" + GetMD5 (s).Substring (0, 8); string numbers = Regex.Replace (hash, "[a-z]", ""); int number = int.Parse (numbers); + string letters = "abcdefghijklmnopqrstuvwxyz"; - return "avatar-" + (number % 11) + ".png"; + return "avatar-" + letters [(number % 11)] + ".png"; } diff --git a/SparkleShare/SparkleEventLog.cs b/SparkleShare/SparkleEventLog.cs index 4e6dc7a7..12bd6bdc 100755 --- a/SparkleShare/SparkleEventLog.cs +++ b/SparkleShare/SparkleEventLog.cs @@ -233,9 +233,8 @@ namespace SparkleShare { html = html.Replace ("", SparkleUIHelpers.GdkColorToHex (Style.Background (StateType.Normal))); html = html.Replace ("", SparkleUIHelpers.GdkColorToHex (Style.Foreground (StateType.Insensitive))); html = html.Replace ("", SparkleUIHelpers.GdkColorToHex (Style.Foreground (StateType.Insensitive))); - html = html.Replace ("", "file://" + - new string [] {SparkleUI.AssetsPath, "icons", - "hicolor", "32x32", "status", "avatar-default.png"}.Combine ()); + html = html.Replace ("", "file://" + + new string [] {SparkleUI.AssetsPath, "pixmaps"}.Combine ()); html = html.Replace ("", "file://" + new string [] {SparkleUI.AssetsPath, "icons", "hicolor", "12x12", "status", "document-added.png"}.Combine ()); @@ -249,6 +248,8 @@ namespace SparkleShare { new string [] {SparkleUI.AssetsPath, "icons", "hicolor", "12x12", "status", "document-moved.png"}.Combine ()); +Console.WriteLine (html); + Application.Invoke (delegate { this.spinner.Stop (); this.web_view.LoadString (html, null, null, "file://"); diff --git a/data/Makefile.am b/data/Makefile.am index cea4d45f..cf1520b3 100755 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -9,6 +9,17 @@ dist_pixmaps_DATA = \ tutorial-slide-2.png \ tutorial-slide-3.png \ tutorial-slide-4.png \ + avatar-a.png \ + avatar-b.png \ + avatar-c.png \ + avatar-d.png \ + avatar-e.png \ + avatar-f.png \ + avatar-g.png \ + avatar-h.png \ + avatar-i.png \ + avatar-j.png \ + avatar-k.png \ about.png pixmapsdir = $(pkgdatadir)/pixmaps/ diff --git a/data/icons/avatar-1.png b/data/avatar-a.png similarity index 100% rename from data/icons/avatar-1.png rename to data/avatar-a.png diff --git a/data/icons/avatar-2.png b/data/avatar-b.png similarity index 100% rename from data/icons/avatar-2.png rename to data/avatar-b.png diff --git a/data/icons/avatar-3.png b/data/avatar-c.png similarity index 100% rename from data/icons/avatar-3.png rename to data/avatar-c.png diff --git a/data/icons/avatar-4.png b/data/avatar-d.png similarity index 100% rename from data/icons/avatar-4.png rename to data/avatar-d.png diff --git a/data/icons/avatar-5.png b/data/avatar-e.png similarity index 100% rename from data/icons/avatar-5.png rename to data/avatar-e.png diff --git a/data/icons/avatar-6.png b/data/avatar-f.png similarity index 100% rename from data/icons/avatar-6.png rename to data/avatar-f.png diff --git a/data/icons/avatar-7.png b/data/avatar-g.png similarity index 100% rename from data/icons/avatar-7.png rename to data/avatar-g.png diff --git a/data/icons/avatar-8.png b/data/avatar-h.png similarity index 100% rename from data/icons/avatar-8.png rename to data/avatar-h.png diff --git a/data/icons/avatar-9.png b/data/avatar-i.png similarity index 100% rename from data/icons/avatar-9.png rename to data/avatar-i.png diff --git a/data/icons/avatar-10.png b/data/avatar-j.png similarity index 100% rename from data/icons/avatar-10.png rename to data/avatar-j.png diff --git a/data/icons/avatar-11.png b/data/avatar-k.png similarity index 100% rename from data/icons/avatar-11.png rename to data/avatar-k.png diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index d09cc805..da21e519 100755 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -24,7 +24,7 @@ app_theme_icons = \ places,folder-sparkleshare-256.png \ places,folder-sparkleshare-32.png \ places,folder-sparkleshare-48.png \ - status,sparkleshare-syncing-error-24.png \ + status,sparkleshare-syncing-error-24.png \ status,avatar-default-16.png \ status,avatar-default-22.png \ status,avatar-default-24.png \