beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

statusicon: Fix warning icons in menu not normalising to folders when conflicts have resolved

Browse source
This commit is contained in:
Hylke Bons 2012-05-31 17:02:30 +01:00
parent 8fe197f4d8
commit 48bb11fc71
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
SparkleShare/SparkleControllerBase.cs
View file

@ -410,6 +410,7 @@ namespace SparkleShare {
event_entry += "<dd class='document moved'>"; event_entry += "<dd class='document moved'>";
event_entry += FormatBreadCrumbs (change_set.Folder.FullPath, change.Path); event_entry += FormatBreadCrumbs (change_set.Folder.FullPath, change.Path);
event_entry += "<br>"; event_entry += "<br>";
event_entry += "<small>" + change.Timestamp.ToString ("HH:mm") +"</small> &nbsp;";
event_entry += FormatBreadCrumbs (change_set.Folder.FullPath, change.MovedPath); event_entry += FormatBreadCrumbs (change_set.Folder.FullPath, change.MovedPath);
event_entry += "</dd>"; event_entry += "</dd>";

3
SparkleShare/SparkleStatusIconController.cs
View file

@ -173,6 +173,9 @@ namespace SparkleShare {
if (UpdateIconEvent != null) if (UpdateIconEvent != null)
UpdateIconEvent (0); UpdateIconEvent (0);
if (UpdateMenuEvent != null)
UpdateMenuEvent (CurrentState);
}; };
Program.Controller.OnSyncing += delegate { Program.Controller.OnSyncing += delegate {

2
data/html/event-log.html
View file

@ -132,7 +132,7 @@
padding: 7px 12px; padding: 7px 12px;
border-radius: 5px; border-radius: 5px;
font-family: sans-serif; font-family: sans-serif;
font-size: 12px; font-size: <!-- $small-font-size -->;
float: right; float: right;
} }