Mercurial > pidgin.yaz

comparison src/buddy_chat.c @ 7841:0555e59dfba9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 8494] A few more minor updates to the Join Chat dialog. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 13 Dec 2003 01:16:23 +0000
parents 061b39119a1b
children 340df1652af1
comparison
equal deleted inserted replaced
7840:13334c29799b 7841:0555e59dfba9
99 GtkWidget *label; 99 GtkWidget *label;
100 GtkWidget *rowbox; 100 GtkWidget *rowbox;
101 101
102 pce = tmp->data; 102 pce = tmp->data;
103 103
104 rowbox = gtk_hbox_new(FALSE, 5); 104 rowbox = gtk_hbox_new(FALSE, 12);
105 gtk_box_pack_start(GTK_BOX(data->entries_box), rowbox, FALSE, FALSE, 0); 105 gtk_box_pack_start(GTK_BOX(data->entries_box), rowbox, FALSE, FALSE, 0);
106 106
107 label = gtk_label_new(pce->label); 107 label = gtk_label_new_with_mnemonic(pce->label);
108 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 108 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
109 gtk_size_group_add_widget(data->sg, label); 109 gtk_size_group_add_widget(data->sg, label);
110 gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0); 110 gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0);
111 111
112 if (pce->is_int) { 112 if (pce->is_int) {
118 g_object_set_data(G_OBJECT(spin), "is_spin", GINT_TO_POINTER(TRUE)); 118 g_object_set_data(G_OBJECT(spin), "is_spin", GINT_TO_POINTER(TRUE));
119 g_object_set_data(G_OBJECT(spin), "identifier", pce->identifier); 119 g_object_set_data(G_OBJECT(spin), "identifier", pce->identifier);
120 data->entries = g_list_append(data->entries, spin); 120 data->entries = g_list_append(data->entries, spin);
121 gtk_widget_set_size_request(spin, 50, -1); 121 gtk_widget_set_size_request(spin, 50, -1);
122 gtk_box_pack_end(GTK_BOX(rowbox), spin, FALSE, FALSE, 0); 122 gtk_box_pack_end(GTK_BOX(rowbox), spin, FALSE, FALSE, 0);
123 gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(spin));
123 } else { 124 } else {
124 GtkWidget *entry = gtk_entry_new(); 125 GtkWidget *entry = gtk_entry_new();
125 126
126 gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE); 127 gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
127 g_object_set_data(G_OBJECT(entry), "identifier", pce->identifier); 128 g_object_set_data(G_OBJECT(entry), "identifier", pce->identifier);
137 138
138 if (pce->secret) 139 if (pce->secret)
139 gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); 140 gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
140 141
141 gtk_box_pack_end(GTK_BOX(rowbox), entry, TRUE, TRUE, 0); 142 gtk_box_pack_end(GTK_BOX(rowbox), entry, TRUE, TRUE, 0);
143 gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(entry));
142 } 144 }
143 145
144 g_free(pce); 146 g_free(pce);
145 } 147 }
146 148
218 img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG); 220 img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
219 data = g_new0(GaimGtkJoinChatData, 1); 221 data = g_new0(GaimGtkJoinChatData, 1);
220 222
221 data->window = gtk_dialog_new_with_buttons(_("Join Chat"), gtkblist->window ? GTK_WINDOW(gtkblist->window) : NULL, 0, 223 data->window = gtk_dialog_new_with_buttons(_("Join Chat"), gtkblist->window ? GTK_WINDOW(gtkblist->window) : NULL, 0,
222 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, 224 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
223 "Join", GTK_RESPONSE_OK, NULL); 225 _("_Join"), GTK_RESPONSE_OK, NULL);
224 gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK); 226 gtk_dialog_set_default_response(GTK_DIALOG(data->window), GTK_RESPONSE_OK);
225 gtk_container_set_border_width(GTK_CONTAINER(data->window), 6); 227 gtk_container_set_border_width(GTK_CONTAINER(data->window), 6);
226 gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE); 228 gtk_window_set_resizable(GTK_WINDOW(data->window), FALSE);
227 gtk_dialog_set_has_separator(GTK_DIALOG(data->window), FALSE); 229 gtk_dialog_set_has_separator(GTK_DIALOG(data->window), FALSE);
228 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), 12); 230 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(data->window)->vbox), 12);
229 gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), 6); 231 gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), 6);
230 232
231 hbox = gtk_hbox_new(FALSE, 12); 233 hbox = gtk_hbox_new(FALSE, 12);
232 gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox); 234 gtk_container_add(GTK_CONTAINER(GTK_DIALOG(data->window)->vbox), hbox);
233 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); 235 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
234 gtk_misc_set_alignment(GTK_MISC(img), 0, 0); 236 gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
235 237
236 vbox = gtk_vbox_new(FALSE, 5); 238 vbox = gtk_vbox_new(FALSE, 5);
237 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); 239 gtk_container_set_border_width(GTK_CONTAINER(vbox), 0);
238 gtk_container_add(GTK_CONTAINER(hbox), vbox); 240 gtk_container_add(GTK_CONTAINER(hbox), vbox);
239 241
240 label = gtk_label_new(_("Please enter the appropriate information about the chat you would like to join.\n")); 242 label = gtk_label_new(_("Please enter the appropriate information about the chat you would like to join.\n"));
241 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); 243 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
242 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); 244 gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
243 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); 245 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
244 246
245 rowbox = gtk_hbox_new(FALSE, 5); 247 rowbox = gtk_hbox_new(FALSE, 12);
246 gtk_box_pack_start(GTK_BOX(vbox), rowbox, TRUE, TRUE, 0); 248 gtk_box_pack_start(GTK_BOX(vbox), rowbox, TRUE, TRUE, 0);
247 249
248 data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 250 data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
249 251
250 if (numaccounts > 1) { 252 if (numaccounts > 1) {
251 label = gtk_label_new(_("Join Chat As:")); 253 label = gtk_label_new_with_mnemonic(_("_Account:"));
252 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 254 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
253 gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0); 255 gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0);
254 gtk_size_group_add_widget(data->sg, label); 256 gtk_size_group_add_widget(data->sg, label);
255 257
256 data->account_menu = gaim_gtk_account_option_menu_new(NULL, FALSE, 258 data->account_menu = gaim_gtk_account_option_menu_new(NULL, FALSE,
257 G_CALLBACK(join_chat_select_account_cb), 259 G_CALLBACK(join_chat_select_account_cb),
258 join_chat_check_account_func, data); 260 join_chat_check_account_func, data);
259 gtk_box_pack_start(GTK_BOX(rowbox), data->account_menu, TRUE, TRUE, 0); 261 gtk_box_pack_start(GTK_BOX(rowbox), data->account_menu, TRUE, TRUE, 0);
262 gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(data->account_menu));
260 } 263 }
261 264
262 data->entries_box = gtk_vbox_new(FALSE, 5); 265 data->entries_box = gtk_vbox_new(FALSE, 5);
263 gtk_container_add(GTK_CONTAINER(vbox), data->entries_box); 266 gtk_container_add(GTK_CONTAINER(vbox), data->entries_box);
264 gtk_container_set_border_width(GTK_CONTAINER(data->entries_box), 0); 267 gtk_container_set_border_width(GTK_CONTAINER(data->entries_box), 0);