Point to the right location for the avatars on Linux
|
@ -150,9 +150,10 @@ namespace SparkleLib {
|
||||||
"sparkleshare." + email + ".key.pub"
|
"sparkleshare." + email + ".key.pub"
|
||||||
);
|
);
|
||||||
|
|
||||||
SparkleUser user = new SparkleUser (name, email) {
|
SparkleUser user = new SparkleUser (name, email);
|
||||||
PublicKey = File.ReadAllText (pubkey_file_path)
|
|
||||||
};
|
if (File.Exists (pubkey_file_path))
|
||||||
|
user.PublicKey = File.ReadAllText (pubkey_file_path);
|
||||||
|
|
||||||
return user;
|
return user;
|
||||||
}
|
}
|
||||||
|
|
|
@ -326,38 +326,38 @@
|
||||||
<Content Include="..\..\data\icons\avatar-default.png">
|
<Content Include="..\..\data\icons\avatar-default.png">
|
||||||
<Link>Pixmaps\avatar-default.png</Link>
|
<Link>Pixmaps\avatar-default.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\avatar-1.png">
|
<Content Include="..\..\data\icons\avatar-a.png">
|
||||||
<Link>Pixmaps\avatar-1.png</Link>
|
<Link>Pixmaps\avatar-a.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\avatar-2.png">
|
<Content Include="..\..\data\icons\avatar-b.png">
|
||||||
<Link>Pixmaps\avatar-2.png</Link>
|
<Link>Pixmaps\avatar-b.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\avatar-3.png">
|
<Content Include="..\..\data\icons\avatar-c.png">
|
||||||
<Link>Pixmaps\avatar-3.png</Link>
|
<Link>Pixmaps\avatar-c.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\avatar-4.png">
|
<Content Include="..\..\data\icons\avatar-d.png">
|
||||||
<Link>Pixmaps\avatar-4.png</Link>
|
<Link>Pixmaps\avatar-d.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\avatar-5.png">
|
<Content Include="..\..\data\icons\avatar-e.png">
|
||||||
<Link>Pixmaps\avatar-5.png</Link>
|
<Link>Pixmaps\avatar-e.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\avatar-6.png">
|
<Content Include="..\..\data\icons\avatar-f.png">
|
||||||
<Link>Pixmaps\avatar-6.png</Link>
|
<Link>Pixmaps\avatar-f.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\avatar-7.png">
|
<Content Include="..\..\data\icons\avatar-g.png">
|
||||||
<Link>Pixmaps\avatar-7.png</Link>
|
<Link>Pixmaps\avatar-g.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\avatar-8.png">
|
<Content Include="..\..\data\icons\avatar-h.png">
|
||||||
<Link>Pixmaps\avatar-8.png</Link>
|
<Link>Pixmaps\avatar-h.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\avatar-9.png">
|
<Content Include="..\..\data\icons\avatar-i.png">
|
||||||
<Link>Pixmaps\avatar-9.png</Link>
|
<Link>Pixmaps\avatar-i.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\avatar-10.png">
|
<Content Include="..\..\data\icons\avatar-j.png">
|
||||||
<Link>Pixmaps\avatar-10.png</Link>
|
<Link>Pixmaps\avatar-j.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\avatar-11.png">
|
<Content Include="..\..\data\icons\avatar-k.png">
|
||||||
<Link>Pixmaps\avatar-11.png</Link>
|
<Link>Pixmaps\avatar-k.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -1154,8 +1154,9 @@ namespace SparkleShare {
|
||||||
string hash = "0" + GetMD5 (s).Substring (0, 8);
|
string hash = "0" + GetMD5 (s).Substring (0, 8);
|
||||||
string numbers = Regex.Replace (hash, "[a-z]", "");
|
string numbers = Regex.Replace (hash, "[a-z]", "");
|
||||||
int number = int.Parse (numbers);
|
int number = int.Parse (numbers);
|
||||||
|
string letters = "abcdefghijklmnopqrstuvwxyz";
|
||||||
|
|
||||||
return "avatar-" + (number % 11) + ".png";
|
return "avatar-" + letters [(number % 11)] + ".png";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -233,9 +233,8 @@ namespace SparkleShare {
|
||||||
html = html.Replace ("<!-- $day-entry-header-background-color -->", SparkleUIHelpers.GdkColorToHex (Style.Background (StateType.Normal)));
|
html = html.Replace ("<!-- $day-entry-header-background-color -->", SparkleUIHelpers.GdkColorToHex (Style.Background (StateType.Normal)));
|
||||||
html = html.Replace ("<!-- $secondary-font-color -->", SparkleUIHelpers.GdkColorToHex (Style.Foreground (StateType.Insensitive)));
|
html = html.Replace ("<!-- $secondary-font-color -->", SparkleUIHelpers.GdkColorToHex (Style.Foreground (StateType.Insensitive)));
|
||||||
html = html.Replace ("<!-- $small-color -->", SparkleUIHelpers.GdkColorToHex (Style.Foreground (StateType.Insensitive)));
|
html = html.Replace ("<!-- $small-color -->", SparkleUIHelpers.GdkColorToHex (Style.Foreground (StateType.Insensitive)));
|
||||||
html = html.Replace ("<!-- $no-buddy-icon-background-image -->", "file://" +
|
html = html.Replace ("<!-- $pixmaps-path -->", "file://" +
|
||||||
new string [] {SparkleUI.AssetsPath, "icons",
|
new string [] {SparkleUI.AssetsPath, "pixmaps"}.Combine ());
|
||||||
"hicolor", "32x32", "status", "avatar-default.png"}.Combine ());
|
|
||||||
html = html.Replace ("<!-- $document-added-background-image -->", "file://" +
|
html = html.Replace ("<!-- $document-added-background-image -->", "file://" +
|
||||||
new string [] {SparkleUI.AssetsPath, "icons",
|
new string [] {SparkleUI.AssetsPath, "icons",
|
||||||
"hicolor", "12x12", "status", "document-added.png"}.Combine ());
|
"hicolor", "12x12", "status", "document-added.png"}.Combine ());
|
||||||
|
@ -249,6 +248,8 @@ namespace SparkleShare {
|
||||||
new string [] {SparkleUI.AssetsPath, "icons",
|
new string [] {SparkleUI.AssetsPath, "icons",
|
||||||
"hicolor", "12x12", "status", "document-moved.png"}.Combine ());
|
"hicolor", "12x12", "status", "document-moved.png"}.Combine ());
|
||||||
|
|
||||||
|
Console.WriteLine (html);
|
||||||
|
|
||||||
Application.Invoke (delegate {
|
Application.Invoke (delegate {
|
||||||
this.spinner.Stop ();
|
this.spinner.Stop ();
|
||||||
this.web_view.LoadString (html, null, null, "file://");
|
this.web_view.LoadString (html, null, null, "file://");
|
||||||
|
|
|
@ -9,6 +9,17 @@ dist_pixmaps_DATA = \
|
||||||
tutorial-slide-2.png \
|
tutorial-slide-2.png \
|
||||||
tutorial-slide-3.png \
|
tutorial-slide-3.png \
|
||||||
tutorial-slide-4.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
|
about.png
|
||||||
|
|
||||||
pixmapsdir = $(pkgdatadir)/pixmaps/
|
pixmapsdir = $(pkgdatadir)/pixmaps/
|
||||||
|
|
Before Width: | Height: | Size: 650 B After Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 751 B After Width: | Height: | Size: 751 B |
Before Width: | Height: | Size: 989 B After Width: | Height: | Size: 989 B |
Before Width: | Height: | Size: 720 B After Width: | Height: | Size: 720 B |
Before Width: | Height: | Size: 753 B After Width: | Height: | Size: 753 B |
Before Width: | Height: | Size: 912 B After Width: | Height: | Size: 912 B |
Before Width: | Height: | Size: 771 B After Width: | Height: | Size: 771 B |
Before Width: | Height: | Size: 780 B After Width: | Height: | Size: 780 B |
Before Width: | Height: | Size: 666 B After Width: | Height: | Size: 666 B |
Before Width: | Height: | Size: 735 B After Width: | Height: | Size: 735 B |
Before Width: | Height: | Size: 669 B After Width: | Height: | Size: 669 B |
|
@ -24,7 +24,7 @@ app_theme_icons = \
|
||||||
places,folder-sparkleshare-256.png \
|
places,folder-sparkleshare-256.png \
|
||||||
places,folder-sparkleshare-32.png \
|
places,folder-sparkleshare-32.png \
|
||||||
places,folder-sparkleshare-48.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-16.png \
|
||||||
status,avatar-default-22.png \
|
status,avatar-default-22.png \
|
||||||
status,avatar-default-24.png \
|
status,avatar-default-24.png \
|
||||||
|
|