pidgin/gtklog.c

branch
cpw.qulogic.gtk3-required
changeset 33120
f6f1a27ade72
parent 32520
93814958369f
parent 32424
be4a642b2d45
child 33132
24afd2b22579
equal deleted inserted replaced
32771:681ca041d42b 33120:f6f1a27ade72
573 #ifdef _WIN32 573 #ifdef _WIN32
574 /* Steal the "HELP" response and use it to trigger browsing to the logs folder */ 574 /* Steal the "HELP" response and use it to trigger browsing to the logs folder */
575 gtk_dialog_add_button(GTK_DIALOG(lv->window), _("_Browse logs folder"), GTK_RESPONSE_HELP); 575 gtk_dialog_add_button(GTK_DIALOG(lv->window), _("_Browse logs folder"), GTK_RESPONSE_HELP);
576 #endif 576 #endif
577 gtk_container_set_border_width (GTK_CONTAINER(lv->window), PIDGIN_HIG_BOX_SPACE); 577 gtk_container_set_border_width (GTK_CONTAINER(lv->window), PIDGIN_HIG_BOX_SPACE);
578 /* TODO: is it possible to set this in GTK+ 3.0? */
579 #if 0
578 gtk_dialog_set_has_separator(GTK_DIALOG(lv->window), FALSE); 580 gtk_dialog_set_has_separator(GTK_DIALOG(lv->window), FALSE);
579 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(lv->window)->vbox), 0); 581 #endif
582 gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))), 0);
580 g_signal_connect(G_OBJECT(lv->window), "response", 583 g_signal_connect(G_OBJECT(lv->window), "response",
581 G_CALLBACK(destroy_cb), ht); 584 G_CALLBACK(destroy_cb), ht);
582 gtk_window_set_role(GTK_WINDOW(lv->window), "log_viewer"); 585 gtk_window_set_role(GTK_WINDOW(lv->window), "log_viewer");
583 586
584 /* Icon *************/ 587 /* Icon *************/
585 if (icon != NULL) { 588 if (icon != NULL) {
586 title_box = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); 589 title_box = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
587 gtk_container_set_border_width(GTK_CONTAINER(title_box), PIDGIN_HIG_BOX_SPACE); 590 gtk_container_set_border_width(GTK_CONTAINER(title_box), PIDGIN_HIG_BOX_SPACE);
588 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lv->window)->vbox), title_box, FALSE, FALSE, 0); 591 gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))),
592 title_box, FALSE, FALSE, 0);
589 593
590 gtk_box_pack_start(GTK_BOX(title_box), icon, FALSE, FALSE, 0); 594 gtk_box_pack_start(GTK_BOX(title_box), icon, FALSE, FALSE, 0);
591 } else 595 } else
592 title_box = GTK_DIALOG(lv->window)->vbox; 596 title_box = gtk_dialog_get_content_area(GTK_DIALOG(lv->window));
593 597
594 /* Label ************/ 598 /* Label ************/
595 lv->label = gtk_label_new(NULL); 599 lv->label = gtk_label_new(NULL);
596 600
597 text = g_strdup_printf("<span size='larger' weight='bold'>%s</span>", title); 601 text = g_strdup_printf("<span size='larger' weight='bold'>%s</span>", title);
602 g_free(text); 606 g_free(text);
603 607
604 /* Pane *************/ 608 /* Pane *************/
605 pane = gtk_hpaned_new(); 609 pane = gtk_hpaned_new();
606 gtk_container_set_border_width(GTK_CONTAINER(pane), PIDGIN_HIG_BOX_SPACE); 610 gtk_container_set_border_width(GTK_CONTAINER(pane), PIDGIN_HIG_BOX_SPACE);
607 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lv->window)->vbox), pane, TRUE, TRUE, 0); 611 gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))),
612 pane, TRUE, TRUE, 0);
608 613
609 /* List *************/ 614 /* List *************/
610 lv->treestore = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_POINTER); 615 lv->treestore = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
611 lv->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (lv->treestore)); 616 lv->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (lv->treestore));
612 g_object_unref(G_OBJECT(lv->treestore)); 617 g_object_unref(G_OBJECT(lv->treestore));
637 text = g_strdup_printf("<span weight='bold'>%s</span> %s", _("Total log size:"), sz_txt); 642 text = g_strdup_printf("<span weight='bold'>%s</span> %s", _("Total log size:"), sz_txt);
638 size_label = gtk_label_new(NULL); 643 size_label = gtk_label_new(NULL);
639 gtk_label_set_markup(GTK_LABEL(size_label), text); 644 gtk_label_set_markup(GTK_LABEL(size_label), text);
640 /* gtk_paned_add1(GTK_PANED(pane), size_label); */ 645 /* gtk_paned_add1(GTK_PANED(pane), size_label); */
641 gtk_misc_set_alignment(GTK_MISC(size_label), 0, 0); 646 gtk_misc_set_alignment(GTK_MISC(size_label), 0, 0);
642 gtk_box_pack_end(GTK_BOX(GTK_DIALOG(lv->window)->vbox), size_label, FALSE, FALSE, 0); 647 gtk_box_pack_end(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))),
648 size_label, FALSE, FALSE, 0);
643 g_free(sz_txt); 649 g_free(sz_txt);
644 g_free(text); 650 g_free(text);
645 } 651 }
646 652
647 /* A fancy little box ************/ 653 /* A fancy little box ************/

mercurial