Mercurial > pidgin.yaz
changeset 864:4a6ab6995439
[gaim-migrate @ 874]
Yo ho ho and a bottle of Rum!
committer: Tailor Script <tailor@pidgin.im>
| author | Rob Flynn <gaim@robflynn.com> |
|---|---|
| date | Fri, 08 Sep 2000 08:13:39 +0000 |
| parents | 55194c5f338f |
| children | 789b2f0bb133 |
| files | src/buddy.c src/buddy_chat.c src/conversation.c src/gaim.h src/prefs.c |
| diffstat | 5 files changed, 35 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buddy.c Fri Sep 08 06:52:35 2000 +0000 +++ b/src/buddy.c Fri Sep 08 08:13:39 2000 +0000 @@ -1827,9 +1827,10 @@ setmenu = gtk_menu_new(); gtk_widget_show(setmenu); - menuitem = gaim_new_item(menu, _("Settings"), NULL); + //menuitem = gaim_new_item(menu, _("Settings"), NULL); + menuitem = gaim_new_item_with_pixmap(menu, _("Settings"), prefs_small_xpm, NULL); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), setmenu); - gtk_widget_show(menuitem); + //gtk_widget_show(menuitem); menuitem = gtk_menu_item_new_with_label(_("User Info")); gtk_menu_append(GTK_MENU(setmenu), menuitem); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(show_set_info), NULL); @@ -1852,7 +1853,7 @@ #ifdef USE_PERL perlmenu = gtk_menu_new(); gtk_widget_show(perlmenu); - menuitem = gaim_new_item(menu, _("Perl"), NULL); + menuitem = gaim_new_item_with_pixmap(menu, _("Perl"), plugins_small_xpm, NULL); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), perlmenu); gtk_widget_show(menuitem); menuitem = gtk_menu_item_new_with_label(_("Load Script")); @@ -1876,7 +1877,7 @@ gtk_menu_item_right_justify(GTK_MENU_ITEM(menuitem)); gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem); - gaim_new_item(menu, _("About"), show_about); + gaim_new_item(menu, _("About Gaim"), show_about); gtk_widget_show(menubar);
--- a/src/buddy_chat.c Fri Sep 08 06:52:35 2000 +0000 +++ b/src/buddy_chat.c Fri Sep 08 08:13:39 2000 +0000 @@ -663,7 +663,11 @@ gtk_widget_show( vpaned ); gtk_widget_show( hpaned ); gtk_widget_show(chatentry); - gtk_widget_set_usize(chatentry, 320, 25); + + if (display_options & OPT_DISP_CHAT_BIG_ENTRY) + gtk_widget_set_usize(chatentry, 320, 50); + else + gtk_widget_set_usize(chatentry, 320, 25); gtk_container_add(GTK_CONTAINER(win),vpaned); gtk_container_border_width(GTK_CONTAINER(win), 10);
--- a/src/conversation.c Fri Sep 08 06:52:35 2000 +0000 +++ b/src/conversation.c Fri Sep 08 08:13:39 2000 +0000 @@ -1728,7 +1728,11 @@ gtk_signal_connect(GTK_OBJECT(block), "clicked", GTK_SIGNAL_FUNC(block_callback), c); gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(keypress_callback), c); - gtk_widget_set_usize(entry, 300, 25); + + if (display_options & OPT_DISP_CONV_BIG_ENTRY) + gtk_widget_set_usize(entry, 300, 50); + else + gtk_widget_set_usize(entry, 300, 25); gtk_box_pack_end(GTK_BOX(bbox), close, dispstyle, dispstyle, 0); sep = gtk_vseparator_new();
--- a/src/gaim.h Fri Sep 08 06:52:35 2000 +0000 +++ b/src/gaim.h Fri Sep 08 08:13:39 2000 +0000 @@ -408,7 +408,7 @@ #define TYPE_SIGNOFF 4 #define TYPE_KEEPALIVE 5 -#define REVISION "gaim:$Revision: 868 $" +#define REVISION "gaim:$Revision: 874 $" #define FLAPON "FLAPON\r\n\r\n" #define ROAST "Tic/Toc" @@ -494,22 +494,24 @@ extern int USE_OSCAR; extern int display_options; -#define OPT_DISP_SHOW_TIME 0x00000001 -#define OPT_DISP_SHOW_GRPNUM 0x00000002 -#define OPT_DISP_SHOW_PIXMAPS 0x00000004 -#define OPT_DISP_SHOW_IDLETIME 0x00000008 -#define OPT_DISP_SHOW_BUTTON_XPM 0x00000010 -#define OPT_DISP_IGNORE_COLOUR 0x00000020 -#define OPT_DISP_SHOW_LOGON 0x00000040 -#define OPT_DISP_DEVIL_PIXMAPS 0x00000080 -#define OPT_DISP_SHOW_SMILEY 0x00000100 +#define OPT_DISP_SHOW_TIME 0x00000001 +#define OPT_DISP_SHOW_GRPNUM 0x00000002 +#define OPT_DISP_SHOW_PIXMAPS 0x00000004 +#define OPT_DISP_SHOW_IDLETIME 0x00000008 +#define OPT_DISP_SHOW_BUTTON_XPM 0x00000010 +#define OPT_DISP_IGNORE_COLOUR 0x00000020 +#define OPT_DISP_SHOW_LOGON 0x00000040 +#define OPT_DISP_DEVIL_PIXMAPS 0x00000080 +#define OPT_DISP_SHOW_SMILEY 0x00000100 #define OPT_DISP_SHOW_BUDDYTICKER 0x00000200 -#define OPT_DISP_COOL_LOOK 0x00000400 -#define OPT_DISP_CHAT_LOGON 0x00000800 -#define OPT_DISP_IGN_WHITE 0x00001000 -#define OPT_DISP_NO_BUTTONS 0x00002000 -#define OPT_DISP_CONV_SHOW_TEXT 0x00004000 -#define OPT_DISP_CHAT_SHOW_TEXT 0x00008000 +#define OPT_DISP_COOL_LOOK 0x00000400 +#define OPT_DISP_CHAT_LOGON 0x00000800 +#define OPT_DISP_IGN_WHITE 0x00001000 +#define OPT_DISP_NO_BUTTONS 0x00002000 +#define OPT_DISP_CONV_SHOW_TEXT 0x00004000 +#define OPT_DISP_CHAT_SHOW_TEXT 0x00008000 +#define OPT_DISP_CONV_BIG_ENTRY 0x00010000 +#define OPT_DISP_CHAT_BIG_ENTRY 0x00020000 extern int sound_options; #define OPT_SOUND_LOGIN 0x00000001
--- a/src/prefs.c Fri Sep 08 06:52:35 2000 +0000 +++ b/src/prefs.c Fri Sep 08 08:13:39 2000 +0000 @@ -676,6 +676,7 @@ gaim_button(_("Show logins in window"), &display_options, OPT_DISP_SHOW_LOGON, box); gaim_button(_("Show buttons with text"), &display_options, OPT_DISP_CONV_SHOW_TEXT, box); + gaim_button(_("Show larger entry box on new windows"), &display_options, OPT_DISP_CONV_BIG_ENTRY, box); gaim_button(_("Raise windows on events"), &general_options, OPT_GEN_POPUP_WINDOWS, box); gaim_button(_("Ignore new conversations when away"), &general_options, OPT_GEN_DISCARD_WHEN_AWAY, box); gaim_button(_("Ignore TiK Automated Messages"), &general_options, OPT_GEN_TIK_HACK, box); @@ -705,6 +706,7 @@ gaim_button(_("Show people joining/leaving in window"), &display_options, OPT_DISP_CHAT_LOGON, box); gaim_button(_("Show buttons with text"), &display_options, OPT_DISP_CHAT_SHOW_TEXT, box); + gaim_button(_("Show larger entry box on new windows"), &display_options, OPT_DISP_CHAT_BIG_ENTRY, box); gaim_button(_("Raise windows on events"), &general_options, OPT_GEN_POPUP_CHAT, box); gtk_widget_show(prefdialog);