+2003-02-02 Dani Carbonell <bocata@panete.net>
+
+ * Makefile.am: added -DGTK_DISABLE_DEPRECATED to the compilation
+ options.
+
+ * TODO: updated (we shouldn't be using this)
+
+ * dialogs.c: removed obsolete functions, minor bugfixes.
+ (connectdialog_new): made unresizable.
+ (keydialog_new): fixed a bug when hitting the Cancel button.
+ (prefdialog_new): added scrollbars for the theme list and the keys
+ list.
+
+ * fields.c: removed obsolete functions, minor bugfixes.
+ (fields_page_contents): first approach to allow fields resizing.
+ Nothing yet. Cleaned up a bit.
+
+ * gtetrinet.c: removed obsolete functions, minor bugfixes.
+
+ * partyline.c: likewise.
+
+ * winlist.c: likewise.
+
+ * misc.c (pixmap_label): nuked, no longer needed.
+
2003-02-02 Jordi Mallach <jordi@sindominio.net>
* src/winlist.c: add a requested translation tip.
util_DATA = $(util_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
+INCLUDES = -DGTK_DISABLE_DEPRECATED
+
EXTRA_DIST = ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README \
TODO config.guess config.sub config.rpath install-sh \
intltool-extract.in intltool-merge.in intltool-update.in \
- Get server list from http://www.tetrinet.org/ip/
- GNOME2 port issues:
+ keybindings
- + port deprecated widgets (-DGTK_DISABLE_DEPRECATED)
+ detaching and reattaching the Menu Bar causes two Bonobo-CRITICAL
+ if you use the C locale and input an 8bit character, gtetrinet segfaults
- Make gtetrinet resizeable (at least the fields messages bit)
- Hide mouse cursor when game is in progress
-- Don't lose partyline textentry focus so easily
- Write a User Manual
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (connectdialog), GTK_RESPONSE_OK);
+ gtk_window_set_resizable (GTK_WINDOW (connectdialog), FALSE);
g_signal_connect (G_OBJECT(connectdialog), "response",
GTK_SIGNAL_FUNC(connectdialog_button), NULL);
GTK_FILL | GTK_EXPAND, 0, 0);
/* game type radio buttons */
originalradio = gtk_radio_button_new_with_label (NULL, _("Original"));
- gametypegroup = gtk_radio_button_group (GTK_RADIO_BUTTON(originalradio));
+ gametypegroup = gtk_radio_button_get_group (GTK_RADIO_BUTTON(originalradio));
tetrifastradio = gtk_radio_button_new_with_label (gametypegroup, _("TetriFast"));
switch (gamemode) {
case ORIGINAL:
gtk_box_pack_start (GTK_BOX (GTK_DIALOG(connectdialog)->vbox),
table1, TRUE, TRUE, 0);
- gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(spectatorcheck), spectating);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(spectatorcheck), spectating);
connectdialog_spectoggle (spectatorcheck);
g_signal_connect (G_OBJECT(connectdialog), "destroy",
GTK_SIGNAL_FUNC(connectdialog_destroy), NULL);
GtkWidget *dialog, *label;
gint keydialog_key;
- dialog = gtk_dialog_new_with_buttons (_("Change Key"), NULL,
+ dialog = gtk_dialog_new_with_buttons (_("Change Key"), GTK_WINDOW (prefdialog),
GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CANCEL, GTK_RESPONSE_CLOSE,
NULL);
keydialog_key = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_hide (dialog);
gtk_widget_destroy (dialog);
- return keydialog_key;
+ if (keydialog_key != GTK_RESPONSE_CLOSE )
+ return keydialog_key;
+ else
+ return 0;
}
/**************************/
void prefdialog_new (void)
{
GtkWidget *label, *table, *frame, *button, *button1, *widget, *table1, *divider, *notebook;
+ GtkWidget *themelist_scroll, *key_scroll;
GtkListStore *theme_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
GtkListStore *keys_store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING);
GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (prefdialog), GTK_RESPONSE_CLOSE);
notebook = gtk_notebook_new ();
+ gtk_window_set_resizable (GTK_WINDOW (prefdialog), FALSE);
/* themes */
themelist = gtk_tree_view_new_with_model (GTK_TREE_MODEL (theme_store));
+ themelist_scroll = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (themelist_scroll),
+ GTK_POLICY_NEVER,
+ GTK_POLICY_AUTOMATIC);
+ gtk_container_add (GTK_CONTAINER(themelist_scroll), themelist);
theme_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (themelist));
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (themelist), FALSE);
- gtk_widget_set_usize (themelist, 160, 0);
+ gtk_widget_set_size_request (themelist, 160, 200);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (themelist), -1, "theme", renderer,
"text", 0, NULL);
- gtk_widget_show (themelist);
label = leftlabel_new (_("Select a theme from the list.\n"
"Install new themes in ~/.gtetrinet/themes/"));
frame = gtk_frame_new (_("Selected Theme"));
gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
gtk_container_set_border_width (GTK_CONTAINER(frame), GNOME_PAD_SMALL);
- gtk_widget_set_usize (frame, 240, 100);
+ gtk_widget_set_size_request (frame, 240, 100);
gtk_widget_show (frame);
gtk_container_add (GTK_CONTAINER(frame), table1);
gtk_container_set_border_width (GTK_CONTAINER(table), GNOME_PAD);
gtk_table_set_row_spacings (GTK_TABLE(table), GNOME_PAD_SMALL);
gtk_table_set_col_spacings (GTK_TABLE(table), GNOME_PAD_SMALL);
- gtk_table_attach (GTK_TABLE(table), themelist, 0, 1, 0, 2,
+ gtk_table_attach (GTK_TABLE(table), themelist_scroll, 0, 1, 0, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE(table), label, 1, 2, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
/* keyboard */
keyclist = GTK_WIDGET (gtk_tree_view_new_with_model (GTK_TREE_MODEL(keys_store)));
+ key_scroll = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (key_scroll),
+ GTK_POLICY_NEVER,
+ GTK_POLICY_AUTOMATIC);
+ gtk_container_add (GTK_CONTAINER(key_scroll), keyclist);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (keyclist), -1, _("Action"), renderer,
"text", 0, NULL);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (keyclist), -1, _("Key"), renderer,
"text", 1, NULL);
- gtk_widget_set_usize (keyclist, 180, 0);
- gtk_widget_show (keyclist);
+ gtk_widget_set_size_request (key_scroll, 180, 200);
+ gtk_widget_show (key_scroll);
label = gtk_label_new (_("Select an action from the list and press Change "
"Key to change the key associated with the action."));
gtk_container_set_border_width (GTK_CONTAINER(table), GNOME_PAD);
gtk_table_set_row_spacings (GTK_TABLE(table), GNOME_PAD_SMALL);
gtk_table_set_col_spacings (GTK_TABLE(table), GNOME_PAD_SMALL);
- gtk_table_attach (GTK_TABLE(table), keyclist, 0, 1, 0, 2,
+ gtk_table_attach (GTK_TABLE(table), key_scroll, 0, 1, 0, 2,
GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE(table), label, 1, 2, 0, 1,
GTK_FILL, 0, 0, 0);
prefdialog_drawkeys ();
- gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(soundcheck), soundenable);
- gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(midicheck), midienable);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(soundcheck), soundenable);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(midicheck), midienable);
#ifdef HAVE_ESD
if (midienable) prefdialog_midion ();
if (fieldspage == NULL) {
fieldspage = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
- gtk_container_border_width (GTK_CONTAINER(fieldspage), 2);
+ gtk_container_set_border_width (GTK_CONTAINER(fieldspage), 2);
}
gtk_container_add (GTK_CONTAINER(fieldspage), pagecontents);
GtkWidget *fields_page_contents (void)
{
- GtkWidget *table, *widget, *align, *border, *box, *table2, *hbox, *scroll;
+ GtkWidget *vbox, *table, *widget, *align, *border, *box, *table2, *hbox, *scroll;
table = gtk_table_new (4, 5, FALSE);
+ vbox = gtk_vbox_new (FALSE, 0);
gtk_table_set_row_spacings (GTK_TABLE(table), 2);
gtk_table_set_col_spacings (GTK_TABLE(table), 2);
gtk_box_pack_start (GTK_BOX(hbox), fieldlabels[i][3], TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX(hbox), fieldlabels[i][4], FALSE, FALSE, 2);
gtk_box_pack_start (GTK_BOX(hbox), fieldlabels[i][5], FALSE, FALSE, 0);
- gtk_widget_show (hbox);
fields_setlabel (i, NULL, NULL, 0);
widget = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER(widget), hbox);
- gtk_widget_set_usize (widget, blocksize * FIELDWIDTH, 0);
- gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX(box), widget, FALSE, FALSE, 0);
+ gtk_widget_set_size_request (widget, blocksize * FIELDWIDTH, -1);
+ gtk_box_pack_start (GTK_BOX(box), widget, TRUE, TRUE, 0);
/* the field */
fieldwidgets[i] = gtk_drawing_area_new ();
/* attach the signals */
GTK_SIGNAL_FUNC(fields_expose_event), (gpointer)i);
gtk_widget_set_events (fieldwidgets[i], GDK_EXPOSURE_MASK);
/* set the size */
- gtk_drawing_area_size (GTK_DRAWING_AREA(fieldwidgets[i]),
- blocksize * FIELDWIDTH,
- blocksize * FIELDHEIGHT);
- gtk_widget_show (fieldwidgets[i]);
- gtk_box_pack_start (GTK_BOX(box), fieldwidgets[i], FALSE, FALSE, 0);
- gtk_widget_show (box);
+ gtk_widget_set_size_request (fieldwidgets[i],
+ blocksize * FIELDWIDTH,
+ blocksize * FIELDHEIGHT);
+ gtk_box_pack_start (GTK_BOX(box), fieldwidgets[i], TRUE, TRUE, 0);
border = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME(border), GTK_SHADOW_IN);
gtk_container_add (GTK_CONTAINER(border), box);
- gtk_widget_show (border);
/* align it */
align = gtk_alignment_new (0.5, valign, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER(align), border);
- gtk_widget_show (align);
- gtk_table_attach_defaults (GTK_TABLE(table), align,
- p[i][0], p[i][1], p[i][2], p[i][3]);
+ gtk_table_attach (GTK_TABLE(table), align,
+ p[i][0], p[i][1], p[i][2], p[i][3],
+ GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
+ 0, 0);
}
}
/* next block thingy */
box = gtk_vbox_new (FALSE, 2);
widget = leftlabel_new (_("Next piece:"));
- gtk_widget_show (widget);
gtk_box_pack_start (GTK_BOX(box), widget, TRUE, TRUE, 0);
/* box that displays the next block */
border = gtk_frame_new (NULL);
g_signal_connect (G_OBJECT(nextpiecewidget), "expose_event",
GTK_SIGNAL_FUNC(fields_nextpiece_expose), NULL);
gtk_widget_set_events (nextpiecewidget, GDK_EXPOSURE_MASK);
- gtk_drawing_area_size (GTK_DRAWING_AREA(nextpiecewidget), BLOCKSIZE*9/2, BLOCKSIZE*9/2);
- gtk_widget_show (nextpiecewidget);
+ gtk_widget_set_size_request (nextpiecewidget, BLOCKSIZE*9/2, BLOCKSIZE*9/2);
gtk_container_add (GTK_CONTAINER(border), nextpiecewidget);
- gtk_widget_show (border);
align = gtk_alignment_new (0.5, 0.5, 0, 0);
gtk_container_add (GTK_CONTAINER(align), border);
- gtk_widget_show (align);
- gtk_box_pack_start (GTK_BOX(box), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(box), align, TRUE, TRUE, 0);
/* lines, levels and stuff */
table2 = gtk_table_new (4, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE(table2), 5);
widget = leftlabel_new (_("Lines:"));
- gtk_widget_show (widget);
gtk_table_attach_defaults (GTK_TABLE(table2), widget, 0, 1, 0, 1);
widget = gtk_label_new ("");
- gtk_widget_show (widget);
gtk_table_attach_defaults (GTK_TABLE(table2), widget, 0, 1, 1, 2);
widget = leftlabel_new (_("Level:"));
- gtk_widget_show (widget);
gtk_table_attach_defaults (GTK_TABLE(table2), widget, 0, 1, 2, 3);
activelabel = leftlabel_new (_("Active level:"));
- gtk_widget_show (activelabel);
gtk_table_attach_defaults (GTK_TABLE(table2), activelabel, 0, 1, 3, 4);
lineswidget = leftlabel_new ("");
- gtk_widget_show (lineswidget);
gtk_table_attach_defaults (GTK_TABLE(table2), lineswidget, 1, 2, 0, 1);
widget = gtk_label_new ("");
- gtk_widget_show (widget);
gtk_table_attach_defaults (GTK_TABLE(table2), widget, 1, 2, 1, 2);
levelwidget = leftlabel_new ("");
- gtk_widget_show (levelwidget);
gtk_table_attach_defaults (GTK_TABLE(table2), levelwidget, 1, 2, 2, 3);
activewidget = leftlabel_new ("");
- gtk_widget_show (activewidget);
gtk_table_attach_defaults (GTK_TABLE(table2), activewidget, 1, 2, 3, 4);
- gtk_widget_show (table2);
gtk_box_pack_start (GTK_BOX(box), table2, TRUE, TRUE, 0);
- gtk_widget_show (box);
/* align it */
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
- gtk_widget_set_usize (align, BLOCKSIZE*6, BLOCKSIZE*11);
+ gtk_widget_set_size_request (align, BLOCKSIZE*6, BLOCKSIZE*11);
gtk_container_add (GTK_CONTAINER(align), box);
- gtk_widget_show (align);
- gtk_table_attach_defaults (GTK_TABLE(table), align, 1, 2, 0, 1);
+ gtk_table_attach (GTK_TABLE(table), align, 1, 2, 0, 1,
+ GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
+ 0, 0);
/* the specials thingy */
box = gtk_hbox_new (FALSE, 0);
specialwidget = gtk_drawing_area_new ();
g_signal_connect (G_OBJECT(specialwidget), "expose_event",
GTK_SIGNAL_FUNC(fields_specials_expose), NULL);
- gtk_drawing_area_size (GTK_DRAWING_AREA(specialwidget), BLOCKSIZE*18, BLOCKSIZE);
+ gtk_widget_set_size_request (specialwidget, BLOCKSIZE*18, BLOCKSIZE);
gtk_widget_show (specialwidget);
gtk_container_add (GTK_CONTAINER(border), specialwidget);
- gtk_widget_show (border);
- gtk_box_pack_end (GTK_BOX(box), border, FALSE, FALSE, 0);
- gtk_widget_show (box);
- gtk_widget_set_usize (box, BLOCKSIZE*24, 0);
+ gtk_box_pack_end (GTK_BOX(box), border, TRUE, TRUE, 0);
+ gtk_widget_set_size_request (box, BLOCKSIZE*24, -1);
/* align it */
align = gtk_alignment_new (0.5, 1.0, 0.7, 0.0);
gtk_container_add (GTK_CONTAINER(align), box);
- gtk_widget_show (align);
- gtk_table_attach_defaults (GTK_TABLE (table), align, 0, 3, 2, 3);
+ gtk_table_attach (GTK_TABLE (table), align, 0, 3, 2, 3,
+ GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
+ 0, 0);
/* attacks and defenses */
box = gtk_vbox_new (FALSE, 0);
widget = gtk_label_new (_("Attacks and defenses:"));
- gtk_widget_show (widget);
gtk_box_pack_start (GTK_BOX(box), widget, TRUE, TRUE, 0);
attdefwidget = gtk_text_view_new_with_buffer(gtk_text_buffer_new(tag_table));
- gtk_widget_set_usize (attdefwidget, MAX(22*12, BLOCKSIZE*12), BLOCKSIZE*10);
+ gtk_widget_set_size_request (attdefwidget, MAX(22*12, BLOCKSIZE*12), BLOCKSIZE*10);
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(attdefwidget), GTK_WRAP_WORD);
GTK_WIDGET_UNSET_FLAGS (attdefwidget, GTK_CAN_FOCUS);
- gtk_widget_show (attdefwidget);
scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scroll),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER(scroll), attdefwidget);
- gtk_widget_show (scroll);
gtk_box_pack_start (GTK_BOX(box), scroll, TRUE, TRUE, 0);
- gtk_widget_show (box);
align = gtk_alignment_new (0.5, 0.5, 0.5, 0.0);
gtk_container_add (GTK_CONTAINER(align), box);
- gtk_widget_show (align);
- gtk_table_attach_defaults (GTK_TABLE(table), align, 1, 3, 1, 2);
+ gtk_table_attach (GTK_TABLE(table), align, 1, 3, 1, 2,
+ GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
+ 0, 0);
/* game messages */
table2 = gtk_table_new (1, 2, FALSE);
gmsgtext = gtk_text_view_new_with_buffer(gtk_text_buffer_new(tag_table));
- gtk_widget_set_usize (gmsgtext, 0, 48);
- gtk_widget_show (gmsgtext);
+ gtk_widget_set_size_request (gmsgtext, -1, 48);
GTK_WIDGET_UNSET_FLAGS (gmsgtext, GTK_CAN_FOCUS);
scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scroll),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER(scroll), gmsgtext);
- gtk_widget_show (scroll);
gtk_table_attach (GTK_TABLE(table2), scroll, 0, 1, 0, 1,
GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_SHRINK,
0, 0);
- gmsginput = gtk_entry_new_with_max_length (128);
- gtk_widget_show (gmsginput);
+ gmsginput = gtk_entry_new ();
+ gtk_entry_set_max_length (GTK_ENTRY (gmsginput), 128);
/* eat up key messages */
g_signal_connect (G_OBJECT(gmsginput), "activate",
GTK_SIGNAL_FUNC(gmsginput_activate), NULL);
gtk_table_attach (GTK_TABLE(table2), gmsginput, 0, 1, 1, 2,
GTK_FILL | GTK_EXPAND, 0, 0, 0);
- gtk_widget_show (table2);
- gtk_widget_set_usize (table2, 0, 48);
- gtk_table_attach_defaults (GTK_TABLE(table), table2, 0, 5, 3, 4);
+ gtk_widget_set_size_request (table2, -1, 48);
+ gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), table2, TRUE, TRUE, 0);
+/* gtk_table_attach (GTK_TABLE(table), table2, 0, 5, 3, 4,
+ GTK_FILL | GTK_EXPAND, 0, 0, 0);*/
- gtk_widget_show (table);
+ gtk_widget_show_all (vbox);
fields_setlines (-1);
fields_setlevel (-1);
fields_setactivelevel (-1);
fields_gmsginput (FALSE);
- return table;
+ return vbox;
}
gtk_widget_show (fieldlabels[field][3]);
gtk_widget_hide (fieldlabels[field][4]);
gtk_widget_hide (fieldlabels[field][5]);
- gtk_label_set (GTK_LABEL(fieldlabels[field][0]), "");
- gtk_label_set (GTK_LABEL(fieldlabels[field][2]), "");
- gtk_label_set (GTK_LABEL(fieldlabels[field][3]), _("Not playing"));
- gtk_label_set (GTK_LABEL(fieldlabels[field][5]), "");
+ gtk_label_set_text (GTK_LABEL(fieldlabels[field][0]), "");
+ gtk_label_set_text (GTK_LABEL(fieldlabels[field][2]), "");
+ gtk_label_set_text (GTK_LABEL(fieldlabels[field][3]), _("Not playing"));
+ gtk_label_set_text (GTK_LABEL(fieldlabels[field][5]), "");
}
else {
name_utf8 = g_locale_to_utf8 (nocolor (name), -1, NULL, NULL, NULL);
gtk_widget_show (fieldlabels[field][1]);
gtk_widget_show (fieldlabels[field][2]);
gtk_widget_hide (fieldlabels[field][3]);
- gtk_label_set (GTK_LABEL(fieldlabels[field][0]), buf);
- gtk_label_set (GTK_LABEL(fieldlabels[field][2]), name_utf8);
- gtk_label_set (GTK_LABEL(fieldlabels[field][3]), "");
+ gtk_label_set_text (GTK_LABEL(fieldlabels[field][0]), buf);
+ gtk_label_set_text (GTK_LABEL(fieldlabels[field][2]), name_utf8);
+ gtk_label_set_text (GTK_LABEL(fieldlabels[field][3]), "");
if (team == NULL || team[0] == 0) {
gtk_widget_hide (fieldlabels[field][4]);
gtk_widget_hide (fieldlabels[field][5]);
- gtk_label_set (GTK_LABEL(fieldlabels[field][5]), "");
+ gtk_label_set_text (GTK_LABEL(fieldlabels[field][5]), "");
}
else {
team_utf8 = g_locale_to_utf8 (nocolor (team), -1, NULL, NULL, NULL);
gtk_widget_show (fieldlabels[field][4]);
gtk_widget_show (fieldlabels[field][5]);
- gtk_label_set (GTK_LABEL(fieldlabels[field][5]), team_utf8);
+ gtk_label_set_text (GTK_LABEL(fieldlabels[field][5]), team_utf8);
g_free (team_utf8);
}
g_free (name_utf8);
void fields_setspeciallabel (char *label)
{
if (label == NULL) {
- gtk_label_set (GTK_LABEL(speciallabel), _("Specials:"));
+ gtk_label_set_text (GTK_LABEL(speciallabel), _("Specials:"));
}
else {
- gtk_label_set (GTK_LABEL(speciallabel), label);
+ gtk_label_set_text (GTK_LABEL(speciallabel), label);
}
}
void fields_gmsginputclear (void)
{
- gtk_entry_set_text (GTK_ENTRY(gmsginput), "");
- gtk_entry_set_position (GTK_ENTRY(gmsginput), 0);
+ gtk_entry_set_text (GTK_ENTRY (gmsginput), "");
+ gtk_editable_set_position (GTK_EDITABLE (gmsginput), 0);
}
void fields_gmsginputactivate (int t)
gint fields_eatkey (GtkWidget *widget)
{
- gtk_signal_emit_stop_by_name (GTK_OBJECT(widget), "key-press-event");
+ g_signal_stop_emission_by_name (G_OBJECT(widget), "key-press-event");
return TRUE;
}
gtk_container_set_border_width (GTK_CONTAINER(pfields), 0);
gtk_container_add (GTK_CONTAINER(pfields), fieldswidget);
gtk_widget_show (pfields);
- gtk_object_set_data( GTK_OBJECT(fieldswidget), "title", "Playing Fields"); // FIXME
+ g_object_set_data (G_OBJECT(fieldswidget), "title", "Playing Fields"); // FIXME
label = pixmapdata_label (fields_xpm, _("Playing Fields"));
gtk_widget_show (label);
gtk_notebook_append_page (GTK_NOTEBOOK(notebook), pfields, label);
gtk_container_set_border_width (GTK_CONTAINER(pparty), 0);
gtk_container_add (GTK_CONTAINER(pparty), partywidget);
gtk_widget_show (pparty);
- gtk_object_set_data( GTK_OBJECT(partywidget), "title", "Partyline"); // FIXME
+ g_object_set_data (G_OBJECT(partywidget), "title", "Partyline"); // FIXME
label = pixmapdata_label (partyline_xpm, _("Partyline"));
gtk_widget_show (label);
gtk_notebook_append_page (GTK_NOTEBOOK(notebook), pparty, label);
gtk_container_set_border_width (GTK_CONTAINER(pwinlist), 0);
gtk_container_add (GTK_CONTAINER(pwinlist), winlistwidget);
gtk_widget_show (pwinlist);
- gtk_object_set_data( GTK_OBJECT(winlistwidget), "title", "Winlist"); // FIXME
+ g_object_set_data (G_OBJECT(winlistwidget), "title", "Winlist"); // FIXME
label = pixmapdata_label (winlist_xpm, _("Winlist"));
gtk_widget_show (label);
gtk_notebook_append_page (GTK_NOTEBOOK(notebook), pwinlist, label);
NULL);
gtk_widget_show (notebook);
- gtk_widget_set (notebook, "can-focus", FALSE, NULL);
+ g_object_set (G_OBJECT (notebook), "can-focus", FALSE, NULL);
gtk_widget_show (app);
- gtk_widget_set_usize(partywidget, 480, 360);
- gtk_widget_set_usize(winlistwidget, 480, 360);
+// gtk_widget_set_size_request (partywidget, 480, 360);
+// gtk_widget_set_size_request (winlistwidget, 480, 360);
/* initialise some stuff */
commands_checkstate ();
GtkWidget *pixmapdata_label (char **d, char *str)
{
GdkPixbuf *pb;
- GdkPixmap *pm;
- GdkBitmap *mask;
+ GtkWidget *box, *widget;
- pb = gdk_pixbuf_new_from_xpm_data ((const char **)d);
+ box = gtk_hbox_new (FALSE, 0);
- gdk_pixbuf_render_pixmap_and_mask(pb, &pm, &mask, 1);
- gdk_pixbuf_unref(pb);
+ pb = gdk_pixbuf_new_from_xpm_data ((const char **)d);
+ widget = gtk_image_new_from_pixbuf (pb);
+ gtk_widget_show (widget);
+ gtk_box_pack_start (GTK_BOX(box), widget, TRUE, TRUE, 0);
+
+ widget = gtk_label_new (str);
+ gtk_widget_show (widget);
+ gtk_box_pack_start (GTK_BOX(box), widget, TRUE, TRUE, 0);
- return pixmap_label (pm, mask, str);
+ return box;
}
/* called when the main window is destroyed */
GDK_CONTROL_MASK |
GDK_SHIFT_MASK)))
{
- gtk_signal_emit_stop_by_name (GTK_OBJECT(widget), "key-press-event");
+ g_signal_stop_emission_by_name (G_OBJECT(widget), "key-press-event");
return TRUE;
}
{
g_signal_handler_block (app, keypress_signal);
fields_gmsginputactivate (TRUE);
- gtk_signal_emit_stop_by_name (GTK_OBJECT(widget), "key-press-event");
+ g_signal_stop_emission_by_name (G_OBJECT(widget), "key-press-event");
}
if (game_area && tetrinet_key (key->keyval, key->string))
{
- gtk_signal_emit_stop_by_name (GTK_OBJECT(widget), "key-press-event");
+ g_signal_stop_emission_by_name (G_OBJECT(widget), "key-press-event");
return TRUE;
}
{
k = *key;
keytimeoutid = gtk_timeout_add (10, keytimeout, 0);
- gtk_signal_emit_stop_by_name (GTK_OBJECT(widget), "key-release-event");
+ g_signal_stop_emission_by_name (G_OBJECT(widget), "key-release-event");
return TRUE;
}
return FALSE;
gtk_widget_reparent (pageData->widget, pageData->parent);
/* Select it */
- gtk_notebook_set_page (GTK_NOTEBOOK(notebook), pageData->pageNo);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK(notebook), pageData->pageNo);
/* Free return data */
g_free (data);
/* Extract current page's widget & it's parent from the notebook */
pageNo = gtk_notebook_get_current_page (GTK_NOTEBOOK(notebook));
page = gtk_notebook_get_nth_page (GTK_NOTEBOOK(notebook), pageNo );
- dlist = gtk_container_children (GTK_CONTAINER(page));
+ dlist = gtk_container_get_children (GTK_CONTAINER(page));
if (!dlist || !(dlist->data))
{
/* Must already be a window */
/* Create new window for widget, plus container, etc. */
newWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- title = gtk_object_get_data(GTK_OBJECT(child), "title");
+ title = g_object_get_data (G_OBJECT(child), "title");
if (!title)
title = "GTetrinet";
gtk_window_set_title (GTK_WINDOW (newWindow), title);
g_signal_connect (G_OBJECT(newWindow), "key-release-event",
GTK_SIGNAL_FUNC(keyrelease), NULL);
gtk_widget_set_events (newWindow, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
- gtk_window_set_policy (GTK_WINDOW(newWindow), FALSE, TRUE, FALSE);
+ gtk_window_set_resizable (GTK_WINDOW(newWindow), TRUE);
/* Create store to point us back to page for later */
pageData = g_new( WidgetPageData, 1 );
/* show the fields notebook tab */
void show_fields_page (void)
{
- gtk_notebook_set_page (GTK_NOTEBOOK(notebook), 0);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK(notebook), 0);
}
/* show the partyline notebook tab */
void show_partyline_page (void)
{
- gtk_notebook_set_page (GTK_NOTEBOOK(notebook), 1);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK(notebook), 1);
}
void unblock_keyboard_signal (void)
gchar *aux;
aux = g_locale_to_utf8 (str, -1, NULL, NULL, NULL);
- gtk_label_set (GTK_LABEL(GTK_BIN(align)->child), aux);
+ gtk_label_set_text (GTK_LABEL(GTK_BIN(align)->child), aux);
g_free (aux);
}
return ret->str;
}
-
-GtkWidget *pixmap_label (GdkPixmap *pm, GdkBitmap *mask, char *str)
-{
- GtkWidget *box, *widget;
- box = gtk_hbox_new (FALSE, 0);
- widget = gtk_pixmap_new (pm, mask);
- gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX(box), widget, TRUE, TRUE, 0);
- widget = gtk_label_new (str);
- gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX(box), widget, TRUE, TRUE, 0);
- return box;
-}
extern void textbox_addtext (GtkTextView *textbox, const unsigned char *text);
extern void adjust_bottom_text_view (GtkTextView *);
extern char *nocolor (char *str);
-extern GtkWidget *pixmap_label (GdkPixmap *pm, GdkBitmap *mask, char *str);
/* Better versions of the std. string functions */
#define GTET_STRCPY(x, y, sz) G_STMT_START { \
gtk_widget_show(textboxscroll);
gtk_box_pack_start (GTK_BOX(leftbox), textboxscroll, TRUE, TRUE, 0);
/* entry box */
- entrybox = gtk_entry_new_with_max_length (200);
+ entrybox = gtk_entry_new ();
+ gtk_entry_set_max_length (GTK_ENTRY (entrybox), 200);
g_signal_connect (G_OBJECT(entrybox), "activate",
GTK_SIGNAL_FUNC(textentry), NULL);
g_signal_connect (G_OBJECT(entrybox), "key-press-event",
GTK_POLICY_AUTOMATIC,
GTK_POLICY_NEVER);
gtk_container_add (GTK_CONTAINER(playerlist_scroll), playerlist);
- gtk_widget_set_usize (playerlist_scroll, 150, 200);
+ gtk_widget_set_size_request (playerlist_scroll, 150, 200);
gtk_widget_show (playerlist_scroll);
/* right box */
gtk_widget_show (infolabel);
gtk_box_pack_start (GTK_BOX(box), infolabel, TRUE, FALSE, 0);
- gtk_container_border_width (GTK_CONTAINER(box), 4);
+ gtk_container_set_border_width (GTK_CONTAINER(box), 4);
gtk_widget_show (box);
rightbox = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME(rightbox), GTK_SHADOW_IN);
table = gtk_table_new (2, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE(table), 4);
gtk_table_set_col_spacings (GTK_TABLE(table), 4);
- gtk_container_border_width (GTK_CONTAINER(table), 4);
+ gtk_container_set_border_width (GTK_CONTAINER(table), 4);
gtk_table_attach (GTK_TABLE(table), leftbox, 0, 1, 0, 2,
GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
0, 0);
if (nick)
{
nick_utf8 = g_locale_to_utf8 (nocolor (nick), -1, NULL, NULL, NULL);
- gtk_label_set (GTK_LABEL(namelabel), nick_utf8);
+ gtk_label_set_text (GTK_LABEL(namelabel), nick_utf8);
g_free (nick_utf8);
}
- else gtk_label_set (GTK_LABEL(namelabel), "");
+ else gtk_label_set_text (GTK_LABEL(namelabel), "");
if (team)
{
team_utf8 = g_locale_to_utf8 (nocolor (team), -1, NULL, NULL, NULL);
- gtk_label_set (GTK_LABEL(teamlabel), team_utf8);
+ gtk_label_set_text (GTK_LABEL(teamlabel), team_utf8);
g_free (team_utf8);
}
- else gtk_label_set (GTK_LABEL(teamlabel), "");
+ else gtk_label_set_text (GTK_LABEL(teamlabel), "");
}
void partyline_status (char *status)
{
- gtk_label_set (GTK_LABEL(infolabel), status);
+ gtk_label_set_text (GTK_LABEL(infolabel), status);
}
void partyline_text (char *text)
{
if (connected)
{
- gtk_entry_set_text (GTK_ENTRY(entrybox), "");
- gtk_entry_set_position (GTK_ENTRY(entrybox), 0);
+ gtk_entry_set_text (GTK_ENTRY (entrybox), "");
+ gtk_editable_set_position (GTK_EDITABLE (entrybox), 0);
gtk_widget_grab_focus (entrybox);
}
}
printf ("history: %d %d %d %s\n", plh_start, plh_end, plh_cur,
plhistory[plh_cur]);
#endif
- gtk_signal_emit_stop_by_name (GTK_OBJECT(widget), "key-press-event");
+ g_signal_stop_emission_by_name (G_OBJECT(widget), "key-press-event");
return TRUE;
}
else if (keyval == GDK_Left || keyval == GDK_Right) {
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (winlist), -1, _("Score"), renderer,
"text", 2, NULL);
- gtk_widget_set_usize (winlist, 240, 0);
+ gtk_widget_set_size_request (winlist, 240, 0);
gtk_widget_show (winlist);
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.8);
gtk_container_add (GTK_CONTAINER(align), winlist);
- gtk_container_border_width (GTK_CONTAINER(align), 2);
+ gtk_container_set_border_width (GTK_CONTAINER(align), 2);
return align;
}
projects / gtetrinet / commitdiff