From 045268ac3bab03698a0740605ef1dd7bc633d24d Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Fri, 10 Jun 2011 21:26:26 +0100 Subject: [PATCH] update log style --- SparkleShare/Mac/SparkleLog.cs | 11 +++-- SparkleShare/Mac/SparkleStatusIcon.cs | 2 +- SparkleShare/SparkleController.cs | 37 ++++++--------- data/html/event-entry.html | 20 ++++----- data/html/event-log.html | 65 ++++++++++++++------------- 5 files changed, 65 insertions(+), 70 deletions(-) diff --git a/SparkleShare/Mac/SparkleLog.cs b/SparkleShare/Mac/SparkleLog.cs index 03970d53..1717d7bc 100644 --- a/SparkleShare/Mac/SparkleLog.cs +++ b/SparkleShare/Mac/SparkleLog.cs @@ -77,17 +77,17 @@ namespace SparkleShare { private void CreateEventLog () { - string name = Path.GetFileName (LocalPath); Title = "Recent Events"; - Separator = new NSBox (new RectangleF (0, 559, 480, 1)) { + Separator = new NSBox (new RectangleF (0, 573, 480, 1)) { BorderColor = NSColor.LightGray, BoxType = NSBoxType.NSBoxCustom }; ContentView.AddSubview (Separator); - this.popup_button = new NSPopUpButton (new RectangleF (100, 570, 200, 26), false); + this.popup_button = new NSPopUpButton (new RectangleF (480 - 156 - 8, 640 - 31 - 26, 156, 26), false); + //this.popup_button. this.popup_button.AddItem ("All Folders"); this.popup_button.Menu.AddItem (NSMenuItem.SeparatorItem); this.popup_button.AddItems (SparkleShare.Controller.Folders.ToArray ()); @@ -106,7 +106,7 @@ namespace SparkleShare { ProgressIndicator.StartAnimation (this); - WebView = new WebView (new RectangleF (0, 0, 480, 559), "", ""){ + WebView = new WebView (new RectangleF (0, 0, 480, 573 ), "", ""){ PolicyDelegate = new SparkleWebPolicyDelegate () }; @@ -135,8 +135,7 @@ namespace SparkleShare { private void GenerateHTML () { - string folder_name = Path.GetFileName (LocalPath); - HTML = SparkleShare.Controller.GetHTMLLog (); + HTML = SparkleShare.Controller.GetHTMLLog (); HTML = HTML.Replace ("", "Lucida Grande"); HTML = HTML.Replace ("", "13.6px"); diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs index 8ba9c4fd..81bd547d 100644 --- a/SparkleShare/Mac/SparkleStatusIcon.cs +++ b/SparkleShare/Mac/SparkleStatusIcon.cs @@ -154,7 +154,7 @@ namespace SparkleShare { Menu.AddItem (NSMenuItem.SeparatorItem); RecentEventsMenuItem = new NSMenuItem () { - Title = "Show Recent Events" + Title = "Recent Events" }; RecentEventsMenuItem.Activated +=delegate { diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index f6b1e303..8eb4edcc 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -320,54 +320,46 @@ namespace SparkleShare { string event_entry = "
"; if (change_set.IsMerge) { - event_entry += "
Merged a branch
"; + event_entry += "
Merged a branch
"; } else { if (change_set.Edited.Count > 0) { - event_entry += "
Edited
"; - foreach (string file_path in change_set.Edited) { string absolute_file_path = SparkleHelpers.CombineMore (SparklePaths.SparklePath, change_set.Folder, file_path); if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; else - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; } } if (change_set.Added.Count > 0) { - event_entry += "
Added
"; - foreach (string file_path in change_set.Added) { string absolute_file_path = SparkleHelpers.CombineMore (SparklePaths.SparklePath, change_set.Folder, file_path); if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; else - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; } } if (change_set.Deleted.Count > 0) { - event_entry += "
Deleted
"; - foreach (string file_path in change_set.Deleted) { string absolute_file_path = SparkleHelpers.CombineMore (SparklePaths.SparklePath, change_set.Folder, file_path); if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; else - event_entry += "
" + file_path + "
"; + event_entry += "
" + file_path + "
"; } } if (change_set.MovedFrom.Count > 0) { - event_entry += "
Moved
"; - int i = 0; foreach (string file_path in change_set.MovedFrom) { string to_file_path = change_set.MovedTo [i]; @@ -377,10 +369,10 @@ namespace SparkleShare { change_set.Folder, to_file_path); if (File.Exists (absolute_file_path)) - event_entry += "
" + file_path + "
" + + event_entry += "
" + file_path + "
" + "→ "; else - event_entry += "
" + file_path + "
" + + event_entry += "
" + file_path + "
" + "→ "; if (File.Exists (absolute_to_file_path)) @@ -1037,15 +1029,14 @@ namespace SparkleShare { } - private string [] tango_palette = new string [] {"#fce94f", "#edd400", - "#c4a000", "#8ae234", "#73d216", "#4e9a06", "#fcaf3e", "#f57900", - "#ce5c00", "#e9b96e", "#c17d11", "#8f5902", "#729fcf", "#3465a4", - "#204a87", "#ad7fa8", "#75507b", "#5c3566", "#888a85", "#555753", - "#2e3436", "#ef2929", "#cc0000", "#a40000"}; + private string [] tango_palette = new string [] {"#eaab00", "#e37222", + "#3892ab", "#33c2cb", "#19b271", "#9eab05", "#8599a8", "#9ca696", + "#b88454", "#cc0033", "#8f6678", "#8c6cd0", "#796cbf", "#4060af", + "#aa9c8f", "#818a8f"}; private string AssignColor (string s) { - string hash = GetMD5 (s).Substring (0, 6); + string hash = GetMD5 (s).Substring (0, 8); string numbers = Regex.Replace (hash, "[a-z]", ""); int number = int.Parse (numbers); return this.tango_palette [number % this.tango_palette.Length]; diff --git a/data/html/event-entry.html b/data/html/event-entry.html index 38aad61c..f689b376 100644 --- a/data/html/event-entry.html +++ b/data/html/event-entry.html @@ -1,19 +1,19 @@
-
+
-
-
+ +
+
+
+
+
+ +
+
- -
- -
- -
•
-
diff --git a/data/html/event-log.html b/data/html/event-log.html index 70f4529c..b4f45ad3 100644 --- a/data/html/event-log.html +++ b/data/html/event-log.html @@ -4,7 +4,7 @@ SparkleShare Event Log