From 2061ec8ab3b9b1a0e5cc7c13fe92a09f86d5b6ee Mon Sep 17 00:00:00 2001 From: Daniel Carbonell Fraj Date: Tue, 15 Apr 2003 16:34:56 +0000 Subject: [PATCH] Added mnemonics and new icons --- ChangeLog | 24 +++ Makefile.am | 2 +- configure.in | 1 + icons/Makefile.am | 5 + icons/alone.png | Bin 0 -> 4220 bytes icons/team.png | Bin 0 -> 3586 bytes src/Makefile.am | 2 +- src/commands.c | 24 ++- src/dialogs.c | 29 ++-- src/images/Makefile.am | 2 +- src/images/connect.xpm | 85 +++++++++++ src/images/disconnect.xpm | 69 +++++++++ src/images/pause.xpm | 57 ++++++++ src/images/play.xpm | 64 ++++++++ src/images/stop.xpm | 56 +++++++ src/images/team24.xpm | 301 ++++++++++++++++++++++++++++++++++++++ src/partyline.c | 5 +- src/winlist.c | 35 +++-- 18 files changed, 725 insertions(+), 36 deletions(-) create mode 100644 icons/Makefile.am create mode 100644 icons/alone.png create mode 100644 icons/team.png create mode 100644 src/images/connect.xpm create mode 100644 src/images/disconnect.xpm create mode 100644 src/images/pause.xpm create mode 100644 src/images/play.xpm create mode 100644 src/images/stop.xpm create mode 100644 src/images/team24.xpm diff --git a/ChangeLog b/ChangeLog index 4f556b9..58c3c9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2003-04-14 Dani Carbonell + + * icons/ added to CVS + + * Makefile.am: added "icons" to SUBDIRS + * configure.in: added the "icons" directory + + * src/Makefile.am: changed PIXMAPSDIR constant + + * src/commands.c: changed the toolbar icons + + * src/partyline.c (partyline_update_channel_list): update the channel + list only if we're connected. + (partyline_show_channel_list): update the list when it's enabled. + + * src/winlist.c: use pretty icons instead of that ugly 'T'. + + * src/images/Makefile.am: added new icons to EXTRA_DIST + +2003-04-14 Jordi Mallach + + * src/dialogs.c (connectdialog_new): + (prefdialog_new): added mnemonics to the labels + 2003-04-14 Jordi Mallach * NEWS: Updated. diff --git a/Makefile.am b/Makefile.am index 9a5d2f9..486703a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS= doc po src themes +SUBDIRS= doc po src themes icons icon_DATA = gtetrinet.png icondir = $(datadir)/pixmaps diff --git a/configure.in b/configure.in index 19e2aee..8e1c112 100644 --- a/configure.in +++ b/configure.in @@ -81,4 +81,5 @@ src/images/Makefile themes/Makefile themes/default/Makefile themes/small/Makefile +icons/Makefile ]) diff --git a/icons/Makefile.am b/icons/Makefile.am new file mode 100644 index 0000000..e0b6d3b --- /dev/null +++ b/icons/Makefile.am @@ -0,0 +1,5 @@ +EXTRA_DIST = alone.png team.png + +icon_DATA = alone.png team.png +icondir = $(datadir)/pixmaps/gtetrinet + diff --git a/icons/alone.png b/icons/alone.png new file mode 100644 index 0000000000000000000000000000000000000000..ada9545c8577726df9a5568f315b1580810cda18 GIT binary patch literal 4220 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 IM6N<$f c #E2E1DD", +", c #F0EFEC", +"' c #AAA7A0", +") c #F0EEEB", +"! c #B2B0AB", +"~ c #F9F9F8", +"{ c #C5C3BD", +"] c #0F0F0D", +"^ c #F2F0ED", +"/ c #EBEAE6", +"( c #8A857B", +"_ c #ECEBE8", +": c #EEECEA", +"< c #9F9C93", +"[ c #F3F2F0", +"} c #E8E7E4", +"| c #E3E1DD", +"1 c #78756B", +"2 c #BEBBB5", +"3 c #B3B1AA", +"4 c #7D786E", +"5 c #E1DFDB", +"6 c #D1D0CC", +"7 c #938E84", +"8 c #C8C5BF", +"9 c #A7A298", +"0 c #010101", +"a c #8C8981", +"b c #A6A29B", +"c c #726D63", +"d c #CECAC3", +"e c #A7A49E", +"f c #7E7A70", +"g c #A09D94", +"h c #817D73", +"i c #6C685E", +"j c #3C3933", +"k c #8B877E", +"l c #706C62", +"m c #B1ADA4", +"n c #97938A", +"o c #625E54", +"p c #6A655B", +"q c #37342D", +"r c #646056", +"s c #8B877D", +" ", +" ", +" ", +" ", +" ", +" ", +" .. .. ", +" ..+@.#@.. ", +" $%&*@.*@=-; ", +" .>,'*@.)@!~{] ", +"......@>,'*@.)@!~{@.....", +"*******^/(_@.:@<[}|*****", +"@@@@@1123451.6@789@@@@@@", +".....01abcd1.e@fghi.....", +" ]abcd1.e@fgh] ", +" ]jklmi.n@opq. ", +" ]]+r.s@.. ", +" ]] ]. ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/src/images/disconnect.xpm b/src/images/disconnect.xpm new file mode 100644 index 0000000..eecc094 --- /dev/null +++ b/src/images/disconnect.xpm @@ -0,0 +1,69 @@ +/* XPM */ +static char * disconnect_xpm[] = { +"24 24 42 1", +" c None", +". c #000000", +"+ c #989389", +"@ c #807D74", +"# c #C6C2BA", +"$ c #43423C", +"% c #B7B3AA", +"& c #C4C2BD", +"* c #EAE8E3", +"= c #E2E1DD", +"- c #F0EFEC", +"; c #AAA7A0", +"> c #C5D2C8", +", c #E9EEEA", +"' c #F0EEEB", +") c #F2F0ED", +"! c #EBEAE6", +"~ c #8A857B", +"{ c #ECEBE8", +"] c #EEECEA", +"^ c #78756B", +"/ c #BEBBB5", +"( c #B3B1AA", +"_ c #7D786E", +": c #E1DFDB", +"< c #D1D0CC", +"[ c #010101", +"} c #8C8981", +"| c #A6A29B", +"1 c #726D63", +"2 c #CECAC3", +"3 c #A7A49E", +"4 c #0F0F0D", +"5 c #F0F3F1", +"6 c #272622", +"7 c #8B877E", +"8 c #706C62", +"9 c #B1ADA4", +"0 c #6C685E", +"a c #97938A", +"b c #646056", +"c c #8B877D", +" ", +" ", +" ", +" ", +" ", +" ", +" .. ..", +" ..+@. .#@", +" $%&*@.... .*@", +" .=-;*@.>>,. .'@", +".....@=-;*@.... .'@", +"******)!~{@. .]@", +"@@@@^^/(_:^. .<@", +"....[^}|12^.... .3@", +" 4}|12^.>>5. .3@", +" 67890.... .a@", +" 44+b. .c@", +" 44 4.", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/src/images/pause.xpm b/src/images/pause.xpm new file mode 100644 index 0000000..26c746d --- /dev/null +++ b/src/images/pause.xpm @@ -0,0 +1,57 @@ +/* XPM */ +static char * pause_xpm[] = { +"24 24 30 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #737372", +"# c #848483", +"$ c #888887", +"% c #7E7E7D", +"& c #A8A7A6", +"* c #A4A4A3", +"= c #A6A5A4", +"- c #B5B4B3", +"; c #858483", +"> c #AAA9A7", +", c #C0BFBE", +"' c #91908E", +") c #AFAEAC", +"! c #CACAC8", +"~ c #A6A5A2", +"{ c #BBBAB7", +"] c #D4D3D2", +"^ c #AEADA9", +"/ c #BFBDBA", +"( c #D7D5D3", +"_ c #B2B0AD", +": c #C3C1BE", +"< c #D9D8D6", +"[ c #B5B3B0", +"} c #D1CFCC", +"| c #DEDDDB", +"1 c #F3F3F3", +" ", +" ", +" ", +" ", +" ", +" .....+.....+ ", +" .@#$.+.@#$.+ ", +" .%&*.+.%&*.+ ", +" .%=-.+.%=-.+ ", +" .;>,.+.;>,.+ ", +" .')!.+.')!.+ ", +" .')!.+.')!.+ ", +" .')!.+.')!.+ ", +" .~{].+.~{].+ ", +" .~{].+.~{].+ ", +" .^/(.+.^/(.+ ", +" ._:<.+._:<.+ ", +" .[}|.+.[}|.+ ", +" .....+.....+ ", +" +++++1++++++ ", +" ", +" ", +" ", +" "}; diff --git a/src/images/play.xpm b/src/images/play.xpm new file mode 100644 index 0000000..9daad31 --- /dev/null +++ b/src/images/play.xpm @@ -0,0 +1,64 @@ +/* XPM */ +static char * play_xpm[] = { +"24 24 37 1", +" c None", +". c #000000", +"+ c #727170", +"@ c #7B7B7A", +"# c #6C6B6A", +"$ c #7F7E7D", +"% c #999996", +"& c #7D7C7B", +"* c #828180", +"= c #9D9C9A", +"- c #B0AFAC", +"; c #908F8D", +"> c #868583", +", c #A1A09E", +"' c #B4B3B1", +") c #B6B4B2", +"! c #A5A4A1", +"~ c #898886", +"{ c #B9B7B4", +"] c #BAB9B6", +"^ c #BCBAB7", +"/ c #C3C2BF", +"( c #FFFFFF", +"_ c #8C8B89", +": c #A9A8A5", +"< c #BDBCB9", +"[ c #C5C3C0", +"} c #D0CECC", +"| c #8F8E8C", +"1 c #B5B3B1", +"2 c #C7C6C3", +"3 c #D2D1CE", +"4 c #B9B6B4", +"5 c #D8D7D5", +"6 c #A19F9D", +"7 c #C7C6C4", +"8 c #A7A6A3", +" ", +" ", +" ", +" ", +" . ", +" .. ", +" .+. ", +" .@#. ", +" .$%&. ", +" .*=-;. ", +" .>,')!. ", +" .~!{]^/.( ", +" ._:<[}.( ", +" .|123.( ", +" .=45.( ", +" .67.( ", +" .8.( ", +" ..( ", +" .( ", +" ( ", +" ", +" ", +" ", +" "}; diff --git a/src/images/stop.xpm b/src/images/stop.xpm new file mode 100644 index 0000000..d4e078b --- /dev/null +++ b/src/images/stop.xpm @@ -0,0 +1,56 @@ +/* XPM */ +static char * stop_xpm[] = { +"24 24 29 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #737372", +"# c #848483", +"$ c #888887", +"% c #7E7E7D", +"& c #A8A7A6", +"* c #A4A4A3", +"= c #A6A5A4", +"- c #B5B4B3", +"; c #858483", +"> c #AAA9A7", +", c #C0BFBE", +"' c #91908E", +") c #AFAEAC", +"! c #CACAC8", +"~ c #A6A5A2", +"{ c #BBBAB7", +"] c #D4D3D2", +"^ c #AEADA9", +"/ c #BFBDBA", +"( c #D7D5D3", +"_ c #B2B0AD", +": c #C3C1BE", +"< c #D9D8D6", +"[ c #B5B3B0", +"} c #D1CFCC", +"| c #DEDDDB", +" ", +" ", +" ", +" ", +" ", +" .............+ ", +" .@#$$$$$$$$$.+ ", +" .%&*********.+ ", +" .%=---------.+ ", +" .;>,,,,,,,,,.+ ", +" .')!!!!!!!!!.+ ", +" .')!!!!!!!!!.+ ", +" .~{]]]]]]]]].+ ", +" .~{]]]]]]]]].+ ", +" .^/(((((((((.+ ", +" ._:<<<<<<<<<.+ ", +" .[}|||||||||.+ ", +" .............+ ", +" ++++++++++++++ ", +" ", +" ", +" ", +" ", +" "}; diff --git a/src/images/team24.xpm b/src/images/team24.xpm new file mode 100644 index 0000000..be05bbd --- /dev/null +++ b/src/images/team24.xpm @@ -0,0 +1,301 @@ +/* XPM */ +static char * team24_xpm[] = { +"24 24 274 2", +" c None", +". c #60605D", +"+ c #CECCC7", +"@ c #F8F5EB", +"# c #F5F2E6", +"$ c #CFCBBC", +"% c #767264", +"& c #424240", +"* c #ECEBE8", +"= c #FEFDFA", +"- c #FCFAF1", +"; c #FCF7E8", +"> c #FAF4DE", +", c #EAE2C7", +"' c #736E5E", +") c #94928B", +"! c #EEE6CD", +"~ c #F7F3E2", +"{ c #FAF6E9", +"] c #FAF5E7", +"^ c #EFE8D0", +"/ c #E7D8B0", +"( c #B9B196", +"_ c #000000", +": c #BBB8AD", +"< c #C8A25E", +"[ c #C48B31", +"} c #B88431", +"| c #B68432", +"1 c #BF862E", +"2 c #CC9A48", +"3 c #EBE0BA", +"4 c #646051", +"5 c #2C2C28", +"6 c #C6984D", +"7 c #E2A038", +"8 c #E4A23C", +"9 c #DD9A34", +"0 c #C2892F", +"a c #E6D2A0", +"b c #888371", +"c c #704E19", +"d c #DE9932", +"e c #DE9A32", +"f c #D9952F", +"g c #BB8229", +"h c #D5BD89", +"i c #948D72", +"j c #070401", +"k c #402609", +"l c #281806", +"m c #1A0F04", +"n c #3C2308", +"o c #2D1A06", +"p c #281B07", +"q c #DA942C", +"r c #DB962D", +"s c #D59029", +"t c #A57124", +"u c #CFBB8C", +"v c #89826C", +"w c #482B0A", +"x c #D47D1F", +"y c #D88222", +"z c #D98423", +"A c #D68020", +"B c #D07A1C", +"C c #8F5212", +"D c #100902", +"E c #D89028", +"F c #D89128", +"G c #CB8824", +"H c #7C5316", +"I c #CFC4A1", +"J c #736D55", +"K c #945612", +"L c #D27B1D", +"M c #D47E20", +"N c #D17B1D", +"O c #CC761A", +"P c #A86014", +"Q c #392006", +"R c #805715", +"S c #CC8521", +"T c #CC8621", +"U c #9F6718", +"V c #232A0C", +"W c #D4CCA2", +"X c #504B3C", +"Y c #A75E13", +"Z c #CC741A", +"` c #CC751A", +" . c #CA7318", +".. c #B46514", +"+. c #402506", +"@. c #1E561E", +"#. c #453C0F", +"$. c #54360C", +"%. c #233B12", +"&. c #1D591D", +"*. c #A5A07C", +"=. c #344428", +"-. c #133116", +";. c #90500F", +">. c #C77016", +",. c #9C5812", +"'. c #864C10", +"). c #864B0F", +"!. c #B66613", +"~. c #AB5E10", +"{. c #37320C", +"]. c #297929", +"^. c #277327", +"/. c #246A24", +"(. c #226422", +"_. c #344624", +":. c #226922", +"<. c #267526", +"[. c #1F5225", +"}. c #4C2A07", +"|. c #C36A13", +"1. c #462607", +"2. c #AE6011", +"3. c #76400C", +"4. c #7F450C", +"5. c #85480C", +"6. c #1E5A1E", +"7. c #329432", +"8. c #319031", +"9. c #2E882E", +"0. c #2D842D", +"a. c #2A812A", +"b. c #297D29", +"c. c #287D28", +"d. c #297E29", +"e. c #287E28", +"f. c #133318", +"g. c #080A0D", +"h. c #2E3944", +"i. c #74400D", +"j. c #402205", +"k. c #3F2105", +"l. c #613408", +"m. c #2D231A", +"n. c #1C3327", +"o. c #205F20", +"p. c #359E35", +"q. c #349B34", +"r. c #339933", +"s. c #319431", +"t. c #2E8D2E", +"u. c #2B862B", +"v. c #298229", +"w. c #277C27", +"x. c #256E28", +"y. c #414951", +"z. c #839AB1", +"A. c #748DA7", +"B. c #576A7D", +"C. c #2F2B27", +"D. c #201104", +"E. c #1D140B", +"F. c #393C40", +"G. c #506376", +"H. c #5A7189", +"I. c #3D4F62", +"J. c #152D1C", +"K. c #2C822C", +"L. c #308F30", +"M. c #2E8C2E", +"N. c #2C872C", +"O. c #287B28", +"P. c #257725", +"Q. c #246C29", +"R. c #5C6874", +"S. c #7992AD", +"T. c #738FAB", +"U. c #7692AD", +"V. c #657F99", +"W. c #BAC3CD", +"X. c #D0D0D0", +"Y. c #CCCCCD", +"Z. c #899DB1", +"`. c #5F7891", +" + c #627E99", +".+ c #5F7B98", +"++ c #516B85", +"@+ c #14261C", +"#+ c #2A802A", +"$+ c #2B842B", +"%+ c #267726", +"&+ c #246A2A", +"*+ c #0A210C", +"=+ c #4B525A", +"-+ c #708AA4", +";+ c #6A86A2", +">+ c #6D89A4", +",+ c #6F8AA6", +"'+ c #708CA7", +")+ c #8293A5", +"!+ c #FCFDFD", +"~+ c #E6EAEE", +"{+ c #6884A0", +"]+ c #64809C", +"^+ c #607C98", +"/+ c #5A7793", +"(+ c #55728E", +"_+ c #415871", +":+ c #0D280D", +"<+ c #174218", +"[+ c #183F1E", +"}+ c #122A1A", +"|+ c #60758B", +"1+ c #66829E", +"2+ c #546E86", +"3+ c #E8EBEE", +"4+ c #AFBECC", +"5+ c #627E9A", +"6+ c #8097AD", +"7+ c #D3DBE2", +"8+ c #6D869E", +"9+ c #506D8A", +"0+ c #4B6884", +"a+ c #19242F", +"b+ c #55718E", +"c+ c #5A7692", +"d+ c #5D7995", +"e+ c #617D99", +"f+ c #617D9A", +"g+ c #57718B", +"h+ c #BEC6CD", +"i+ c #869BB0", +"j+ c #5B7894", +"k+ c #8DA0B4", +"l+ c #8498AC", +"m+ c #637C96", +"n+ c #4B6885", +"o+ c #466380", +"p+ c #202E3C", +"q+ c #435B73", +"r+ c #53708C", +"s+ c #56728F", +"t+ c #587491", +"u+ c #597692", +"v+ c #597591", +"w+ c #909FAE", +"x+ c #5F7A95", +"y+ c #526E8B", +"z+ c #4E6A88", +"A+ c #4A6684", +"B+ c #466280", +"C+ c #415E7B", +"D+ c #16212C", +"E+ c #131B22", +"F+ c #3E566E", +"G+ c #4E6A86", +"H+ c #516E8A", +"I+ c #526F8C", +"J+ c #536F8C", +"K+ c #6A7F92", +"L+ c #4E6B87", +"M+ c #486482", +"N+ c #44607E", +"O+ c #3B5672", +"P+ c #253749", +"Q+ c #121921", +"R+ c #212D3A", +"S+ c #263442", +"T+ c #263543", +"U+ c #3A4653", +"V+ c #253342", +"W+ c #243241", +"X+ c #18222D", +"Y+ c #06080B", +" ", +" . + @ # $ % ", +" & * = - ; > , ' ", +" ) ! ~ { ] ^ / ( ", +" _ _ _ _ : < [ } | 1 2 3 4 ", +" _ _ _ _ _ 5 6 7 8 8 9 0 a b ", +" _ _ _ _ _ _ _ c d e e f g h i ", +" j k l _ m n o p q r r s t u v ", +" w x y z A B C D E F F G H I J ", +" K L x M N O P Q R S T U V W X ", +" Y Z ` O ` ...+.@.#.$.%.&.*.=.-. ", +" ;.>.,.'.).!.~.{.].].^./.(._.:.<.[. ", +" }.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f. ", +" g.h.i.j.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x. ", +" y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.a.O.P.Q. ", +" R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+#+O.%+&+*+ ", +" =+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+_ ", +" |+^+]+1+{+{+2+3+4+5+6+7+8+9+0+a+ ", +"_ b+c+d+.+e+f+g+h+i+j+k+l+m+n+o+p+ ", +" q+r+s+t+u+c+v+w+x+b+y+z+A+B+C+D+ ", +" E+F+G+H+I+J+J+K+9+L+n+M+N+O+P+_ ", +" _ Q+R+S+T+U+V+W+p+X+Y+_ ", +" ", +" "}; diff --git a/src/partyline.c b/src/partyline.c index 61a02c0..905206e 100644 --- a/src/partyline.c +++ b/src/partyline.c @@ -556,7 +556,7 @@ gboolean partyline_update_channel_list (void) gchar cad[1024]; /* if there is another update in progress, just go away silently */ - if (list_enabled && (list_issued == 0)) + if (connected && list_enabled && (list_issued == 0)) { list_issued++; gtk_list_store_clear (work_model); @@ -626,7 +626,10 @@ void partyline_show_channel_list (gboolean show) */ list_enabled = show; if (list_enabled) + { gtk_widget_show (channel_list); + partyline_update_channel_list (); + } else gtk_widget_hide (channel_list); } diff --git a/src/winlist.c b/src/winlist.c index 1a8b9c9..63430e3 100644 --- a/src/winlist.c +++ b/src/winlist.c @@ -32,18 +32,30 @@ #include "misc.h" static GtkWidget *winlist; +static GdkPixbuf *team_icon, *alone_icon; GtkWidget *winlist_page_new (void) { GtkWidget *align; GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); - GtkListStore *winlist_store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + GtkCellRenderer *pixbuf_renderer = gtk_cell_renderer_pixbuf_new (); + GtkListStore *winlist_store = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); + GdkPixbuf *pixbuf; + + /* Load the icons and scale them */ + pixbuf = gdk_pixbuf_new_from_file (PIXMAPSDIR "/team.png", NULL); + team_icon = gdk_pixbuf_scale_simple (pixbuf, 24, 24, GDK_INTERP_BILINEAR); + gdk_pixbuf_unref (pixbuf); + + pixbuf = gdk_pixbuf_new_from_file (PIXMAPSDIR "/alone.png", NULL); + alone_icon = gdk_pixbuf_scale_simple (pixbuf, 24, 24, GDK_INTERP_BILINEAR); + gdk_pixbuf_unref (pixbuf); winlist = gtk_tree_view_new_with_model (GTK_TREE_MODEL (winlist_store)); /* "T" stands for "Team" here */ - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (winlist), -1, _("T"), renderer, - "text", 0, NULL); + gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (winlist), -1, _("T"), pixbuf_renderer, + "pixbuf", 0, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (winlist), -1, _("Name"), renderer, "text", 1, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (winlist), -1, _("Score"), renderer, @@ -70,21 +82,22 @@ void winlist_additem (int team, char *name, int score) { GtkListStore *winlist_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (winlist))); GtkTreeIter iter; - char buf[16], *item[3]; + char buf[16], *item[2]; gchar *name_utf8; + GdkPixbuf *pixbuf; - if (team) item[0] = "T"; - else item[0] = ""; - item[1] = nocolor (name); - name_utf8 = g_locale_to_utf8 (item[1], -1, NULL, NULL, NULL); + if (team) pixbuf = team_icon; + else pixbuf = alone_icon; + item[0] = nocolor (name); + name_utf8 = g_locale_to_utf8 (item[0], -1, NULL, NULL, NULL); g_snprintf (buf, sizeof(buf), "%d", score); - item[2] = buf; + item[1] = buf; gtk_list_store_append (winlist_model, &iter); gtk_list_store_set (winlist_model, &iter, - 0, item[0], + 0, pixbuf, 1, name_utf8, - 2, item[2], + 2, item[1], -1); g_free (name_utf8); } -- 2.50.1