diff --git a/NEWS b/NEWS
index 10bb72a0..ab470c1f 100755
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+0.8.3 for Linux and Mac (Mon Feb 19 2012):
+
+ Hylke:
+ -
+ -
+ -
+
+
0.8.2 for Linux and Mac (Sat Feb 11 2012):
Hylke:
diff --git a/README.md b/README.md
index fccd50ef..b84a8424 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ information see the LICENSE file or visit http://www.gnu.org/licenses/gpl-3.0.ht
Requirements:
- - git >= 1.7.0
+ - git >= 1.7.3
- gtk-sharp2
- mono-core >= 2.8
- notify-sharp
diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index ec9d54c6..ca32af9e 100755
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -740,9 +740,9 @@ namespace SparkleShare {
else if (byte_count >= 1073741824)
return String.Format ("{0:##.##} ɢʙ", Math.Round (byte_count / 1073741824, 1));
else if (byte_count >= 1048576)
- return String.Format ("{0:##.##} ᴍʙ", Math.Round (byte_count / 1048576, 1));
+ return String.Format ("{0:##.##} ᴍʙ", Math.Round (byte_count / 1048576, 0));
else if (byte_count >= 1024)
- return String.Format ("{0:##.##} ᴋʙ", Math.Round (byte_count / 1024, 1));
+ return String.Format ("{0:##.##} ᴋʙ", Math.Round (byte_count / 1024, 0));
else
return byte_count.ToString () + " bytes";
}
diff --git a/SparkleShare/SparkleEventLog.cs b/SparkleShare/SparkleEventLog.cs
index 6d21ad3d..4e6dc7a7 100755
--- a/SparkleShare/SparkleEventLog.cs
+++ b/SparkleShare/SparkleEventLog.cs
@@ -30,6 +30,7 @@ namespace SparkleShare {
public SparkleEventLogController Controller = new SparkleEventLogController ();
private Label size_label;
+ private Label history_label;
private HBox layout_horizontal;
private ComboBox combo_box;
private EventBox content_wrapper;
@@ -63,8 +64,18 @@ namespace SparkleShare {
};
this.size_label = new Label () {
- Markup = "Size: … History: …"
+ Markup = "Size: …",
+ Xalign = 0
};
+
+ this.history_label = new Label () {
+ Markup = "History: …",
+ Xalign = 0
+ };
+
+ HBox layout_sizes = new HBox (false, 12);
+ layout_sizes.Add (this.size_label);
+ layout_sizes.Add (this.history_label);
VBox layout_vertical = new VBox (false, 0);
this.spinner = new SparkleSpinner (22);
@@ -93,9 +104,8 @@ namespace SparkleShare {
this.spinner.Start ();
- this.layout_horizontal = new HBox (false, 0);
- this.layout_horizontal.PackStart (this.size_label, true, true, 0);
- this.layout_horizontal.PackStart (new Label (" "), false, false, 0);
+ this.layout_horizontal = new HBox (true, 0);
+ this.layout_horizontal.PackStart (layout_sizes, true, true, 12);
layout_vertical.PackStart (this.layout_horizontal, false, false, 0);
layout_vertical.PackStart (CreateShortcutsBar (), false, false, 0);
@@ -146,10 +156,11 @@ namespace SparkleShare {
Controller.UpdateSizeInfoEvent += delegate (string size, string history_size) {
Application.Invoke (delegate {
- this.size_label.Markup = "Size: " + size + " " +
- "History: " + history_size;
+ this.size_label.Markup = "Size: " + size;
+ this.history_label.Markup = "History: " + history_size;
this.size_label.ShowAll ();
+ this.history_label.ShowAll ();
});
};
}