comparison: pidgin/minidialog.c
pidgin/minidialog.c
- branch
- cpw.resiak.disconnectreason
- changeset 21333
- 630a8a394a5a
- parent 21330
- 4dbf102c94e8
- child 21335
- 76e47b651a6e
equal
deleted
inserted
replaced
| 21332:bbf010fd6cc7 | 21333:630a8a394a5a |
|---|---|
| 47 typedef struct _PidginMiniDialogPrivate | 47 typedef struct _PidginMiniDialogPrivate |
| 48 { | 48 { |
| 49 GtkImage *icon; | 49 GtkImage *icon; |
| 50 GtkBox *title_box; | 50 GtkBox *title_box; |
| 51 GtkLabel *title; | 51 GtkLabel *title; |
| 52 GtkBox *desc_box; | |
| 53 GtkLabel *desc; | 52 GtkLabel *desc; |
| 54 GtkBox *buttons; | 53 GtkBox *buttons; |
| 55 } PidginMiniDialogPrivate; | 54 } PidginMiniDialogPrivate; |
| 56 | 55 |
| 57 #define PIDGIN_MINI_DIALOG_GET_PRIVATE(dialog) \ | 56 #define PIDGIN_MINI_DIALOG_GET_PRIVATE(dialog) \ |
| 224 gtk_label_set_markup(priv->desc, desc_markup); | 223 gtk_label_set_markup(priv->desc, desc_markup); |
| 225 | 224 |
| 226 g_free(desc_esc); | 225 g_free(desc_esc); |
| 227 g_free(desc_markup); | 226 g_free(desc_markup); |
| 228 | 227 |
| 229 gtk_widget_show_all(GTK_WIDGET(priv->desc_box)); | 228 gtk_widget_show(GTK_WIDGET(priv->desc)); |
| 230 } | 229 } |
| 231 else | 230 else |
| 232 { | 231 { |
| 233 gtk_label_set_text(priv->desc, NULL); | 232 gtk_label_set_text(priv->desc, NULL); |
| 234 gtk_widget_hide_all(GTK_WIDGET(priv->desc_box)); | 233 gtk_widget_hide(GTK_WIDGET(priv->desc)); |
| 235 } | 234 } |
| 236 } | 235 } |
| 237 | 236 |
| 238 static void | 237 static void |
| 239 pidgin_mini_dialog_set_property(GObject *object, | 238 pidgin_mini_dialog_set_property(GObject *object, |
| 321 priv->title_box = GTK_BOX(gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE)); | 320 priv->title_box = GTK_BOX(gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE)); |
| 322 | 321 |
| 323 priv->icon = GTK_IMAGE(gtk_image_new()); | 322 priv->icon = GTK_IMAGE(gtk_image_new()); |
| 324 gtk_misc_set_alignment(GTK_MISC(priv->icon), 0, 0); | 323 gtk_misc_set_alignment(GTK_MISC(priv->icon), 0, 0); |
| 325 | 324 |
| 326 priv->title = GTK_LABEL(gtk_label_new("")); | 325 priv->title = GTK_LABEL(gtk_label_new(NULL)); |
| 327 /* TODO: update this request when /blist/width updates. Also, 25 is | 326 /* TODO: update this request when /blist/width updates. Also, 25 is |
| 328 * magic. | 327 * magic. |
| 329 */ | 328 */ |
| 330 gtk_widget_set_size_request(GTK_WIDGET(priv->title), | 329 gtk_widget_set_size_request(GTK_WIDGET(priv->title), |
| 331 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width")-25, -1); | 330 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width")-25, -1); |
| 333 gtk_misc_set_alignment(GTK_MISC(priv->title), 0, 0); | 332 gtk_misc_set_alignment(GTK_MISC(priv->title), 0, 0); |
| 334 | 333 |
| 335 gtk_box_pack_start(priv->title_box, GTK_WIDGET(priv->icon), FALSE, FALSE, 0); | 334 gtk_box_pack_start(priv->title_box, GTK_WIDGET(priv->icon), FALSE, FALSE, 0); |
| 336 gtk_box_pack_start(priv->title_box, GTK_WIDGET(priv->title), TRUE, TRUE, 0); | 335 gtk_box_pack_start(priv->title_box, GTK_WIDGET(priv->title), TRUE, TRUE, 0); |
| 337 | 336 |
| 338 priv->desc_box = GTK_BOX(gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE)); | 337 priv->desc = GTK_LABEL(gtk_label_new(NULL)); |
| 339 priv->desc = GTK_LABEL(gtk_label_new("")); | |
| 340 /* TODO: update this request when /blist/width updates. Also, 25 is | 338 /* TODO: update this request when /blist/width updates. Also, 25 is |
| 341 * magic. | 339 * magic. |
| 342 */ | 340 */ |
| 343 gtk_widget_set_size_request(GTK_WIDGET(priv->desc), | 341 gtk_widget_set_size_request(GTK_WIDGET(priv->desc), |
| 344 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width")-25, -1); | 342 purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width")-25, -1); |
| 345 gtk_label_set_line_wrap(priv->desc, TRUE); | 343 gtk_label_set_line_wrap(priv->desc, TRUE); |
| 346 gtk_misc_set_alignment(GTK_MISC(priv->desc), 0, 0); | 344 gtk_misc_set_alignment(GTK_MISC(priv->desc), 0, 0); |
| 347 gtk_box_pack_start(priv->desc_box, GTK_WIDGET(priv->desc), | |
| 348 TRUE, TRUE, 0); | |
| 349 | 345 |
| 350 self->contents = GTK_BOX(gtk_vbox_new(FALSE, 0)); | 346 self->contents = GTK_BOX(gtk_vbox_new(FALSE, 0)); |
| 351 | 347 |
| 352 priv->buttons = GTK_BOX(gtk_hbox_new(FALSE, 0)); | 348 priv->buttons = GTK_BOX(gtk_hbox_new(FALSE, 0)); |
| 353 | 349 |
| 354 gtk_box_pack_start(self_box, GTK_WIDGET(priv->title_box), FALSE, FALSE, 0); | 350 gtk_box_pack_start(self_box, GTK_WIDGET(priv->title_box), FALSE, FALSE, 0); |
| 355 gtk_box_pack_start(self_box, GTK_WIDGET(priv->desc_box), FALSE, FALSE, 0); | 351 gtk_box_pack_start(self_box, GTK_WIDGET(priv->desc), FALSE, FALSE, 0); |
| 356 gtk_box_pack_start(self_box, GTK_WIDGET(self->contents), TRUE, TRUE, 0); | 352 gtk_box_pack_start(self_box, GTK_WIDGET(self->contents), TRUE, TRUE, 0); |
| 357 gtk_box_pack_start(self_box, GTK_WIDGET(priv->buttons), FALSE, FALSE, 0); | 353 gtk_box_pack_start(self_box, GTK_WIDGET(priv->buttons), FALSE, FALSE, 0); |
| 358 | 354 |
| 359 gtk_widget_show_all(GTK_WIDGET(self)); | 355 gtk_widget_show_all(GTK_WIDGET(self)); |
| 360 gtk_widget_hide_all(GTK_WIDGET(priv->desc_box)); | 356 gtk_widget_hide(GTK_WIDGET(priv->desc)); |
| 361 } | 357 } |
