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

event log: fix the paddings of the size labels and dropdown

Browse source
This commit is contained in:
Hylke Bons 2012-02-19 23:58:33 +01:00
parent 5c89909578
commit 3491069301
4 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
NEWS
View file

@ -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:

2
README.md
View file

@ -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

4
SparkleShare/SparkleControllerBase.cs
View file

@ -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";
}

23
SparkleShare/SparkleEventLog.cs
View file

@ -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 = "<b>Size:</b> … <b>History:</b> …"
Markup = "<b>Size:</b> …",
Xalign = 0
};
this.history_label = new Label () {
Markup = "<b>History:</b> …",
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 = "<b>Size:</b> " + size + " " +
"<b>History:</b> " + history_size;
this.size_label.Markup = "<b>Size:</b> " + size;
this.history_label.Markup = "<b>History:</b> " + history_size;
this.size_label.ShowAll ();
this.history_label.ShowAll ();
});
};
}