statusicon: Fix warning icons in menu not normalising to folders when conflicts have resolved
This commit is contained in:
parent
103f9931ae
commit
143bc8af92
|
@ -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> ";
|
||||||
event_entry += FormatBreadCrumbs (change_set.Folder.FullPath, change.MovedPath);
|
event_entry += FormatBreadCrumbs (change_set.Folder.FullPath, change.MovedPath);
|
||||||
event_entry += "</dd>";
|
event_entry += "</dd>";
|
||||||
|
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue