comparison: pidgin/gtkrequest.c
pidgin/gtkrequest.c
- changeset 36246
- 56f47d847aa3
- parent 35989
- 2b5a26ddbb69
- child 36257
- c5445f25f90f
equal
deleted
inserted
replaced
| 36245:7f2005523012 | 36246:56f47d847aa3 |
|---|---|
| 1964 GtkNotebook *notebook; | 1964 GtkNotebook *notebook; |
| 1965 GtkWidget **pages; | 1965 GtkWidget **pages; |
| 1966 GtkWidget *hbox, *vbox; | 1966 GtkWidget *hbox, *vbox; |
| 1967 GtkWidget *frame; | 1967 GtkWidget *frame; |
| 1968 GtkWidget *label; | 1968 GtkWidget *label; |
| 1969 GtkWidget *table; | 1969 GtkWidget *grid; |
| 1970 GtkWidget *button; | 1970 GtkWidget *button; |
| 1971 GtkWidget *img; | 1971 GtkWidget *img; |
| 1972 GtkSizeGroup *sg, *datasheet_buttons_sg; | 1972 GtkSizeGroup *sg, *datasheet_buttons_sg; |
| 1973 GList *gl, *fl; | 1973 GList *gl, *fl; |
| 1974 PurpleRequestFieldGroup *group; | 1974 PurpleRequestFieldGroup *group; |
| 2244 col_num = 0; | 2244 col_num = 0; |
| 2245 #endif | 2245 #endif |
| 2246 } | 2246 } |
| 2247 | 2247 |
| 2248 if (compact) | 2248 if (compact) |
| 2249 table = gtk_table_new(rows, cols, FALSE); | 2249 grid = gtk_grid_table_new(rows, cols); |
| 2250 else | 2250 else |
| 2251 table = gtk_table_new(rows, 2 * cols, FALSE); | 2251 grid = gtk_grid_table_new(rows, 2 * cols); |
| 2252 gtk_table_set_row_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE); | 2252 gtk_grid_set_row_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE); |
| 2253 gtk_table_set_col_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE); | 2253 gtk_grid_set_column_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE); |
| 2254 | 2254 |
| 2255 frame_fill = (notebook == NULL || contains_resizable); | 2255 frame_fill = (notebook == NULL || contains_resizable); |
| 2256 gtk_box_pack_start(GTK_BOX(frame), table, frame_fill, frame_fill, 0); | 2256 gtk_box_pack_start(GTK_BOX(frame), grid, frame_fill, frame_fill, 0); |
| 2257 gtk_widget_show(table); | 2257 gtk_widget_show(grid); |
| 2258 | 2258 |
| 2259 for (row_num = 0, fl = field_list; | 2259 for (row_num = 0, fl = field_list; |
| 2260 row_num < rows && fl != NULL; | 2260 row_num < rows && fl != NULL; |
| 2261 row_num++) | 2261 row_num++) |
| 2262 { | 2262 { |
| 2320 #if 0 | 2320 #if 0 |
| 2321 if(col_num > 0) | 2321 if(col_num > 0) |
| 2322 row_num++; | 2322 row_num++; |
| 2323 #endif | 2323 #endif |
| 2324 | 2324 |
| 2325 gtk_table_attach_defaults(GTK_TABLE(table), label, | 2325 gtk_grid_attach_defaults(GTK_GRID(grid), label, |
| 2326 0, 2 * cols, | 2326 0, row_num, 2 * cols, 1); |
| 2327 row_num, row_num + 1); | |
| 2328 | 2327 |
| 2329 row_num++; | 2328 row_num++; |
| 2330 #if 0 | 2329 #if 0 |
| 2331 col_num=cols; | 2330 col_num=cols; |
| 2332 #endif | 2331 #endif |
| 2333 } | 2332 } |
| 2334 else | 2333 else |
| 2335 { | 2334 { |
| 2336 gtk_table_attach_defaults(GTK_TABLE(table), label, | 2335 gtk_grid_attach_defaults(GTK_GRID(grid), label, |
| 2337 col_offset, col_offset + 1, | 2336 col_offset, row_num, 1, 1); |
| 2338 row_num, row_num + 1); | |
| 2339 } | 2337 } |
| 2340 | 2338 |
| 2341 gtk_widget_show(label); | 2339 gtk_widget_show(label); |
| 2342 g_free(field_label); | 2340 g_free(field_label); |
| 2343 } | 2341 } |
| 2374 gtk_label_set_mnemonic_widget(GTK_LABEL(label), widget); | 2372 gtk_label_set_mnemonic_widget(GTK_LABEL(label), widget); |
| 2375 | 2373 |
| 2376 if (type == PURPLE_REQUEST_FIELD_STRING && | 2374 if (type == PURPLE_REQUEST_FIELD_STRING && |
| 2377 purple_request_field_string_is_multiline(field)) | 2375 purple_request_field_string_is_multiline(field)) |
| 2378 { | 2376 { |
| 2379 gtk_table_attach(GTK_TABLE(table), widget, | 2377 gtk_grid_attach_full(GTK_GRID(grid), widget, |
| 2380 0, 2 * cols, | 2378 0, row_num, 2 * cols, 1, |
| 2381 row_num, row_num + 1, | 2379 GTK_FILL | GTK_EXPAND, |
| 2382 GTK_FILL | GTK_EXPAND, | 2380 GTK_FILL | GTK_EXPAND, |
| 2383 GTK_FILL | GTK_EXPAND, | 2381 5, 0); |
| 2384 5, 0); | |
| 2385 } | 2382 } |
| 2386 else if (type == PURPLE_REQUEST_FIELD_LIST) | 2383 else if (type == PURPLE_REQUEST_FIELD_LIST) |
| 2387 { | 2384 { |
| 2388 gtk_table_attach(GTK_TABLE(table), widget, | 2385 gtk_grid_attach_full(GTK_GRID(grid), widget, |
| 2389 0, 2 * cols, | 2386 0, row_num, 2 * cols, 1, |
| 2390 row_num, row_num + 1, | 2387 GTK_FILL | GTK_EXPAND, |
| 2391 GTK_FILL | GTK_EXPAND, | 2388 GTK_FILL | GTK_EXPAND, |
| 2392 GTK_FILL | GTK_EXPAND, | 2389 5, 0); |
| 2393 5, 0); | |
| 2394 } | 2390 } |
| 2395 else if (type == PURPLE_REQUEST_FIELD_BOOLEAN) | 2391 else if (type == PURPLE_REQUEST_FIELD_BOOLEAN) |
| 2396 { | 2392 { |
| 2397 gtk_table_attach(GTK_TABLE(table), widget, | 2393 gtk_grid_attach_full(GTK_GRID(grid), widget, |
| 2398 col_offset, col_offset + 1, | 2394 col_offset, row_num, 1, 1, |
| 2399 row_num, row_num + 1, | 2395 GTK_FILL | GTK_EXPAND, |
| 2400 GTK_FILL | GTK_EXPAND, | 2396 GTK_FILL | GTK_EXPAND, |
| 2401 GTK_FILL | GTK_EXPAND, | 2397 5, 0); |
| 2402 5, 0); | |
| 2403 } | 2398 } |
| 2404 else if (compact) { | 2399 else if (compact) { |
| 2405 row_num++; | 2400 row_num++; |
| 2406 gtk_table_attach(GTK_TABLE(table), widget, | 2401 gtk_grid_attach_full(GTK_GRID(grid), widget, |
| 2407 0, 2 * cols, | 2402 0, row_num, 2 * cols, 1, |
| 2408 row_num, row_num + 1, | 2403 GTK_FILL | GTK_EXPAND, |
| 2409 GTK_FILL | GTK_EXPAND, | 2404 GTK_FILL | GTK_EXPAND, |
| 2410 GTK_FILL | GTK_EXPAND, | 2405 5, 0); |
| 2411 5, 0); | |
| 2412 } else { | 2406 } else { |
| 2413 gtk_table_attach(GTK_TABLE(table), widget, | 2407 gtk_grid_attach_full(GTK_GRID(grid), widget, |
| 2414 1, 2 * cols, | 2408 1, row_num, 2 * cols - 1, 1, |
| 2415 row_num, row_num + 1, | 2409 GTK_FILL | GTK_EXPAND, |
| 2416 GTK_FILL | GTK_EXPAND, | 2410 GTK_FILL | GTK_EXPAND, |
| 2417 GTK_FILL | GTK_EXPAND, | 2411 5, 0); |
| 2418 5, 0); | |
| 2419 } | 2412 } |
| 2420 | 2413 |
| 2421 gtk_widget_show(widget); | 2414 gtk_widget_show(widget); |
| 2422 | 2415 |
| 2423 purple_request_field_set_ui_data(field, widget); | 2416 purple_request_field_set_ui_data(field, widget); |
