Menu
▾
▴
[Gaim-commits] CVS: gaim/src dialogs.c,1.299,1.300 gaim.h,1.305,1.306 multi.c,1.107,1.108
|
From: Rob F. <rob...@us...> - 2002-02-22 23:47:59
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv2776
Modified Files:
dialogs.c gaim.h multi.c
Log Message:
I think I'm alone now ...
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -d -r1.299 -r1.300
--- dialogs.c 17 Feb 2002 21:16:02 -0000 1.299
+++ dialogs.c 22 Feb 2002 23:47:55 -0000 1.300
@@ -4355,7 +4355,7 @@
GSList *found;
MultiEntryData *data;
- if((found = g_slist_find_custom(*list, label, multi_entry_data_label_compare)) == NULL) {
+ if((found = g_slist_find_custom(*list, (void *)label, multi_entry_data_label_compare)) == NULL) {
if(add_it) {
data = (MultiEntryData *) g_slist_last(*list =
g_slist_append(*list, g_malloc(sizeof(MultiEntryData))))->data;
@@ -4408,7 +4408,7 @@
GSList *found;
MultiTextData *data;
- if((found = g_slist_find_custom(*list, label, multi_text_data_label_compare)) == NULL) {
+ if((found = g_slist_find_custom(*list, (void *)label, multi_text_data_label_compare)) == NULL) {
if(add_it) {
data = (MultiTextData *) g_slist_last(*list =
g_slist_append(*list, g_malloc(sizeof(MultiTextData))))->data;
@@ -4443,6 +4443,7 @@
multi_text_items_free_all(&(b->multi_text_items));
g_free(b->instructions->text);
g_free(b->instructions);
+ g_free(b->entries_title);
g_free(b);
}
@@ -4485,45 +4486,52 @@
GtkWidget *label;
GSList *multi_entry;
MultiEntryData *med;
- int rows = 0;
- int rowNum;
+ int rows, row_num, col_num, col_offset;
+ int cols = 1;
/* Figure-out number of rows needed for table */
- rows = g_slist_length(multi_entry_items);
+ if((rows = g_slist_length(multi_entry_items)) > 9) {
+ rows /= 2;
+ ++cols;
+ }
if(*entries_table != NULL) {
gtk_widget_destroy(GTK_WIDGET (*entries_table));
}
- *entries_table = gtk_table_new(rows, 3, FALSE);
- gtk_table_set_col_spacings(GTK_TABLE(*entries_table), 5);
- gtk_table_set_row_spacings(GTK_TABLE(*entries_table), 5);
- gtk_container_set_border_width(GTK_CONTAINER(*entries_table), 5);
+ *entries_table = gtk_table_new(rows, 3 * cols, FALSE);
gtk_container_add(GTK_CONTAINER (entries_frame), *entries_table);
- for(rowNum = 0, multi_entry = multi_entry_items;
- multi_entry != NULL; ++rowNum, multi_entry = multi_entry->next) {
+ for(col_num = 0, multi_entry = multi_entry_items; col_num < cols && multi_entry != NULL;
+ ++col_num) {
+ col_offset = col_num * 3;
+ for(row_num = 0; row_num < rows && multi_entry != NULL;
+ ++row_num, multi_entry = multi_entry->next) {
- med = (MultiEntryData *) multi_entry->data;
+ med = (MultiEntryData *) multi_entry->data;
- label = gtk_label_new(med->label);
- gtk_misc_set_alignment(GTK_MISC(label), (gfloat) 1.0, (gfloat) 0.5);
- gtk_table_attach_defaults(GTK_TABLE (*entries_table), label, 0, 1, rowNum, rowNum +1);
- gtk_widget_show(label);
+ label = gtk_label_new(med->label);
+ gtk_misc_set_alignment(GTK_MISC(label), (gfloat) 1.0, (gfloat) 0.5);
+ gtk_table_attach_defaults(GTK_TABLE (*entries_table), label,
+ col_offset, 1 + col_offset, row_num, row_num +1);
+ gtk_widget_show(label);
- label = gtk_label_new(": ");
- gtk_misc_set_alignment(GTK_MISC(label), (gfloat) 0.0, (gfloat) 0.5);
- gtk_table_attach_defaults(GTK_TABLE (*entries_table), label, 1, 2, rowNum, rowNum +1);
- gtk_widget_show(label);
+ label = gtk_label_new(": ");
+ gtk_misc_set_alignment(GTK_MISC(label), (gfloat) 0.0, (gfloat) 0.5);
+ gtk_table_attach_defaults(GTK_TABLE (*entries_table), label,
+ 1 + col_offset, 2 + col_offset, row_num, row_num +1);
+ gtk_widget_show(label);
- med->widget = gtk_entry_new_with_max_length(50);
- if(med->text != NULL) {
- gtk_entry_set_text(GTK_ENTRY (med->widget), med->text);
+ med->widget = gtk_entry_new_with_max_length(50);
+ if(med->text != NULL) {
+ gtk_entry_set_text(GTK_ENTRY (med->widget), med->text);
+ }
+ gtk_entry_set_visibility(GTK_ENTRY (med->widget), med->visible);
+ gtk_entry_set_editable(GTK_ENTRY (med->widget), med->editable);
+ gtk_table_attach(GTK_TABLE (*entries_table), med->widget,
+ 2 + col_offset, 3 + col_offset, row_num, row_num +1,
+ GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 5, 0);
+ gtk_widget_show(med->widget);
}
- gtk_entry_set_visibility(GTK_ENTRY (med->widget), med->visible);
- gtk_entry_set_editable(GTK_ENTRY (med->widget), med->editable);
- gtk_table_attach_defaults(GTK_TABLE (*entries_table),
- med->widget, 2, 3, rowNum, rowNum +1);
- gtk_widget_show(med->widget);
}
gtk_widget_show(*entries_table);
@@ -4628,7 +4636,7 @@
gtk_box_pack_start(GTK_BOX (vbox), b->instructions->label, TRUE, TRUE, 5);
re_show_multi_entry_instr(b->instructions);
- b->entries_frame = gtk_frame_new(NULL);
+ b->entries_frame = gtk_frame_new(b->entries_title);
gtk_box_pack_start(GTK_BOX (vbox), b->entries_frame, TRUE, TRUE, 5);
gtk_widget_show(b->entries_frame);
b->entries_table = NULL;
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- gaim.h 17 Feb 2002 18:08:12 -0000 1.305
+++ gaim.h 22 Feb 2002 23:47:55 -0000 1.306
@@ -467,6 +467,7 @@
GtkWidget *entries_table; /* table widget containing m-e lables & entries */
GtkWidget *entries_frame; /* frame widget containing the table widget */
+ gchar *entries_title; /* title of multi-entries list */
GSList *multi_entry_items; /* entry dialogs parameters */
GtkWidget *texts_ibox; /* inner vbox containing multi-text frames */
Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- multi.c 17 Feb 2002 18:08:12 -0000 1.107
+++ multi.c 22 Feb 2002 23:47:55 -0000 1.108
@@ -666,7 +666,7 @@
}
if(p->register_user != NULL) {
- u->register_user = gtk_check_button_new_with_label("Register with server");
+ u->register_user = gtk_check_button_new_with_label(_("Register with server"));
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(u->register_user), FALSE);
gtk_box_pack_start(GTK_BOX(vbox), u->register_user, FALSE, FALSE, 0);
gtk_widget_show(u->register_user);
|