+2003-04-14 Dani Carbonell <bocata@panete.net>
+
+ * 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 <jordi@sindominio.net>
+
+ * src/dialogs.c (connectdialog_new):
+ (prefdialog_new): added mnemonics to the labels
+
2003-04-14 Jordi Mallach <jordi@sindominio.net>
* NEWS: Updated.
-SUBDIRS= doc po src themes
+SUBDIRS= doc po src themes icons
icon_DATA = gtetrinet.png
icondir = $(datadir)/pixmaps
themes/Makefile
themes/default/Makefile
themes/small/Makefile
+icons/Makefile
])
--- /dev/null
+EXTRA_DIST = alone.png team.png
+
+icon_DATA = alone.png team.png
+icondir = $(datadir)/pixmaps/gtetrinet
+
localedir = $(datadir)/locale
-INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DPIXMAPSDIR=\""$(datadir)/pixmaps"\" -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED $(GTET_CFLAGS)
+INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DPIXMAPSDIR=\""$(datadir)/pixmaps/gtetrinet"\" -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED $(GTET_CFLAGS)
LDADD = $(GTET_LIBS)
AM_CPPFLAGS = -DGTETRINET_DATA=\"$(pkgdatadir)\"
#include "commands.h"
#include "dialogs.h"
+#include "images/play.xpm"
+#include "images/pause.xpm"
+#include "images/stop.xpm"
+#include "images/team24.xpm"
+#include "images/connect.xpm"
+#include "images/disconnect.xpm"
+
GnomeUIInfo gamemenu[] = {
GNOMEUIINFO_ITEM(N_("_Connect to server..."), NULL, connect_command, NULL),
GNOMEUIINFO_ITEM(N_("_Disconnect from server"), NULL, disconnect_command, NULL),
};
GnomeUIInfo toolbar[] = {
- GNOMEUIINFO_ITEM_STOCK(N_("Connect"), N_("Connect to a server"), connect_command, "gtk-execute"),
- GNOMEUIINFO_ITEM_STOCK(N_("Disconnect"), N_("Disconnect from the current server"), disconnect_command, "gtk-quit"),
+ GNOMEUIINFO_ITEM_DATA(N_("Connect"), N_("Connect to a server"), connect_command, NULL, connect_xpm),
+ GNOMEUIINFO_ITEM_DATA(N_("Disconnect"), N_("Disconnect from the current server"), disconnect_command, NULL, disconnect_xpm),
GNOMEUIINFO_SEPARATOR,
- GNOMEUIINFO_ITEM_STOCK(N_("Start game"), N_("Start a new game"), start_command, "gtk-go-forward"),
- GNOMEUIINFO_ITEM_STOCK(N_("Pause game"), N_("Pause the game"), pause_command, "gtk-dialog-warning"),
- GNOMEUIINFO_ITEM_STOCK(N_("End game"), N_("End the current game"), end_command, "gtk-stop"),
+ GNOMEUIINFO_ITEM_DATA(N_("Start game"), N_("Start a new game"), start_command, NULL, play_xpm),
+ GNOMEUIINFO_ITEM_DATA(N_("Pause game"), N_("Pause the game"), pause_command, NULL, pause_xpm),
+ GNOMEUIINFO_ITEM_DATA(N_("End game"), N_("End the current game"), end_command, NULL, stop_xpm),
GNOMEUIINFO_SEPARATOR,
- GNOMEUIINFO_ITEM_STOCK(N_("Change team"), N_("Change your current team name"), team_command, "gtk-jump-to"),
+ GNOMEUIINFO_ITEM_DATA(N_("Change team"), N_("Change your current team name"), team_command, NULL, team24_xpm),
#ifdef ENABLE_DETACH
GNOMEUIINFO_SEPARATOR,
GNOMEUIINFO_ITEM_STOCK(N_("Detach page"), N_("Detach the current notebook page"), detach_command, "gtk-cut"),
void make_menus (GnomeApp *app)
{
- gnome_app_create_menus (app, menubar);
- gnome_app_create_toolbar (app, toolbar);
+ gnome_app_create_menus (app, menubar);
+
+ gnome_app_create_toolbar (app, toolbar);
}
/* callbacks */
0, 1, 0, 1, GTK_FILL | GTK_EXPAND,
GTK_FILL | GTK_EXPAND, 0, 0);
/* game type radio buttons */
- originalradio = gtk_radio_button_new_with_label (NULL, _("Original"));
+ originalradio = gtk_radio_button_new_with_mnemonic (NULL, _("O_riginal"));
gametypegroup = gtk_radio_button_get_group (GTK_RADIO_BUTTON(originalradio));
- tetrifastradio = gtk_radio_button_new_with_label (gametypegroup, _("TetriFast"));
+ tetrifastradio = gtk_radio_button_new_with_mnemonic (gametypegroup, _("Tetri_Fast"));
switch (gamemode) {
case ORIGINAL:
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(originalradio), TRUE);
/* spectator checkbox + password */
table2 = gtk_table_new (1, 1, FALSE);
- spectatorcheck = gtk_check_button_new_with_label (_("Connect as a spectator"));
+ spectatorcheck = gtk_check_button_new_with_mnemonic (_("Connect as a _spectator"));
gtk_widget_show (spectatorcheck);
gtk_table_attach (GTK_TABLE(table2), spectatorcheck, 0, 2, 0, 1,
GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0);
- passwordlabel = gtk_label_new (_("Password:"));
+ passwordlabel = gtk_label_new_with_mnemonic (_("_Password:"));
gtk_widget_show (passwordlabel);
gtk_table_attach (GTK_TABLE(table2), passwordlabel, 0, 1, 1, 2,
GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0);
passwordentry = gtk_entry_new ();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (passwordlabel), passwordentry);
gtk_entry_set_visibility (GTK_ENTRY(passwordentry), FALSE);
gtk_widget_show (passwordentry);
gtk_table_attach (GTK_TABLE(table2), passwordentry, 1, 2, 1, 2,
/* nickname and teamname entries */
table2 = gtk_table_new (1, 1, FALSE);
- widget = gtk_label_new (_("Nick name:"));
+ widget = gtk_label_new_with_mnemonic (_("_Nick name:"));
gtk_widget_show (widget);
gtk_table_attach (GTK_TABLE(table2), widget, 0, 1, 0, 1,
GTK_FILL | GTK_EXPAND, 0, 0, 0);
nicknameentry = gnome_entry_new ("Nickname");
+ gtk_label_set_mnemonic_widget (GTK_LABEL (widget), nicknameentry);
aux = g_locale_to_utf8 (nick, -1, NULL, NULL, NULL);
gtk_entry_set_text (GTK_ENTRY(gnome_entry_gtk_entry(GNOME_ENTRY(nicknameentry))),
aux);
gtk_widget_show (nicknameentry);
gtk_table_attach (GTK_TABLE(table2), nicknameentry, 1, 2, 0, 1,
GTK_FILL | GTK_EXPAND, 0, 0, 0);
- teamnamelabel = gtk_label_new (_("Team name:"));
+ teamnamelabel = gtk_label_new_with_mnemonic (_("_Team name:"));
gtk_widget_show (teamnamelabel);
gtk_table_attach (GTK_TABLE(table2), teamnamelabel, 0, 1, 1, 2,
GTK_FILL | GTK_EXPAND, 0, 0, 0);
teamnameentry = gnome_entry_new ("Teamname");
+ gtk_label_set_mnemonic_widget (GTK_LABEL (teamnamelabel), teamnameentry);
aux = g_locale_to_utf8 (team, -1, NULL, NULL, NULL);
gtk_entry_set_text (GTK_ENTRY(gnome_entry_gtk_entry(GNOME_ENTRY(teamnameentry))),
aux);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), table, label);
/* partyline */
- timestampcheck = gtk_check_button_new_with_label (_("Enable Timestamps"));
+ timestampcheck = gtk_check_button_new_with_mnemonic (_("Enable _Timestamps"));
gtk_widget_show(timestampcheck);
- channel_list_check = gtk_check_button_new_with_label (_("Enable Channel List"));
+ channel_list_check = gtk_check_button_new_with_mnemonic (_("Enable Channel _List"));
gtk_widget_show (channel_list_check);
frame = gtk_vbox_new (FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL(label), TRUE);
gtk_widget_show (label);
- button = gtk_button_new_with_label (_("Change key..."));
+ button = gtk_button_new_with_mnemonic (_("Change _key..."));
g_signal_connect (G_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC (prefdialog_changekey), NULL);
gtk_widget_show (button);
- button1 = gtk_button_new_with_label (_("Restore defaults"));
+ button1 = gtk_button_new_with_mnemonic (_("_Restore defaults"));
g_signal_connect (G_OBJECT(button1), "clicked",
GTK_SIGNAL_FUNC (prefdialog_restorekeys), NULL);
gtk_widget_show (button1);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), table, label);
/* sound */
- soundcheck = gtk_check_button_new_with_label (_("Enable Sound"));
+ soundcheck = gtk_check_button_new_with_mnemonic (_("Enable _Sound"));
gtk_widget_show (soundcheck);
- midicheck = gtk_check_button_new_with_label (_("Enable MIDI"));
+ midicheck = gtk_check_button_new_with_mnemonic (_("Enable _MIDI"));
gtk_widget_show (midicheck);
frame = gtk_hbox_new (FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL(label), TRUE);
gtk_widget_show (label);
- button = gtk_button_new_with_label (_("Restore defaults"));
+ button = gtk_button_new_with_mnemonic (_("_Restore defaults"));
g_signal_connect (G_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC (prefdialog_restoremidi), NULL);
gtk_widget_show (button);
-EXTRA_DIST = fields.xpm partyline.xpm winlist.xpm
+EXTRA_DIST = fields.xpm partyline.xpm winlist.xpm connect.xpm disconnect.xpm pause.xpm play.xpm stop.xpm team24.xpm
--- /dev/null
+/* XPM */
+static char * connect_xpm[] = {
+"24 24 58 1",
+" c None",
+". c #000000",
+"+ c #989389",
+"@ c #807D74",
+"# c #C6C2BA",
+"$ c #34332D",
+"% c #B7B3AA",
+"& c #C4C2BD",
+"* c #EAE8E3",
+"= c #9C978D",
+"- c #BCB9B2",
+"; c #363433",
+"> 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@.. ",
+" ]] ]. ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
--- /dev/null
+/* 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.",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
--- /dev/null
+/* 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++++++ ",
+" ",
+" ",
+" ",
+" "};
--- /dev/null
+/* 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.( ",
+" ..( ",
+" .( ",
+" ( ",
+" ",
+" ",
+" ",
+" "};
--- /dev/null
+/* 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",
+" ",
+" ",
+" ",
+" ",
+" ",
+" .............+ ",
+" .@#$$$$$$$$$.+ ",
+" .%&*********.+ ",
+" .%=---------.+ ",
+" .;>,,,,,,,,,.+ ",
+" .')!!!!!!!!!.+ ",
+" .')!!!!!!!!!.+ ",
+" .~{]]]]]]]]].+ ",
+" .~{]]]]]]]]].+ ",
+" .^/(((((((((.+ ",
+" ._:<<<<<<<<<.+ ",
+" .[}|||||||||.+ ",
+" .............+ ",
+" ++++++++++++++ ",
+" ",
+" ",
+" ",
+" ",
+" "};
--- /dev/null
+/* 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+_ ",
+" ",
+" "};
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);
*/
list_enabled = show;
if (list_enabled)
+ {
gtk_widget_show (channel_list);
+ partyline_update_channel_list ();
+ }
else
gtk_widget_hide (channel_list);
}
#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,
{
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);
}
projects / gtetrinet / commitdiff
