comparison: src/buddy.c
src/buddy.c
- changeset 718
- aedba1b670a7
- parent 714
- e2bbd9c83f6d
- child 719
- 8e73200db133
equal
deleted
inserted
replaced
| 717:acdd0019f9f8 | 718:aedba1b670a7 |
|---|---|
| 64 #include "pixmaps/daemon-info.xpm" | 64 #include "pixmaps/daemon-info.xpm" |
| 65 #include "pixmaps/daemon-permadd.xpm" | 65 #include "pixmaps/daemon-permadd.xpm" |
| 66 #include "pixmaps/daemon-permdel.xpm" | 66 #include "pixmaps/daemon-permdel.xpm" |
| 67 | 67 |
| 68 #include "pixmaps/add_small.xpm" | 68 #include "pixmaps/add_small.xpm" |
| 69 #include "pixmaps/import_small.xpm" | |
| 69 | 70 |
| 70 static GtkTooltips *tips; | 71 static GtkTooltips *tips; |
| 71 static GtkWidget *editpane; | 72 static GtkWidget *editpane; |
| 72 static GtkWidget *buddypane; | 73 static GtkWidget *buddypane; |
| 73 static GtkWidget *imchatbox; | 74 static GtkWidget *imchatbox; |
| 1721 | 1722 |
| 1722 menuitem = gtk_menu_item_new(); | 1723 menuitem = gtk_menu_item_new(); |
| 1723 gtk_widget_show(menuitem); | 1724 gtk_widget_show(menuitem); |
| 1724 | 1725 |
| 1725 /* Create our container */ | 1726 /* Create our container */ |
| 1726 hbox = gtk_hbox_new(FALSE, 5); | 1727 hbox = gtk_hbox_new(FALSE, 2); |
| 1728 | |
| 1729 /* Create our pixmap and pack it */ | |
| 1730 pm = gdk_pixmap_create_from_xpm_d(menu->parent->window, &mask, NULL, xpm); | |
| 1731 | |
| 1732 pixmap = gtk_pixmap_new(pm, mask); | |
| 1733 gtk_widget_show(pixmap); | |
| 1734 | |
| 1735 gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE, 2); | |
| 1727 | 1736 |
| 1728 /* Create our label and pack it */ | 1737 /* Create our label and pack it */ |
| 1738 | |
| 1729 label = gtk_label_new(str); | 1739 label = gtk_label_new(str); |
| 1730 gtk_widget_show(label); | 1740 gtk_widget_show(label); |
| 1731 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5); | 1741 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2); |
| 1732 | 1742 |
| 1733 | |
| 1734 /* Create our pixmap and pack it */ | |
| 1735 pm = gdk_pixmap_create_from_xpm_d(menu->parent->window, &mask, NULL, xpm); | |
| 1736 | |
| 1737 pixmap = gtk_pixmap_new(pm, mask); | |
| 1738 gtk_widget_show(pixmap); | |
| 1739 | |
| 1740 gtk_box_pack_end(GTK_BOX(hbox), pixmap, FALSE, FALSE, 5); | |
| 1741 | |
| 1742 | |
| 1743 /* And finally, pack our box within our menu item */ | 1743 /* And finally, pack our box within our menu item */ |
| 1744 | 1744 |
| 1745 gtk_container_add(GTK_CONTAINER(menuitem), hbox); | 1745 gtk_container_add(GTK_CONTAINER(menuitem), hbox); |
| 1746 gtk_widget_show(hbox); | 1746 gtk_widget_show(hbox); |
| 1747 | 1747 |
| 1842 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); | 1842 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); |
| 1843 gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem); | 1843 gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem); |
| 1844 | 1844 |
| 1845 // gaim_new_item(menu, _("Add A Buddy"), GTK_SIGNAL_FUNC(add_buddy_callback)); | 1845 // gaim_new_item(menu, _("Add A Buddy"), GTK_SIGNAL_FUNC(add_buddy_callback)); |
| 1846 gaim_new_item_with_pixmap(menu, _("Add A Buddy"), add_small_xpm, GTK_SIGNAL_FUNC(add_buddy_callback)); | 1846 gaim_new_item_with_pixmap(menu, _("Add A Buddy"), add_small_xpm, GTK_SIGNAL_FUNC(add_buddy_callback)); |
| 1847 gaim_new_item(menu, _("Join A Chat"), GTK_SIGNAL_FUNC(chat_callback)); | 1847 gaim_new_item_with_pixmap(menu, _("Join A Chat"), add_small_xpm, GTK_SIGNAL_FUNC(chat_callback)); |
| 1848 gaim_seperator(menu); | 1848 gaim_seperator(menu); |
| 1849 gaim_new_item(menu, _("Import Buddy List"), GTK_SIGNAL_FUNC(import_callback)); | 1849 gaim_new_item_with_pixmap(menu, _("Import Buddy List"), import_small_xpm, GTK_SIGNAL_FUNC(import_callback)); |
| 1850 gaim_new_item(menu, _("Export Buddy List"), GTK_SIGNAL_FUNC(export_callback)); | 1850 gaim_new_item_with_pixmap(menu, _("Export Buddy List"), add_small_xpm,GTK_SIGNAL_FUNC(export_callback)); |
| 1851 if (!(general_options & OPT_GEN_REGISTERED)) | 1851 if (!(general_options & OPT_GEN_REGISTERED)) |
| 1852 { | 1852 { |
| 1853 gaim_seperator(menu); | 1853 gaim_seperator(menu); |
| 1854 gaim_new_item(menu, _("Register"), GTK_SIGNAL_FUNC(gaimreg_callback)); | 1854 gaim_new_item_with_pixmap(menu, _("Register"), add_small_xpm, GTK_SIGNAL_FUNC(gaimreg_callback)); |
| 1855 } | 1855 } |
| 1856 gaim_seperator(menu); | 1856 gaim_seperator(menu); |
| 1857 gaim_new_item(menu, _("Signoff"), GTK_SIGNAL_FUNC(signoff)); | 1857 gaim_new_item_with_pixmap(menu, _("Signoff"), add_small_xpm, GTK_SIGNAL_FUNC(signoff)); |
| 1858 | 1858 |
| 1859 #ifndef USE_APPLET | 1859 #ifndef USE_APPLET |
| 1860 gaim_new_item(menu, _("Quit"), GTK_SIGNAL_FUNC(do_quit)); | 1860 gaim_new_item_with_pixmap(menu, _("Quit"), add_small_xpm, GTK_SIGNAL_FUNC(do_quit)); |
| 1861 #else | 1861 #else |
| 1862 gaim_new_item(menu, _("Close"), GTK_SIGNAL_FUNC(applet_destroy_buddy)); | 1862 gaim_new_item_with_pixmap(menu, _("Close"), add_small_xpm, GTK_SIGNAL_FUNC(applet_destroy_buddy)); |
| 1863 #endif | 1863 #endif |
| 1864 | 1864 |
| 1865 menu = gtk_menu_new(); | 1865 menu = gtk_menu_new(); |
| 1866 | 1866 |
| 1867 menuitem = gaim_new_item(NULL, _("Tools"), NULL); | 1867 menuitem = gaim_new_item(NULL, _("Tools"), NULL); |
