-
+
Show all
diff --git a/SparkleShare/Common/Pixmaps/Makefile.am b/SparkleShare/Common/Pixmaps/Makefile.am
index 4b8fec4c..c4073c15 100644
--- a/SparkleShare/Common/Pixmaps/Makefile.am
+++ b/SparkleShare/Common/Pixmaps/Makefile.am
@@ -1,17 +1,7 @@
dist_pixmaps_DATA = \
tutorial-slide-4.png \
side-splash.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 \
+ user-icon-default.png \
about.png
pixmapsdir = $(pkgdatadir)/pixmaps/
diff --git a/SparkleShare/Common/Pixmaps/Sources/avatars.svg b/SparkleShare/Common/Pixmaps/Sources/avatars.svg
deleted file mode 100644
index 1fcc93a6..00000000
--- a/SparkleShare/Common/Pixmaps/Sources/avatars.svg
+++ /dev/null
@@ -1,676 +0,0 @@
-
-
-
-
diff --git a/SparkleShare/Common/Pixmaps/Sources/user-icon-default.svg b/SparkleShare/Common/Pixmaps/Sources/user-icon-default.svg
new file mode 100644
index 00000000..60067dd1
--- /dev/null
+++ b/SparkleShare/Common/Pixmaps/Sources/user-icon-default.svg
@@ -0,0 +1,263 @@
+
+
+
+
diff --git a/SparkleShare/Common/Pixmaps/avatar-a.png b/SparkleShare/Common/Pixmaps/avatar-a.png
deleted file mode 100644
index dae5a1a0..00000000
Binary files a/SparkleShare/Common/Pixmaps/avatar-a.png and /dev/null differ
diff --git a/SparkleShare/Common/Pixmaps/avatar-b.png b/SparkleShare/Common/Pixmaps/avatar-b.png
deleted file mode 100644
index cf3f72cd..00000000
Binary files a/SparkleShare/Common/Pixmaps/avatar-b.png and /dev/null differ
diff --git a/SparkleShare/Common/Pixmaps/avatar-c.png b/SparkleShare/Common/Pixmaps/avatar-c.png
deleted file mode 100644
index cbd5893d..00000000
Binary files a/SparkleShare/Common/Pixmaps/avatar-c.png and /dev/null differ
diff --git a/SparkleShare/Common/Pixmaps/avatar-d.png b/SparkleShare/Common/Pixmaps/avatar-d.png
deleted file mode 100644
index a55141e0..00000000
Binary files a/SparkleShare/Common/Pixmaps/avatar-d.png and /dev/null differ
diff --git a/SparkleShare/Common/Pixmaps/avatar-e.png b/SparkleShare/Common/Pixmaps/avatar-e.png
deleted file mode 100644
index 128e9ff9..00000000
Binary files a/SparkleShare/Common/Pixmaps/avatar-e.png and /dev/null differ
diff --git a/SparkleShare/Common/Pixmaps/avatar-f.png b/SparkleShare/Common/Pixmaps/avatar-f.png
deleted file mode 100644
index 5875d448..00000000
Binary files a/SparkleShare/Common/Pixmaps/avatar-f.png and /dev/null differ
diff --git a/SparkleShare/Common/Pixmaps/avatar-g.png b/SparkleShare/Common/Pixmaps/avatar-g.png
deleted file mode 100644
index f3947896..00000000
Binary files a/SparkleShare/Common/Pixmaps/avatar-g.png and /dev/null differ
diff --git a/SparkleShare/Common/Pixmaps/avatar-h.png b/SparkleShare/Common/Pixmaps/avatar-h.png
deleted file mode 100644
index ca51dd47..00000000
Binary files a/SparkleShare/Common/Pixmaps/avatar-h.png and /dev/null differ
diff --git a/SparkleShare/Common/Pixmaps/avatar-i.png b/SparkleShare/Common/Pixmaps/avatar-i.png
deleted file mode 100644
index 66d5d23a..00000000
Binary files a/SparkleShare/Common/Pixmaps/avatar-i.png and /dev/null differ
diff --git a/SparkleShare/Common/Pixmaps/avatar-j.png b/SparkleShare/Common/Pixmaps/avatar-j.png
deleted file mode 100644
index 63c3886d..00000000
Binary files a/SparkleShare/Common/Pixmaps/avatar-j.png and /dev/null differ
diff --git a/SparkleShare/Common/Pixmaps/avatar-k.png b/SparkleShare/Common/Pixmaps/avatar-k.png
deleted file mode 100644
index 2c9fa437..00000000
Binary files a/SparkleShare/Common/Pixmaps/avatar-k.png and /dev/null differ
diff --git a/SparkleShare/Common/Pixmaps/user-icon-default.png b/SparkleShare/Common/Pixmaps/user-icon-default.png
new file mode 100644
index 00000000..72420cb5
Binary files /dev/null and b/SparkleShare/Common/Pixmaps/user-icon-default.png differ
diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj
index 600a6628..735c27e3 100644
--- a/SparkleShare/Mac/SparkleShare.csproj
+++ b/SparkleShare/Mac/SparkleShare.csproj
@@ -190,39 +190,6 @@
Plugins\own-server.png
-
- Pixmaps\avatar-a.png
-
-
- Pixmaps\avatar-b.png
-
-
- Pixmaps\avatar-c.png
-
-
- Pixmaps\avatar-d.png
-
-
- Pixmaps\avatar-e.png
-
-
- Pixmaps\avatar-f.png
-
-
- Pixmaps\avatar-g.png
-
-
- Pixmaps\avatar-h.png
-
-
- Pixmaps\avatar-i.png
-
-
- Pixmaps\avatar-j.png
-
-
- Pixmaps\avatar-k.png
-
Plugins\ssnet.png
@@ -240,6 +207,9 @@
+
+ Pixmaps\user-icon-default.png
+
diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index d6ddcea2..7e3eec39 100644
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -742,17 +742,6 @@ namespace SparkleShare {
}
- public string AssignAvatar (string s)
- {
- string hash = "0" + s.MD5 ().Substring (0, 8);
- string numbers = Regex.Replace (hash, "[a-z]", "");
- int number = int.Parse (numbers);
- string letters = "abcdefghijklmnopqrstuvwxyz";
-
- return "avatar-" + letters [(number % 11)] + ".png";
- }
-
-
// Format a file size nicely with small caps.
// Example: 1048576 becomes "1 ᴍʙ"
public string FormatSize (double byte_count)
diff --git a/SparkleShare/SparkleEventLogController.cs b/SparkleShare/SparkleEventLogController.cs
index 2f5a4334..e6b7d5e7 100755
--- a/SparkleShare/SparkleEventLogController.cs
+++ b/SparkleShare/SparkleEventLogController.cs
@@ -323,13 +323,10 @@ namespace SparkleShare {
string change_set_avatar = Program.Controller.GetAvatar (change_set.User.Email, 48);
- if (change_set_avatar != null) {
+ if (change_set_avatar != null)
change_set_avatar = "file://" + change_set_avatar.Replace ("\\", "/");
-
- } else {
- change_set_avatar = "file:///" +
- Program.Controller.AssignAvatar (change_set.User.Email);
- }
+ else
+ change_set_avatar = "file:///user-icon-default.png";
event_entry += "";
@@ -343,6 +340,7 @@ namespace SparkleShare {
event_entries += event_entry_html.Replace ("", event_entry)
.Replace ("", change_set.User.Name)
+ .Replace ("", change_set.User.Email)
.Replace ("", change_set_avatar)
.Replace ("", change_set.RemoteUrl.ToString ())
.Replace ("", change_set.Revision);
diff --git a/SparkleShare/Windows/SparkleEventLog.cs b/SparkleShare/Windows/SparkleEventLog.cs
index 67a0d69c..5cb4268a 100644
--- a/SparkleShare/Windows/SparkleEventLog.cs
+++ b/SparkleShare/Windows/SparkleEventLog.cs
@@ -308,28 +308,22 @@ namespace SparkleShare {
File.SetAttributes (tmp_path,
File.GetAttributes (tmp_path) | FileAttributes.Hidden);
}
-
- char [] letters = new char [] {'a', 'b', 'c',
- 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k'};
-
- foreach (char letter in letters) {
- BitmapSource image = SparkleUIHelpers.GetImageSource ("avatar-" + letter);
- string file_path = Path.Combine (pixmaps_path, "avatar-" + letter + ".png");
-
- using (FileStream stream = new FileStream (file_path, FileMode.Create))
- {
- BitmapEncoder encoder = new PngBitmapEncoder ();
- encoder.Frames.Add (BitmapFrame.Create (image));
- encoder.Save (stream);
- }
+
+ BitmapSource image = SparkleUIHelpers.GetImageSource ("user-icon-default");
+ string file_path = Path.Combine (pixmaps_path, "user-icon-default.png");
+
+ using (FileStream stream = new FileStream (file_path, FileMode.Create))
+ {
+ BitmapEncoder encoder = new PngBitmapEncoder ();
+ encoder.Frames.Add (BitmapFrame.Create (image));
+ encoder.Save (stream);
}
-
- string [] actions = new string [] {"added",
- "deleted", "edited", "moved"};
+
+ string [] actions = new string [] {"added", "deleted", "edited", "moved"};
foreach (string action in actions) {
BitmapSource image = SparkleUIHelpers.GetImageSource ("document-" + action + "-12");
- string file_path = Path.Combine (pixmaps_path, "document-" + action + "-12.png");
+ string file_path = Path.Combine (pixmaps_path, "document-" + action + "-12.png");
using (FileStream stream = new FileStream (file_path, FileMode.Create))
{
diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.csproj
index 0e68038f..957a1f76 100644
--- a/SparkleShare/Windows/SparkleShare.csproj
+++ b/SparkleShare/Windows/SparkleShare.csproj
@@ -158,38 +158,8 @@
HTML\jquery.js
-
- Pixmaps\avatar-a.png
-
-
- Pixmaps\avatar-b.png
-
-
- Pixmaps\avatar-c.png
-
-
- Pixmaps\avatar-d.png
-
-
- Pixmaps\avatar-e.png
-
-
- Pixmaps\avatar-f.png
-
-
- Pixmaps\avatar-g.png
-
-
- Pixmaps\avatar-h.png
-
-
- Pixmaps\avatar-i.png
-
-
- Pixmaps\avatar-j.png
-
-
- Pixmaps\avatar-k.png
+
+ Pixmaps\user-icon-default.png
Pixmaps\document-added-12.png