Revision 1553 src/addressbook.c

addressbook.c (revision 1553)
162 162
						 gpointer	 data);
163 163
static void addressbook_lup_clicked		(GtkButton	*button,
164 164
						 gpointer	data);
165
static void addressbook_close_clicked		(GtkButton	*button,
166
						 gpointer	data);
165 167

  
166 168
static void addressbook_tree_selected		(GtkCTree	*ctree,
167 169
						 GtkCTreeNode	*node,
......
488 490
	GtkWidget *entry;
489 491
	GtkWidget *statusbar;
490 492
	GtkWidget *hbbox;
493
	GtkWidget *hbbox1;
494
	GtkWidget *hbbox2;
491 495
	GtkWidget *hsbox;
496
	GtkWidget *to_btn;
497
	GtkWidget *cc_btn;
498
	GtkWidget *bcc_btn;
492 499
	GtkWidget *del_btn;
493 500
	GtkWidget *reg_btn;
494 501
	GtkWidget *lup_btn;
495
	GtkWidget *to_btn;
496
	GtkWidget *cc_btn;
497
	GtkWidget *bcc_btn;
502
	GtkWidget *close_btn;
498 503
	GtkWidget *tree_popup;
499 504
	GtkWidget *list_popup;
500 505
	GtkItemFactory *tree_factory;
......
516 521
	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
517 522
	gtk_window_set_title(GTK_WINDOW(window), _("Address book"));
518 523
	gtk_window_set_wmclass(GTK_WINDOW(window), "addressbook", "Sylpheed");
519
	gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
520
	gtk_widget_set_size_request(window, prefs_common.addressbook_width,
524
	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
525
	gtk_widget_set_size_request(window, 620, 360);
526
	gtk_window_set_default_size(GTK_WINDOW(window),
527
				    prefs_common.addressbook_width,
521 528
				    prefs_common.addressbook_height);
522 529
	gtk_window_move(GTK_WINDOW(window), prefs_common.addressbook_x,
523 530
			prefs_common.addressbook_y);
......
645 652
	statusbar = gtk_statusbar_new();
646 653
	gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, 0);
647 654

  
648
	/* Button panel */
649
	hbbox = gtk_hbutton_box_new();
650
	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
651
	gtk_box_set_spacing(GTK_BOX(hbbox), 4);
652
	gtk_container_set_border_width(GTK_CONTAINER(hbbox), 4);
655
	hbbox = gtk_hbox_new(FALSE, 4);
653 656
	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
654 657

  
655
	del_btn = gtk_button_new_with_label(_("Delete"));
656
	GTK_WIDGET_SET_FLAGS(del_btn, GTK_CAN_DEFAULT);
657
	gtk_box_pack_start(GTK_BOX(hbbox), del_btn, TRUE, TRUE, 0);
658
	reg_btn = gtk_button_new_with_label(_("Add"));
659
	GTK_WIDGET_SET_FLAGS(reg_btn, GTK_CAN_DEFAULT);
660
	gtk_box_pack_start(GTK_BOX(hbbox), reg_btn, TRUE, TRUE, 0);
661
	lup_btn = gtk_button_new_with_label(_("Lookup"));
662
	GTK_WIDGET_SET_FLAGS(lup_btn, GTK_CAN_DEFAULT);
663
	gtk_box_pack_start(GTK_BOX(hbbox), lup_btn, TRUE, TRUE, 0);
658
	/* Button panel */
659
	hbbox1 = gtk_hbutton_box_new();
660
	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox1), GTK_BUTTONBOX_END);
661
	gtk_box_set_spacing(GTK_BOX(hbbox1), 4);
662
	gtk_container_set_border_width(GTK_CONTAINER(hbbox1), 4);
663
	gtk_button_box_set_child_size(GTK_BUTTON_BOX(hbbox1), 64, -1);
664
	gtk_box_pack_end(GTK_BOX(hbbox), hbbox1, FALSE, FALSE, 0);
664 665

  
665
	g_signal_connect(G_OBJECT(del_btn), "clicked",
666
			 G_CALLBACK(addressbook_del_clicked), NULL);
667
	g_signal_connect(G_OBJECT(reg_btn), "clicked",
668
			 G_CALLBACK(addressbook_reg_clicked), NULL);
669
	g_signal_connect(G_OBJECT(lup_btn), "clicked",
670
			 G_CALLBACK(addressbook_lup_clicked), NULL);
671

  
672 666
	to_btn = gtk_button_new_with_label
673 667
		(prefs_common.trans_hdr ? _("To:") : "To:");
674 668
	GTK_WIDGET_SET_FLAGS(to_btn, GTK_CAN_DEFAULT);
675
	gtk_box_pack_start(GTK_BOX(hbbox), to_btn, TRUE, TRUE, 0);
669
	gtk_box_pack_start(GTK_BOX(hbbox1), to_btn, TRUE, TRUE, 0);
676 670
	cc_btn = gtk_button_new_with_label
677 671
		(prefs_common.trans_hdr ? _("Cc:") : "Cc:");
678 672
	GTK_WIDGET_SET_FLAGS(cc_btn, GTK_CAN_DEFAULT);
679
	gtk_box_pack_start(GTK_BOX(hbbox), cc_btn, TRUE, TRUE, 0);
673
	gtk_box_pack_start(GTK_BOX(hbbox1), cc_btn, TRUE, TRUE, 0);
680 674
	bcc_btn = gtk_button_new_with_label
681 675
		(prefs_common.trans_hdr ? _("Bcc:") : "Bcc:");
682 676
	GTK_WIDGET_SET_FLAGS(bcc_btn, GTK_CAN_DEFAULT);
683
	gtk_box_pack_start(GTK_BOX(hbbox), bcc_btn, TRUE, TRUE, 0);
677
	gtk_box_pack_start(GTK_BOX(hbbox1), bcc_btn, TRUE, TRUE, 0);
684 678

  
685 679
	g_signal_connect(G_OBJECT(to_btn), "clicked",
686 680
			 G_CALLBACK(addressbook_to_clicked),
......
692 686
			 G_CALLBACK(addressbook_to_clicked),
693 687
			 GINT_TO_POINTER(COMPOSE_ENTRY_BCC));
694 688

  
689
	hbbox2 = gtk_hbutton_box_new();
690
	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox2), GTK_BUTTONBOX_END);
691
	gtk_box_set_spacing(GTK_BOX(hbbox2), 4);
692
	gtk_container_set_border_width(GTK_CONTAINER(hbbox2), 4);
693
	gtk_button_box_set_child_size(GTK_BUTTON_BOX(hbbox2), 64, -1);
694
	gtk_box_pack_end(GTK_BOX(hbbox), hbbox2, TRUE, TRUE, 0);
695

  
696
	del_btn = gtk_button_new_with_label(_("Delete"));
697
	GTK_WIDGET_SET_FLAGS(del_btn, GTK_CAN_DEFAULT);
698
	gtk_box_pack_start(GTK_BOX(hbbox2), del_btn, TRUE, TRUE, 0);
699
	reg_btn = gtk_button_new_with_label(_("Add"));
700
	GTK_WIDGET_SET_FLAGS(reg_btn, GTK_CAN_DEFAULT);
701
	gtk_box_pack_start(GTK_BOX(hbbox2), reg_btn, TRUE, TRUE, 0);
702
	lup_btn = gtk_button_new_with_label(_("Lookup"));
703
	GTK_WIDGET_SET_FLAGS(lup_btn, GTK_CAN_DEFAULT);
704
	gtk_box_pack_start(GTK_BOX(hbbox2), lup_btn, TRUE, TRUE, 0);
705
	close_btn = gtk_button_new_with_mnemonic(_("_Close"));
706
	GTK_WIDGET_SET_FLAGS(close_btn, GTK_CAN_DEFAULT);
707
	gtk_box_pack_start(GTK_BOX(hbbox2), close_btn, TRUE, TRUE, 0);
708
	gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(hbbox2), close_btn,
709
					   TRUE);
710

  
711
	g_signal_connect(G_OBJECT(del_btn), "clicked",
712
			 G_CALLBACK(addressbook_del_clicked), NULL);
713
	g_signal_connect(G_OBJECT(reg_btn), "clicked",
714
			 G_CALLBACK(addressbook_reg_clicked), NULL);
715
	g_signal_connect(G_OBJECT(lup_btn), "clicked",
716
			 G_CALLBACK(addressbook_lup_clicked), NULL);
717
	g_signal_connect(G_OBJECT(close_btn), "clicked",
718
			 G_CALLBACK(addressbook_close_clicked), NULL);
719

  
695 720
	/* Build icons for interface */
696 721
	stock_pixmap_gdk( window, STOCK_PIXMAP_INTERFACE,
697 722
			  &interfacexpm, &interfacexpmmask );
......
745 770
	addrbook.statusbar = statusbar;
746 771
	addrbook.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Addressbook Window" );
747 772

  
773
	addrbook.to_btn  = to_btn;
774
	addrbook.cc_btn  = cc_btn;
775
	addrbook.bcc_btn = bcc_btn;
748 776
	addrbook.del_btn = del_btn;
749 777
	addrbook.reg_btn = reg_btn;
750 778
	addrbook.lup_btn = lup_btn;
751
	addrbook.to_btn  = to_btn;
752
	addrbook.cc_btn  = cc_btn;
753
	addrbook.bcc_btn = bcc_btn;
779
	addrbook.close_btn = close_btn;
754 780

  
755 781
	addrbook.tree_popup   = tree_popup;
756 782
	addrbook.list_popup   = list_popup;
......
3087 3113
	g_free( sLookup );
3088 3114
}
3089 3115

  
3116
static void addressbook_close_clicked(GtkButton	*button, gpointer data)
3117
{
3118
	addressbook_close();
3119
}
3120

  
3090 3121
/* **********************************************************************
3091 3122
* Build lookup tables.
3092 3123
* ***********************************************************************

Also available in: Unified diff