From e94fc365219a34c97f9e172876cd815fbc30343e Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Thu, 17 Jun 2010 21:51:05 +0100 Subject: [PATCH] use grey text for time in event log and add smaller icon sizes for avatar-default --- SparkleShare/SparkleWindow.cs | 54 +++++++++++------- .../hicolor/22x22/status/avatar-default.png | Bin 0 -> 1286 bytes .../hicolor/24x24/status/avatar-default.png | Bin 0 -> 1323 bytes 3 files changed, 32 insertions(+), 22 deletions(-) create mode 100644 data/icons/hicolor/22x22/status/avatar-default.png create mode 100644 data/icons/hicolor/24x24/status/avatar-default.png diff --git a/SparkleShare/SparkleWindow.cs b/SparkleShare/SparkleWindow.cs index 080ec23f..4a80d69d 100644 --- a/SparkleShare/SparkleWindow.cs +++ b/SparkleShare/SparkleWindow.cs @@ -95,7 +95,7 @@ namespace SparkleShare { } - public ScrolledWindow CreateEventLog () + private ScrolledWindow CreateEventLog () { ListStore LogStore = new ListStore (typeof (Gdk.Pixbuf), @@ -147,7 +147,7 @@ namespace SparkleShare { else LogStore.SetValue (Iter, 1, "" + UserName + "\n" + Message.Replace ("/", " → ")); - LogStore.SetValue (Iter, 2, TimeAgo + " "); + LogStore.SetValue (Iter, 2, "" + TimeAgo + " "); // We're not showing email, it's only // there for lookup purposes @@ -160,32 +160,38 @@ namespace SparkleShare { TreeView LogView = new TreeView (LogStore); LogView.HeadersVisible = false; - CellRendererText TextCellRight = new Gtk.CellRendererText (); - TextCellRight.Xalign = 1; + LogView.AppendColumn ("", new CellRendererPixbuf (), "pixbuf", 0); - LogView.AppendColumn ("", new Gtk.CellRendererPixbuf (), "pixbuf", 0); + CellRendererText MessageCellRenderer = new CellRendererText (); + TreeViewColumn MessageColumn = new TreeViewColumn (); + MessageColumn.PackStart (MessageCellRenderer, true); + MessageColumn.SetCellDataFunc (MessageCellRenderer, new Gtk.TreeCellDataFunc (RenderMessageRow)); + LogView.AppendColumn (MessageColumn); - CellRendererText CellRendererMarkup = new CellRendererText (); - TreeViewColumn ColumnMarkup = new TreeViewColumn (); - ColumnMarkup.PackStart (CellRendererMarkup, true); - LogView.AppendColumn (ColumnMarkup); - - ColumnMarkup.SetCellDataFunc (CellRendererMarkup, new Gtk.TreeCellDataFunc (RenderRow)); - - LogView.AppendColumn ("", TextCellRight, "text", 2); + CellRendererText TimeAgoCellRenderer = new CellRendererText (); + TreeViewColumn TimeAgoColumn = new TreeViewColumn (); + TimeAgoColumn.PackStart (TimeAgoCellRenderer, true); + TimeAgoColumn.SetCellDataFunc (TimeAgoCellRenderer, new Gtk.TreeCellDataFunc (RenderTimeAgoRow)); + TimeAgoCellRenderer.Xalign = 1; + LogView.AppendColumn (TimeAgoColumn); TreeViewColumn [] Columns = LogView.Columns; + Columns [0].MinWidth = 42; + Columns [1].Expand = true; - Columns [2].Expand = true; Columns [1].MinWidth = 350; + + Columns [2].Expand = true; Columns [2].MinWidth = 50; - Columns [2].Spacing = 200; + // Get the email address of the selected log message each + // time the cursor changes LogView.CursorChanged += delegate (object o, EventArgs args) { - TreeModel Model; - if (LogView.Selection.GetSelected (out Model, out Iter)) { - SelectedEmail = (string) Model.GetValue (Iter, 3); + TreeModel model; + TreeIter iter; + if (LogView.Selection.GetSelected (out model, out iter)) { + SelectedEmail = (string) model.GetValue (iter, 3); } }; @@ -212,12 +218,16 @@ namespace SparkleShare { } // Renders a row with custom markup - private void RenderRow (TreeViewColumn Column, CellRenderer Cell, TreeModel Model, TreeIter Iter) + private void RenderMessageRow (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter) { + string item = (string) model.GetValue (iter, 1); + (cell as CellRendererText).Markup = item; + } - string Item = (string) Model.GetValue (Iter, 1); - (Cell as CellRendererText).Markup = Item; - + private void RenderTimeAgoRow (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter) + { + string item = (string) model.GetValue (iter, 2); + (cell as CellRendererText).Markup = item; } } diff --git a/data/icons/hicolor/22x22/status/avatar-default.png b/data/icons/hicolor/22x22/status/avatar-default.png new file mode 100644 index 0000000000000000000000000000000000000000..089024eedfc793e4dcd91a4c5c4f2a15cde51f2a GIT binary patch literal 1286 zcmV+h1^N1kP)AW3d!Z|pJm-v9sr7j#8fbU}4=Xm4@= zOkr?uAVXnnVQpbYY#}wsHVBjy(=4@10e*2@Gy1nUr4EL&jx2w-G zxDdjH>v|AEwCYUH^HR9}=XD!J^}#uTr>fQcCr_V>lOzG>GtkGAbAc!daq`sZIGC#L zpA-1l;bTKV5F9#k^k@>t4LFVi$6>8>Kq*D7R>QHcjwi;LL;d~zvpVn*=aot&>iPU# zhtTrmnuoy; zeI6lPeDdu}FD~Es)|(qr&1Q^q=gwhh_zEsvzKk#ok;!B*f8IQ7?%j-@o*tgbWS5-3 z@bi)3;i0Vn*#bOJ*;f2<@xw1yuUfTzZCkfxlB5aObwLQAwFW?1qhQh`zm#vc8!`(ccM)*4zX zD5apa2ImZ`Us>soj*e~t@BrM1>%IAWo{W!=K?nxl&%zi3&Mk~Fa2(oFYoWD)F&a`z zD5VfZH6)3|lFnr$ZZ>+`<3o)+n_raOpuKjW8`yU2WqtQSROoK6oY&M5fDhfoK5ETT$UjXg^s99^xf9fs)OONfOQ2+n{07*qoM6N<$f@_~cm;e9( literal 0 HcmV?d00001 diff --git a/data/icons/hicolor/24x24/status/avatar-default.png b/data/icons/hicolor/24x24/status/avatar-default.png new file mode 100644 index 0000000000000000000000000000000000000000..6cc87fc212d2ffcdaa2306b9c20164f52ca8940b GIT binary patch literal 1323 zcmV+`1=RY9P)AW3d!Z|pJm-v9sr7j#8fbU}4=Xm4@= zOkr?uAVXnnVQpb*dUG?pcdoY0aSn?;q%!?|m|tfP-&%H;`U zGK=7ONigO>DTP|CiXa$+)*3A>Pm^jCwJiuxE?1T_#sFBwuAcPA_DU2~wN`w&L zLSQ18SiT^Dl=9yA_}EGz5&!_D6e^WE2qCc6!f_l3As~c@v4{UaN_B58z^pY0!?1T~ zXvij$NeJOW2p6vFK?u>@8`nH9fm?svvSC>5T@YYwV&c%5b7!MCj=_23<1-iM0%2Ie znX~7jU~J;hf&eFvo$L#O;OOxaC*mlo!Eqco4r?w4lv0$-Wt{x-RBVhn+TGnfr=y>6 za-mS5p3mQL2rZ6|K3rOQP~xw(x1+Un1)j-f@%QK`hKKLs(&fv@EzQYncJTvk&4DPC zr}O!|nF*LtWJ0+3_?s7BSheNNH#R5g^#~U)UPNF2bzHr64V6j-sZ8?ZD$1Kc?WL{0CpGTf27Gmd)D|lu~dmpp--$M=-`fDGkOL zD5Vg>1?K`%#xTa=3x zv$xRNz!(iFC6rPK!!qJnVnypp64h&+(~pQYN=ryJtR~|)hEfuM1K;6+$)>;rk;5ZDNb2tv08X3lD zFvbzbbr@qYFff2xwR#(XI|XRcQor8({pxq$_o!N}h9DRRV+`qZ28l!xoC{D&VXehv zcO?=@q|+HN#t;PKh@uGRdwSH(-v+M$@F!J}W`=118(w*}?U-OZ2M3s@a^A4k0vd>w zEM5D#cMpIo*4pxP00rt|cA3)hQdis$Mnvy602b0ad hu&@9$0Ar`Q_g|2V5m9l(9LWFx002ovPDHLkV1l^YU^V~% literal 0 HcmV?d00001