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

history: disable chooser when in history view

Browse source
This commit is contained in:
Hylke Bons 2012-10-15 22:02:13 +01:00
parent f9d867aa58
commit 1da8082d14
2 changed files with 89 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
SparkleShare/Mac/SparkleEventLog.cs
View file

@ -198,7 +198,7 @@ namespace SparkleShare {
});
}
};
Controller.UpdateChooserEvent += delegate (string [] folders) {
using (var a = new NSAutoreleasePool ())
{
@ -208,6 +208,15 @@ namespace SparkleShare {
}
};
Controller.UpdateChooserEnablementEvent += delegate (bool enabled) {
using (var a = new NSAutoreleasePool ())
{
InvokeOnMainThread (delegate {
this.popup_button.Enabled = enabled;
});
}
};
Controller.UpdateContentEvent += delegate (string html) {
using (var a = new NSAutoreleasePool ())
{

144
SparkleShare/SparkleEventLogController.cs
View file

@ -34,10 +34,13 @@ namespace SparkleShare {
public event UpdateContentEventEventHandler UpdateContentEvent = delegate { };
public delegate void UpdateContentEventEventHandler (string html);
public event UpdateChooserEventHandler UpdateChooserEvent = delegate { };
public delegate void UpdateChooserEventHandler (string [] folders);
public event UpdateChooserEnablementEventHandler UpdateChooserEnablementEvent = delegate { };
public delegate void UpdateChooserEnablementEventHandler (bool enabled);
public event UpdateSizeInfoEventHandler UpdateSizeInfoEvent = delegate { };
public delegate void UpdateSizeInfoEventHandler (string size, string history_size);
@ -258,81 +261,44 @@ namespace SparkleShare {
} else if (url.StartsWith ("back://")) {
this.history_view_active = false;
SelectedFolder = this.selected_folder; // TODO: Return to the same position on the page
UpdateChooserEnablementEvent (true);
} else if (url.StartsWith ("history://")) {
this.history_view_active = true;
ContentLoadingEvent ();
UpdateSizeInfoEvent ("…", "…");
UpdateChooserEnablementEvent (false);
string html = "";
string folder = url.Replace ("history://", "").Split ("/".ToCharArray ()) [0];
string path = url.Replace ("history://" + folder + "/", "");
string folder = url.Replace ("history://", "").Split ("/".ToCharArray ()) [0];
string file_path = url.Replace ("history://" + folder + "/", "");
// TODO: put html into page
foreach (SparkleRepoBase repo in Program.Controller.Repositories) {
if (repo.Name.Equals (folder)) {
new Thread (() => {
Stopwatch watch = new Stopwatch ();
watch.Start ();
List<SparkleChangeSet> change_sets = repo.GetChangeSets (path, 30);
html += "<div class='history-header'><a href='back://'>&laquo; Back</a> &nbsp;|&nbsp; ";
if (change_sets.Count > 1)
html += "Revisions for &ldquo;";
else
html += "No revisions for &ldquo;";
html += Path.GetFileName (path) + "&rdquo;";
html += "</div><table>";
int count = 0;
foreach (SparkleChangeSet change_set in change_sets) {
count++;
if (count == 1)
continue;
string change_set_avatar = Program.Controller.GetAvatar (change_set.User.Email, 24);
if (change_set_avatar != null)
change_set_avatar = "file://" + change_set_avatar.Replace ("\\", "/");
else
change_set_avatar = "file://<!-- $pixmaps-path -->/user-icon-default.png";
html += "<tr>" +
"<td class='avatar'><img src='" + change_set_avatar + "'></td>" +
"<td class='name'>" + change_set.User.Name + "</td>" +
"<td class='date'>" + change_set.Timestamp.ToString ("d MMM yyyy") + "</td>" +
"<td class='time'>" + change_set.Timestamp.ToString ("HH:mm") + "</td>" +
"<td class='restore'>" +
"<a href='restore://" + change_set.Folder.Name + "/" +
change_set.Revision + "/" + change_set.User.Name + "/" +
change_set.Timestamp.ToString ("MMM d H\\hmm") + "/" +
path + "'>Restore&hellip;</a></td>" +
"</tr>";
count++;
}
html += "</table>";
watch.Stop ();
int delay = 500;
if (watch.ElapsedMilliseconds < delay)
Thread.Sleep (delay - (int) watch.ElapsedMilliseconds);
UpdateContentEvent (Program.Controller.EventLogHTML.Replace ("<!-- $event-log-content -->", html));
}).Start ();
SparkleRepoBase repo;
foreach (SparkleRepoBase test_repo in Program.Controller.Repositories) {
if (test_repo.Name.Equals (folder)) {
repo = test_repo;
break;
}
}
new Thread (() => {
Stopwatch watch = new Stopwatch ();
watch.Start ();
List<SparkleChangeSet> change_sets = repo.GetChangeSets (file_path, 30);
string html = GetHistoryHTMLLog (change_sets, file_path);
watch.Stop ();
int delay = 500;
if (watch.ElapsedMilliseconds < delay)
Thread.Sleep (delay - (int) watch.ElapsedMilliseconds);
UpdateContentEvent (html);
}).Start ();
}
}
@ -396,6 +362,54 @@ namespace SparkleShare {
}
public string GetHistoryHTMLLog (List<SparkleChangeSet> change_sets, string file_path)
{
string html = "<div class='history-header'><a href='back://'>&laquo; Back</a> &nbsp;|&nbsp; ";
if (change_sets.Count > 1)
html += "Revisions for &ldquo;";
else
html += "No revisions for &ldquo;";
html += Path.GetFileName (file_path) + "&rdquo;";
html += "</div><table>";
int count = 0;
foreach (SparkleChangeSet change_set in change_sets) {
count++;
if (count == 1)
continue;
string change_set_avatar = Program.Controller.GetAvatar (change_set.User.Email, 24);
if (change_set_avatar != null)
change_set_avatar = "file://" + change_set_avatar.Replace ("\\", "/");
else
change_set_avatar = "file://<!-- $pixmaps-path -->/user-icon-default.png";
html += "<tr>" +
"<td class='avatar'><img src='" + change_set_avatar + "'></td>" +
"<td class='name'>" + change_set.User.Name + "</td>" +
"<td class='date'>" + change_set.Timestamp.ToString ("d MMM yyyy") + "</td>" +
"<td class='time'>" + change_set.Timestamp.ToString ("HH:mm") + "</td>" +
"<td class='restore'>" +
"<a href='restore://" + change_set.Folder.Name + "/" +
change_set.Revision + "/" + change_set.User.Name + "/" +
change_set.Timestamp.ToString ("MMM d H\\hmm") + "/" +
file_path + "'>Restore&hellip;</a>" +
"</td>" +
"</tr>";
count++;
}
html += "</table>";
return Program.Controller.EventLogHTML.Replace ("<!-- $event-log-content -->", html);
}
public string GetHTMLLog (List<SparkleChangeSet> change_sets)
{
if (change_sets.Count == 0)