comparison src/conversation.c @ 81:7a24bb75a97b

[gaim-migrate @ 91] Paned Conversation Window & Raise Message on Receive now works properly. Thanks, Syd Logan! committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Wed, 05 Apr 2000 07:21:34 +0000
parents bfdc427b936d
children 78166fb457f1
comparison
equal deleted inserted replaced
80:b826e294f40a 81:7a24bb75a97b
767 gdk_window_set_icon(c->window->window, NULL, dark_icon_pm, dark_icon_bm); 767 gdk_window_set_icon(c->window->window, NULL, dark_icon_pm, dark_icon_bm);
768 } 768 }
769 */ 769 */
770 770
771 if (general_options & OPT_GEN_POPUP_WINDOWS) 771 if (general_options & OPT_GEN_POPUP_WINDOWS)
772 gdk_window_raise(c->window->window); 772 gdk_window_show(c->window->window);
773 773
774 774
775 g_free(buf); 775 g_free(buf);
776 g_free(buf2); 776 g_free(buf2);
777 } 777 }
794 GtkWidget *close; 794 GtkWidget *close;
795 GtkWidget *entry; 795 GtkWidget *entry;
796 GtkWidget *toolbar; 796 GtkWidget *toolbar;
797 GtkWidget *bbox; 797 GtkWidget *bbox;
798 GtkWidget *vbox; 798 GtkWidget *vbox;
799 GtkWidget *vbox2;
800 GtkWidget *paned;
799 GtkWidget *add; 801 GtkWidget *add;
800 GdkPixmap *strike_i, *small_i, *normal_i, *big_i, *bold_i, *italic_i, *underline_i, *speaker_i, *wood_i, *palette_i, *link_i; 802 GdkPixmap *strike_i, *small_i, *normal_i, *big_i, *bold_i, *italic_i, *underline_i, *speaker_i, *wood_i, *palette_i, *link_i;
801 GtkWidget *strike_p, *small_p, *normal_p, *big_p, *bold_p, *italic_p, *underline_p, *speaker_p, *wood_p, *palette_p, *link_p; 803 GtkWidget *strike_p, *small_p, *normal_p, *big_p, *bold_p, *italic_p, *underline_p, *speaker_p, *wood_p, *palette_p, *link_p;
802 GtkWidget *strike, *small, *normal, *big, *bold, *italic, *underline, *speaker, *wood, *palette, *link; 804 GtkWidget *strike, *small, *normal, *big, *bold, *italic, *underline, *speaker, *wood, *palette, *link;
803 GdkBitmap *mask; 805 GdkBitmap *mask;
825 block = gtk_button_new_with_label("Block"); 827 block = gtk_button_new_with_label("Block");
826 828
827 829
828 bbox = gtk_hbox_new(TRUE, 0); 830 bbox = gtk_hbox_new(TRUE, 0);
829 vbox = gtk_vbox_new(FALSE, 0); 831 vbox = gtk_vbox_new(FALSE, 0);
830 832 vbox2 = gtk_vbox_new(FALSE, 0);
833 paned = gtk_vpaned_new();
834
835 gtk_paned_pack1(GTK_PANED(paned), vbox, FALSE, TRUE);
836 gtk_paned_pack2(GTK_PANED(paned), vbox2, FALSE, FALSE);
837 gtk_widget_show(vbox2);
838 gtk_widget_show(paned);
839
831 entry = gtk_text_new(NULL, NULL); 840 entry = gtk_text_new(NULL, NULL);
832 gtk_text_set_editable(GTK_TEXT(entry), TRUE); 841 gtk_text_set_editable(GTK_TEXT(entry), TRUE);
833 gtk_text_set_word_wrap(GTK_TEXT(entry), TRUE); 842 gtk_text_set_word_wrap(GTK_TEXT(entry), TRUE);
834 843
835 /* Toolbar */ 844 /* Toolbar */
991 gtk_signal_connect(GTK_OBJECT(warn), "clicked", GTK_SIGNAL_FUNC(warn_callback), c); 1000 gtk_signal_connect(GTK_OBJECT(warn), "clicked", GTK_SIGNAL_FUNC(warn_callback), c);
992 gtk_signal_connect(GTK_OBJECT(block), "clicked", GTK_SIGNAL_FUNC(block_callback), c); 1001 gtk_signal_connect(GTK_OBJECT(block), "clicked", GTK_SIGNAL_FUNC(block_callback), c);
993 gtk_signal_connect(GTK_OBJECT(color), "clicked", GTK_SIGNAL_FUNC(color_callback), c); 1002 gtk_signal_connect(GTK_OBJECT(color), "clicked", GTK_SIGNAL_FUNC(color_callback), c);
994 1003
995 gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(user_keypress_callback), c); 1004 gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(user_keypress_callback), c);
996 gtk_widget_set_usize(entry, 300, 70); 1005 gtk_widget_set_usize(entry, 300, 25);
997 1006
998 gtk_box_pack_start(GTK_BOX(bbox), send, TRUE, TRUE, 5); 1007 gtk_box_pack_start(GTK_BOX(bbox), send, TRUE, TRUE, 5);
999 gtk_box_pack_start(GTK_BOX(bbox), info, TRUE, TRUE, 5); 1008 gtk_box_pack_start(GTK_BOX(bbox), info, TRUE, TRUE, 5);
1000 gtk_box_pack_start(GTK_BOX(bbox), warn, TRUE, TRUE, 5); 1009 gtk_box_pack_start(GTK_BOX(bbox), warn, TRUE, TRUE, 5);
1001 gtk_box_pack_start(GTK_BOX(bbox), block, TRUE, TRUE, 5); 1010 gtk_box_pack_start(GTK_BOX(bbox), block, TRUE, TRUE, 5);
1004 gtk_box_pack_start(GTK_BOX(bbox), close, TRUE, TRUE, 5); 1013 gtk_box_pack_start(GTK_BOX(bbox), close, TRUE, TRUE, 5);
1005 1014
1006 /* pack and fill the rest */ 1015 /* pack and fill the rest */
1007 1016
1008 gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 5); 1017 gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 5);
1009 gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 5); 1018 gtk_box_pack_start(GTK_BOX(vbox2), toolbar, FALSE, FALSE, 5);
1010 gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 5); 1019 gtk_box_pack_start(GTK_BOX(vbox2), entry, TRUE, TRUE, 5);
1011 gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 5); 1020 gtk_box_pack_start(GTK_BOX(vbox2), bbox, FALSE, FALSE, 5);
1012 1021
1013 1022
1014 1023
1015 1024
1016 gtk_widget_show(send); 1025 gtk_widget_show(send);
1024 gtk_widget_show(vbox); 1033 gtk_widget_show(vbox);
1025 gtk_widget_show(entry); 1034 gtk_widget_show(entry);
1026 gtk_widget_show(text); 1035 gtk_widget_show(text);
1027 1036
1028 1037
1029 gtk_container_add(GTK_CONTAINER(win), vbox); 1038 gtk_container_add(GTK_CONTAINER(win), paned);
1030 gtk_container_border_width(GTK_CONTAINER(win), 10); 1039 gtk_container_border_width(GTK_CONTAINER(win), 10);
1031 1040
1032 if ((find_log_info(c->name)) || ((general_options & OPT_GEN_LOG_ALL))) 1041 if ((find_log_info(c->name)) || ((general_options & OPT_GEN_LOG_ALL)))
1033 g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, c->name); 1042 g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, c->name);
1034 else 1043 else