comparison: pidgin/gtklog.c
pidgin/gtklog.c
- branch
- cpw.qulogic.gtk3
- changeset 32424
- be4a642b2d45
- parent 31321
- 1fef3832cfa2
- parent 32422
- c215bc5d85e4
- child 32438
- dc8991868906
- child 33120
- f6f1a27ade72
equal
deleted
inserted
replaced
| 31579:a0a4b018f9eb | 32424:be4a642b2d45 |
|---|---|
| 579 #ifdef _WIN32 | 579 #ifdef _WIN32 |
| 580 /* Steal the "HELP" response and use it to trigger browsing to the logs folder */ | 580 /* Steal the "HELP" response and use it to trigger browsing to the logs folder */ |
| 581 gtk_dialog_add_button(GTK_DIALOG(lv->window), _("_Browse logs folder"), GTK_RESPONSE_HELP); | 581 gtk_dialog_add_button(GTK_DIALOG(lv->window), _("_Browse logs folder"), GTK_RESPONSE_HELP); |
| 582 #endif | 582 #endif |
| 583 gtk_container_set_border_width (GTK_CONTAINER(lv->window), PIDGIN_HIG_BOX_SPACE); | 583 gtk_container_set_border_width (GTK_CONTAINER(lv->window), PIDGIN_HIG_BOX_SPACE); |
| 584 /* TODO: is it possible to set this in GTK+ 3.0? */ | |
| 585 #if 0 | |
| 584 gtk_dialog_set_has_separator(GTK_DIALOG(lv->window), FALSE); | 586 gtk_dialog_set_has_separator(GTK_DIALOG(lv->window), FALSE); |
| 585 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(lv->window)->vbox), 0); | 587 #endif |
| 588 gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))), 0); | |
| 586 g_signal_connect(G_OBJECT(lv->window), "response", | 589 g_signal_connect(G_OBJECT(lv->window), "response", |
| 587 G_CALLBACK(destroy_cb), ht); | 590 G_CALLBACK(destroy_cb), ht); |
| 588 gtk_window_set_role(GTK_WINDOW(lv->window), "log_viewer"); | 591 gtk_window_set_role(GTK_WINDOW(lv->window), "log_viewer"); |
| 589 | 592 |
| 590 /* Icon *************/ | 593 /* Icon *************/ |
| 591 if (icon != NULL) { | 594 if (icon != NULL) { |
| 592 title_box = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); | 595 title_box = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); |
| 593 gtk_container_set_border_width(GTK_CONTAINER(title_box), PIDGIN_HIG_BOX_SPACE); | 596 gtk_container_set_border_width(GTK_CONTAINER(title_box), PIDGIN_HIG_BOX_SPACE); |
| 594 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lv->window)->vbox), title_box, FALSE, FALSE, 0); | 597 gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))), |
| 598 title_box, FALSE, FALSE, 0); | |
| 595 | 599 |
| 596 gtk_box_pack_start(GTK_BOX(title_box), icon, FALSE, FALSE, 0); | 600 gtk_box_pack_start(GTK_BOX(title_box), icon, FALSE, FALSE, 0); |
| 597 } else | 601 } else |
| 598 title_box = GTK_DIALOG(lv->window)->vbox; | 602 title_box = gtk_dialog_get_content_area(GTK_DIALOG(lv->window)); |
| 599 | 603 |
| 600 /* Label ************/ | 604 /* Label ************/ |
| 601 lv->label = gtk_label_new(NULL); | 605 lv->label = gtk_label_new(NULL); |
| 602 | 606 |
| 603 text = g_strdup_printf("<span size='larger' weight='bold'>%s</span>", title); | 607 text = g_strdup_printf("<span size='larger' weight='bold'>%s</span>", title); |
| 608 g_free(text); | 612 g_free(text); |
| 609 | 613 |
| 610 /* Pane *************/ | 614 /* Pane *************/ |
| 611 pane = gtk_hpaned_new(); | 615 pane = gtk_hpaned_new(); |
| 612 gtk_container_set_border_width(GTK_CONTAINER(pane), PIDGIN_HIG_BOX_SPACE); | 616 gtk_container_set_border_width(GTK_CONTAINER(pane), PIDGIN_HIG_BOX_SPACE); |
| 613 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lv->window)->vbox), pane, TRUE, TRUE, 0); | 617 gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))), |
| 618 pane, TRUE, TRUE, 0); | |
| 614 | 619 |
| 615 /* List *************/ | 620 /* List *************/ |
| 616 lv->treestore = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_POINTER); | 621 lv->treestore = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_POINTER); |
| 617 lv->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (lv->treestore)); | 622 lv->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (lv->treestore)); |
| 618 g_object_unref(G_OBJECT(lv->treestore)); | 623 g_object_unref(G_OBJECT(lv->treestore)); |
| 643 text = g_strdup_printf("<span weight='bold'>%s</span> %s", _("Total log size:"), sz_txt); | 648 text = g_strdup_printf("<span weight='bold'>%s</span> %s", _("Total log size:"), sz_txt); |
| 644 size_label = gtk_label_new(NULL); | 649 size_label = gtk_label_new(NULL); |
| 645 gtk_label_set_markup(GTK_LABEL(size_label), text); | 650 gtk_label_set_markup(GTK_LABEL(size_label), text); |
| 646 /* gtk_paned_add1(GTK_PANED(pane), size_label); */ | 651 /* gtk_paned_add1(GTK_PANED(pane), size_label); */ |
| 647 gtk_misc_set_alignment(GTK_MISC(size_label), 0, 0); | 652 gtk_misc_set_alignment(GTK_MISC(size_label), 0, 0); |
| 648 gtk_box_pack_end(GTK_BOX(GTK_DIALOG(lv->window)->vbox), size_label, FALSE, FALSE, 0); | 653 gtk_box_pack_end(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))), |
| 654 size_label, FALSE, FALSE, 0); | |
| 649 g_free(sz_txt); | 655 g_free(sz_txt); |
| 650 g_free(text); | 656 g_free(text); |
| 651 } | 657 } |
| 652 | 658 |
| 653 /* A fancy little box ************/ | 659 /* A fancy little box ************/ |
