diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs index 0df0877c..94b464c7 100644 --- a/SparkleLib/Git/SparkleRepoGit.cs +++ b/SparkleLib/Git/SparkleRepoGit.cs @@ -444,10 +444,13 @@ namespace SparkleLib { if (change_type.Equals ("A")) { change_set.Added.Add (file_path); + } else if (change_type.Equals ("M")) { change_set.Edited.Add (file_path); + } else if (change_type.Equals ("D")) { change_set.Deleted.Add (file_path); + } else if (change_type.Equals ("R")) { int tab_pos = entry_line.LastIndexOf ("\t"); file_path = entry_line.Substring (42, tab_pos - 42); diff --git a/SparkleShare/Mac/SparkleUI.cs b/SparkleShare/Mac/SparkleUI.cs index a923bce2..0a57636b 100644 --- a/SparkleShare/Mac/SparkleUI.cs +++ b/SparkleShare/Mac/SparkleUI.cs @@ -63,6 +63,7 @@ namespace SparkleShare { { string content_path = Directory.GetParent ( System.AppDomain.CurrentDomain.BaseDirectory).ToString (); + string app_path = Directory.GetParent (content_path).ToString (); string growl_path = Path.Combine (app_path, "Frameworks", "Growl.framework", "Growl"); diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index e6be1fc5..e5874bca 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -19,6 +19,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Linq; using System.Net; using System.Security.Cryptography; using System.Text; @@ -240,8 +241,22 @@ namespace SparkleShare { } } - - public List GetLog (string name) + + public List GetLog () + {Console.WriteLine ("PPPPPPPPPPP"); + List list = new List (); + + foreach (SparkleRepoBase repo in Repositories) { + list.AddRange (repo.GetChangeSets (10)); + Console.WriteLine (">>>" + repo.Name); + } + + list.Sort ((x, y) => (x.Timestamp.CompareTo (y.Timestamp))); + return list; + } + + + public List GetLog (string name) { string path = Path.Combine (SparklePaths.SparklePath, name); int log_size = 30; diff --git a/SparkleShare/SparkleUI.cs b/SparkleShare/SparkleUI.cs index abc506f7..8eeaafc4 100644 --- a/SparkleShare/SparkleUI.cs +++ b/SparkleShare/SparkleUI.cs @@ -47,8 +47,11 @@ namespace SparkleShare { public SparkleUI () { // Initialize the application - Application.Init (); + Application.Init ();Console.WriteLine ("OOOOOOOOO"); + foreach (SparkleChangeSet change_set in SparkleShare.Controller.GetLog ()) { + Console.WriteLine (change_set.Timestamp.ToString ()); + } // Create the statusicon StatusIcon = new SparkleStatusIcon (); diff --git a/data/html/event-entry.html b/data/html/event-entry.html index fbeed413..4abcd5ff 100644 --- a/data/html/event-entry.html +++ b/data/html/event-entry.html @@ -1,6 +1,6 @@
-
+
@@ -11,10 +11,9 @@
-
+
gnome-design •
-
diff --git a/data/html/event-log.html b/data/html/event-log.html index a595ea83..70f4529c 100644 --- a/data/html/event-log.html +++ b/data/html/event-log.html @@ -61,7 +61,7 @@ margin-right: auto; margin-bottom: 9px; padding: 18px; - -webkit-border-radius: 6px; + -webkit-border-radius: 6px 6px 0 0; border: #ddd 1px solid; }