diff --git a/SparkleShare/Mac/SparkleLog.cs b/SparkleShare/Mac/SparkleLog.cs index 1717d7bc..a8ca567f 100644 --- a/SparkleShare/Mac/SparkleLog.cs +++ b/SparkleShare/Mac/SparkleLog.cs @@ -117,7 +117,6 @@ namespace SparkleShare { public void UpdateEventLog () { InvokeOnMainThread (delegate { - if (HTML == null) ContentView.AddSubview (ProgressIndicator); }); @@ -147,6 +146,14 @@ namespace SparkleShare { HTML = HTML.Replace ("", "#009ff8"); HTML = HTML.Replace ("", "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "avatar-default.png")); + HTML = HTML.Replace ("", + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-added-12.png")); + HTML = HTML.Replace ("", + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-deleted-12.png")); + HTML = HTML.Replace ("", + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-edited-12.png")); + HTML = HTML.Replace ("", + "file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "document-moved-12.png")); } diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj index 89c1e10f..31bc86d1 100644 --- a/SparkleShare/Mac/SparkleShare.csproj +++ b/SparkleShare/Mac/SparkleShare.csproj @@ -55,10 +55,6 @@ False - - False - ..\..\bin\SparkleLib.dll - False @@ -66,6 +62,10 @@ False ..\..\bin\Meebey.SmartIrc4net.dll + + False + ..\..\bin\SparkleLib.dll + @@ -158,6 +158,18 @@ Pixmaps\error-active.png + + Pixmaps\document-added-12.png + + + Pixmaps\document-edited-12.png + + + Pixmaps\document-deleted-12.png + + + Pixmaps\document-moved-12.png + diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs index 81bd547d..8c62892d 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 = "Recent Events" + Title = "Show Events" }; RecentEventsMenuItem.Activated +=delegate { diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 8eb4edcc..429def79 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -320,7 +320,7 @@ namespace SparkleShare { string event_entry = "
"; if (change_set.IsMerge) { - event_entry += "
Merged a branch
"; + event_entry += "
Did something magical
"; } else { if (change_set.Edited.Count > 0) { @@ -329,9 +329,9 @@ namespace SparkleShare { 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 + "
"; } } @@ -341,9 +341,9 @@ namespace SparkleShare { 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 + "
"; } } @@ -353,9 +353,9 @@ namespace SparkleShare { 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 + "
"; } } @@ -369,11 +369,9 @@ 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)) event_entry += "" + to_file_path + "
"; @@ -388,7 +386,7 @@ namespace SparkleShare { event_entry += "
"; event_entries += event_entry_html.Replace ("", event_entry) .Replace ("", change_set.UserName) - .Replace ("", "file://" + GetAvatar (change_set.UserEmail, 36) ) + .Replace ("", "file://" + GetAvatar (change_set.UserEmail, 36)) .Replace ("", change_set.Timestamp.ToString ("H:mm")) .Replace ("", change_set.Folder) .Replace ("", AssignColor (change_set.Folder)); @@ -1038,7 +1036,7 @@ namespace SparkleShare { { string hash = GetMD5 (s).Substring (0, 8); string numbers = Regex.Replace (hash, "[a-z]", ""); - int number = int.Parse (numbers); + int number = 1 + int.Parse (numbers); return this.tango_palette [number % this.tango_palette.Length]; } } diff --git a/data/actions.svg b/data/actions.svg new file mode 100644 index 00000000..c349857c --- /dev/null +++ b/data/actions.svg @@ -0,0 +1,1960 @@ + + + + + Text Editor + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Text Editor + + + text + editor + gedit + + + + + + + + + + + + + + + + + + + + + Lapo Calamandrei + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/html/event-entry.html b/data/html/event-entry.html index f689b376..f8643fac 100644 --- a/data/html/event-entry.html +++ b/data/html/event-entry.html @@ -3,12 +3,13 @@
-
-
-
-
-
- +
+
+
+
+
+
+
diff --git a/data/html/event-log.html b/data/html/event-log.html index b4f45ad3..f16f3573 100644 --- a/data/html/event-log.html +++ b/data/html/event-log.html @@ -27,7 +27,7 @@ font-size: ; color: #444; margin-bottom: 9px; - margin-left: 40px; + margin-left: 30px; } .day-entry-content { @@ -60,6 +60,7 @@ margin-right: auto; margin-bottom: 12px; padding: 0px; + padding-bottom: 6px; border: #ccc 1px solid; -webkit-border-radius: 0 0 3px 3px; } @@ -72,19 +73,37 @@ dd { width: 90%; overflow: hidden; - margin-left: 24px; text-overflow: ellipsis; - padding: 4px 0px; - border-bottom: 1px solid #ddd; - } - - dd:first-child { - padding-top: 12px; + padding: 0; + padding-top: 2px; + padding-bottom: 4px; + padding-left: 22px; + margin: 0; + margin-bottom: 2px; + margin-left: 12px; + border-bottom: 1px solid #ddd; + background-repeat: no-repeat; + background-position: center left; } dd:last-child { border: none; - padding-bottom: 12px; + } + + .document-added { + background-image: url(''); + } + + .document-deleted { + background-image: url(''); + } + + .document-edited { + background-image: url(''); + } + + .document-moved { + background-image: url(''); } .no-buddy-icon { @@ -105,10 +124,10 @@ .event-info { float: left; padding: 15px; + margin-bottom: 6px; width: 410px; background-color: #fff; border-bottom: 1px #ccc solid; - position: relative; } diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index fd621831..f23af747 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -25,10 +25,10 @@ app_theme_icons = \ status,avatar-default-24.png \ status,avatar-default-32.png \ status,avatar-default-48.png \ - status,document-added-16.png \ - status,document-edited-16.png \ - status,document-moved-16.png \ - status,document-removed-16.png \ + status,document-added-12.png \ + status,document-edited-12.png \ + status,document-deleted-12.png \ + status,document-moved-12.png \ status,dialog-error-16.png \ status,dialog-error-24.png diff --git a/data/icons/document-added-12.png b/data/icons/document-added-12.png new file mode 100644 index 00000000..409867db Binary files /dev/null and b/data/icons/document-added-12.png differ diff --git a/data/icons/document-added-16.png b/data/icons/document-added-16.png deleted file mode 100644 index 14fa8a36..00000000 Binary files a/data/icons/document-added-16.png and /dev/null differ diff --git a/data/icons/document-deleted-12.png b/data/icons/document-deleted-12.png new file mode 100644 index 00000000..f5585742 Binary files /dev/null and b/data/icons/document-deleted-12.png differ diff --git a/data/icons/document-edited-12.png b/data/icons/document-edited-12.png new file mode 100644 index 00000000..57b50968 Binary files /dev/null and b/data/icons/document-edited-12.png differ diff --git a/data/icons/document-edited-16.png b/data/icons/document-edited-16.png deleted file mode 100644 index e0a9f978..00000000 Binary files a/data/icons/document-edited-16.png and /dev/null differ diff --git a/data/icons/document-moved-12.png b/data/icons/document-moved-12.png new file mode 100644 index 00000000..dfe29d1d Binary files /dev/null and b/data/icons/document-moved-12.png differ diff --git a/data/icons/document-moved-16.png b/data/icons/document-moved-16.png deleted file mode 100644 index 834f6a72..00000000 Binary files a/data/icons/document-moved-16.png and /dev/null differ diff --git a/data/icons/document-removed-16.png b/data/icons/document-removed-16.png deleted file mode 100644 index 4695e878..00000000 Binary files a/data/icons/document-removed-16.png and /dev/null differ