Mercurial > pidgin

changeset 801:1a47432e2ba1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 811] 8-) committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Wed, 30 Aug 2000 21:32:44 +0000
parents 022048cde898
children 1afe98d2461e
files pixmaps/Makefile.am pixmaps/gnome_preferences.xpm pixmaps/plugins_small.xpm pixmaps/prefs_small.xpm pixmaps/search_small.xpm src/buddy.c src/conversation.c
diffstat 7 files changed, 399 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/pixmaps/Makefile.am	Wed Aug 30 19:45:01 2000 +0000
+++ b/pixmaps/Makefile.am	Wed Aug 30 21:32:44 2000 +0000
@@ -66,10 +66,13 @@
 		peng_wink.xpm			\
 		permadd.xpm			\
 		permdel.xpm			\
+		plugins_small.xpm		\
+		prefs_small.xpm			\
 		refresh.xpm			\
 		sad.xpm				\
 		save.xpm			\
 		scream.xpm			\
+		search_small.xpm		\
 		signing_on.xpm			\
 		small.xpm			\
 		smile.xpm			\
--- a/pixmaps/gnome_preferences.xpm	Wed Aug 30 19:45:01 2000 +0000
+++ b/pixmaps/gnome_preferences.xpm	Wed Aug 30 21:32:44 2000 +0000
@@ -1,6 +1,6 @@
 /* XPM */
 static char * gnome_preferences_xpm[] = {
-"24 24 53 1",
+"22 24 53 1",
 " 	c None",
 ".	c #000000",
 "+	c #E5E5E5",
@@ -54,27 +54,27 @@
 "l	c #DADAD4",
 "m	c #DADAD9",
 "n	c #DADADA",
-"                        ",
-"                        ",
-"                        ",
-"             ..         ",
-"           ..+@.     .  ",
-"         ..#+++.    .$. ",
-"      ...%+++++&.  .$*. ",
-"    ..#++++=+-++. .$*.  ",
-"   .%++++;+>+=,+'.$*.   ",
-"   .)++++!~+{,++.$*.    ",
-"    .++]^/+(+++.$*.     ",
-"    .%_:<[++++.$*.>.    ",
-"     .+}|/+++.$*.=+1.   ",
-"     .)+++++.2*.>3456.  ",
-"      .+++]78..90000a.  ",
-"      .%+bcd.ee0000f.   ",
-"       .+0ghijkl+m..    ",
-"       .)+++++++f.      ",
-"        .++++++..       ",
-"        .%+++f.         ",
-"         .+n..          ",
-"          ..            ",
-"                        ",
-"                        "};
+"                      ",
+"                      ",
+"                      ",
+"           ..         ",
+"         ..+@.     .  ",
+"       ..#+++.    .$. ",
+"    ...%+++++&.  .$*. ",
+"  ..#++++=+-++. .$*.  ",
+" .%++++;+>+=,+'.$*.   ",
+" .)++++!~+{,++.$*.    ",
+"  .++]^/+(+++.$*.     ",
+"  .%_:<[++++.$*.>.    ",
+"   .+}|/+++.$*.=+1.   ",
+"   .)+++++.2*.>3456.  ",
+"    .+++]78..90000a.  ",
+"    .%+bcd.ee0000f.   ",
+"     .+0ghijkl+m..    ",
+"     .)+++++++f.      ",
+"      .++++++..       ",
+"      .%+++f.         ",
+"       .+n..          ",
+"        ..            ",
+"                      ",
+"                      "};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/plugins_small.xpm	Wed Aug 30 21:32:44 2000 +0000
@@ -0,0 +1,101 @@
+/* XPM */
+static char * plugins_small_xpm[] = {
+"18 18 80 1",
+" 	c None",
+".	c #000000",
+"+	c #6F6A4F",
+"@	c #504C38",
+"#	c #ACA379",
+"$	c #5A5540",
+"%	c #161510",
+"&	c #87805F",
+"*	c #BAB184",
+"=	c #A49C74",
+"-	c #857E5E",
+";	c #16150F",
+">	c #201F17",
+",	c #9B946E",
+"'	c #968F6A",
+")	c #B3AA7E",
+"!	c #A19A72",
+"~	c #222018",
+"{	c #524D3A",
+"]	c #918A66",
+"^	c #B9B083",
+"/	c #57533E",
+"(	c #25231A",
+"_	c #B3AA7F",
+":	c #29261D",
+"<	c #181711",
+"[	c #55513C",
+"}	c #938C68",
+"|	c #635E46",
+"1	c #928B67",
+"2	c #C1B889",
+"3	c #AAA278",
+"4	c #635F46",
+"5	c #9B936D",
+"6	c #9F9871",
+"7	c #CCC290",
+"8	c #CEC492",
+"9	c #D0C693",
+"0	c #CDC391",
+"a	c #C7BE8D",
+"b	c #6F694E",
+"c	c #C8BF8E",
+"d	c #D2C895",
+"e	c #D3C995",
+"f	c #C6BD8D",
+"g	c #D4CA96",
+"h	c #D5CB96",
+"i	c #D0C692",
+"j	c #28261C",
+"k	c #1B1913",
+"l	c #C0B788",
+"m	c #BBB284",
+"n	c #A19972",
+"o	c #B1A97D",
+"p	c #D5CC97",
+"q	c #D1C793",
+"r	c #C6BC8C",
+"s	c #3F3C2D",
+"t	c #0E0E0A",
+"u	c #D1C794",
+"v	c #C8BF8D",
+"w	c #97906B",
+"x	c #BFB687",
+"y	c #C4BA8A",
+"z	c #26241B",
+"A	c #958E6A",
+"B	c #CDC491",
+"C	c #D2C894",
+"D	c #CEC592",
+"E	c #C8BE8D",
+"F	c #A8A077",
+"G	c #C9BF8E",
+"H	c #CCC391",
+"I	c #CAC18F",
+"J	c #C0B687",
+"K	c #322F23",
+"L	c #7B7557",
+"M	c #9D966F",
+"N	c #312E22",
+"O	c #817B5B",
+"                  ",
+"                  ",
+"     ..           ",
+"    +@#$          ",
+"   %&*=-;         ",
+"   >,')!~  ..     ",
+"   .{]^/. (_ ..   ",
+"    :<[:}|12345.  ",
+"       .678990a.  ",
+"       bcdefghij. ",
+"      klcdmnopqrs ",
+"      t2cuvwxe8yz ",
+"       .ABC99DE.  ",
+"       .FG7HIrJ.  ",
+"       . KLyMN .  ",
+"        . .O  .   ",
+"           .      ",
+"                  "};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/prefs_small.xpm	Wed Aug 30 21:32:44 2000 +0000
@@ -0,0 +1,126 @@
+/* XPM */
+static char * prefs_small_xpm[] = {
+"17 18 105 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #353535",
+"@ 	c #8F8F8F",
+"# 	c #D8D8D8",
+"$ 	c #0C0C0C",
+"% 	c #2A271C",
+"& 	c #525252",
+"* 	c #767676",
+"= 	c #DCDCDC",
+"- 	c #E5E5E5",
+"; 	c #606060",
+"> 	c #857955",
+", 	c #524B31",
+"' 	c #929292",
+") 	c #ACACAC",
+"! 	c #CCCCCC",
+"~ 	c #E4E4E4",
+"{ 	c #D9D9D9",
+"] 	c #DEDEDE",
+"^ 	c #B6B6B6",
+"/ 	c #938761",
+"( 	c #796C42",
+"_ 	c #1B180D",
+": 	c #636363",
+"< 	c #E1E1E1",
+"[ 	c #C29191",
+"} 	c #CEBFBF",
+"| 	c #C8C8C8",
+"1 	c #A7A7A7",
+"2 	c #D6D6D6",
+"3 	c #787670",
+"4 	c #94875F",
+"5 	c #70643B",
+"6 	c #424242",
+"7 	c #BEBEBE",
+"8 	c #E6E6E6",
+"9 	c #EDEDED",
+"0 	c #C39292",
+"a 	c #BFB0B0",
+"b 	c #B0B0B0",
+"c 	c #BBBBBB",
+"d 	c #777570",
+"e 	c #8B7F58",
+"f 	c #6F633D",
+"g 	c #131009",
+"h 	c #989898",
+"i 	c #D9C7C7",
+"j 	c #C58D8D",
+"k 	c #B98080",
+"l 	c #D9CDCD",
+"m 	c #CFCFCF",
+"n 	c #686868",
+"o 	c #9F9369",
+"p 	c #6E623C",
+"q 	c #74736E",
+"r 	c #1F1F1F",
+"s 	c #CDCCCC",
+"t 	c #D6B9B9",
+"u 	c #B67979",
+"v 	c #DCD2D2",
+"w 	c #D5D5D5",
+"x 	c #706E68",
+"y 	c #A09367",
+"z 	c #655B38",
+"A 	c #777777",
+"B 	c #DDDDDC",
+"C 	c #BABAB8",
+"D 	c #1D1D1B",
+"E 	c #EAE9E7",
+"F 	c #A29469",
+"G 	c #52492B",
+"H 	c #51482C",
+"I 	c #72726D",
+"J 	c #C2C2BC",
+"K 	c #C1C1B9",
+"L 	c #B0B0A7",
+"M 	c #585851",
+"N 	c #212121",
+"O 	c #E2E3E3",
+"P 	c #D6DDDB",
+"Q 	c #2B240E",
+"R 	c #4C493C",
+"S 	c #7A7A70",
+"T 	c #ABAB9F",
+"U 	c #A7A79A",
+"V 	c #AEAEA9",
+"W 	c #1D1D1A",
+"X 	c #C8C8C2",
+"Y 	c #A5A59B",
+"Z 	c #A2A49C",
+"` 	c #CDD0CC",
+" .	c #DCDCD7",
+"..	c #DDDDD9",
+"+.	c #C6C6C6",
+"@.	c #474746",
+"#.	c #393939",
+"$.	c #B3B3B3",
+"%.	c #757575",
+"&.	c #4A4A4A",
+"*.	c #838383",
+"=.	c #DADADA",
+"-.	c #626262",
+";.	c #939393",
+">.	c #808080",
+"                                  ",
+"                                  ",
+"                  .               ",
+"              + @ # $         %   ",
+"        . & * = - - ;       > ,   ",
+"    . ' ) ! ~ { # ] ^ .   / ( _   ",
+"  : < - - [ } { | 1 2 3 4 5 .     ",
+"  6 7 8 9 0 a b c # d e f g       ",
+"    h i j k l m - n o p q r       ",
+"    . s t u v w x y z A B C D     ",
+"      A - - E F G H I J K L M     ",
+"      N < O P Q R S T U U V W     ",
+"        & X Y Z `  ...+.@..       ",
+"        #.$.- - - - %.&.          ",
+"          *.~ - =.-.              ",
+"            ;.>..                 ",
+"                                  ",
+"                                  "};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/search_small.xpm	Wed Aug 30 21:32:44 2000 +0000
@@ -0,0 +1,135 @@
+/* XPM */
+static char * search_small_xpm[] = {
+"18 18 114 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #282824",
+"@ 	c #4A4A43",
+"# 	c #30302B",
+"$ 	c #8A8A7B",
+"% 	c #DDDDC5",
+"& 	c #99998B",
+"* 	c #47473F",
+"= 	c #808072",
+"- 	c #CBCBB6",
+"; 	c #D8D8C2",
+"> 	c #DCDCC5",
+", 	c #E0E0C9",
+"' 	c #7B7B6E",
+") 	c #1D1D1D",
+"! 	c #545454",
+"~ 	c #AAAA9A",
+"{ 	c #D5D5BE",
+"] 	c #D6D6C0",
+"^ 	c #D9D9C2",
+"/ 	c #DEDEC6",
+"( 	c #E2E2CA",
+"_ 	c #272727",
+": 	c #3A3A3A",
+"< 	c #A6A6A6",
+"[ 	c #8C8C81",
+"} 	c #D3D3BC",
+"| 	c #E3E3CB",
+"1 	c #E7E7CF",
+"2 	c #ECECD3",
+"3 	c #BDBDAA",
+"4 	c #21211E",
+"5 	c #3B3B3A",
+"6 	c #EDEDE9",
+"7 	c #696965",
+"8 	c #B8B8A4",
+"9 	c #CDCDB7",
+"0 	c #A0A08F",
+"a 	c #78786B",
+"b 	c #89897B",
+"c 	c #C8C8B3",
+"d 	c #E8E8D0",
+"e 	c #66665B",
+"f 	c #3B3B39",
+"g 	c #B3B3AE",
+"h 	c #7B7B72",
+"i 	c #BEBEA9",
+"j 	c #868677",
+"k 	c #7A7A6D",
+"l 	c #9B9B8B",
+"m 	c #89897A",
+"n 	c #616157",
+"o 	c #393933",
+"p 	c #080807",
+"q 	c #626259",
+"r 	c #B2B29F",
+"s 	c #707064",
+"t 	c #D9D9CA",
+"u 	c #D9D9CC",
+"v 	c #B6B6A3",
+"w 	c #919181",
+"x 	c #69695E",
+"y 	c #F5F5DC",
+"z 	c #32322D",
+"A 	c #222220",
+"B 	c #B1B1A2",
+"C 	c #DADAC3",
+"D 	c #A8A897",
+"E 	c #6C6C61",
+"F 	c #E5E5DA",
+"G 	c #BABAA6",
+"H 	c #A8A896",
+"I 	c #949485",
+"J 	c #44443D",
+"K 	c #818174",
+"L 	c #828275",
+"M 	c #DFDFC7",
+"N 	c #B7B7A3",
+"O 	c #6B6B60",
+"P 	c #BABAA9",
+"Q 	c #ACAC9A",
+"R 	c #9A9A8A",
+"S 	c #7F7F72",
+"T 	c #69695F",
+"U 	c #1E1E1B",
+"V 	c #5D5D56",
+"W 	c #D5D5C0",
+"X 	c #DEDEC7",
+"Y 	c #8E8E7F",
+"Z 	c #6F6F64",
+"` 	c #78786C",
+" .	c #6B6B61",
+"..	c #2E2E2C",
+"+.	c #292925",
+"@.	c #5D5D54",
+"#.	c #B9B9A7",
+"$.	c #EBEBD3",
+"%.	c #E1E1C9",
+"&.	c #7D7D70",
+"*.	c #858579",
+"=.	c #4D4D4A",
+"-.	c #363631",
+";.	c #EEEED6",
+">.	c #F0F0D7",
+",.	c #F1F1D8",
+"'.	c #DEDEC8",
+").	c #77776B",
+"!.	c #A6A695",
+"~.	c #E9E9D1",
+"{.	c #ABAB9A",
+"].	c #3A3A34",
+"^.	c #31312C",
+"/.	c #66665C",
+"                                    ",
+"                                    ",
+"                . + @               ",
+"              # $ % &               ",
+"        . * = - ; > , '             ",
+"      ) ! ~ { ] ^ / ( / _           ",
+"      : < [ } ; % | 1 2 3 4         ",
+"      5 6 7 8 9 0 a b c d e         ",
+"      f g h i j k l m n ; ] o       ",
+"      p q c r s t u v w x y ] z     ",
+"      A B C D E F G H I J y y K .   ",
+"        L M N O P Q R S T y O U     ",
+"        V W X Y Z `  ...+.@.        ",
+"        _ #.$.%.Q &.*.=.. .         ",
+"          -.;.>.,.'.).    . .       ",
+"          . !.~.{.].        . .     ",
+"            ^./.4                   ",
+"                                    "};
--- a/src/buddy.c	Wed Aug 30 19:45:01 2000 +0000
+++ b/src/buddy.c	Wed Aug 30 21:32:44 2000 +0000
@@ -64,6 +64,11 @@
 #include "pixmaps/add_small.xpm"
 #include "pixmaps/import_small.xpm"
 #include "pixmaps/export_small.xpm"
+#ifdef GAIM_PLUGINS
+#include "pixmaps/plugins_small.xpm"
+#endif
+#include "pixmaps/prefs_small.xpm"
+#include "pixmaps/search_small.xpm"
 #ifdef USE_APPLET
 #include "pixmaps/close_small.xpm"
 #endif
@@ -1795,7 +1800,7 @@
 
 	findmenu = gtk_menu_new();
 	gtk_widget_show(findmenu);
-	menuitem = gaim_new_item(menu, _("Search for Buddy"), NULL);
+	menuitem = gaim_new_item_with_pixmap(menu, _("Search for Buddy"), search_small_xpm, NULL);
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), findmenu);
 	gtk_widget_show(menuitem);
 	menuitem = gtk_menu_item_new_with_label(_("by Email"));
@@ -1826,10 +1831,10 @@
 	gtk_widget_show(menuitem);
 	gaim_seperator(menu);
 
-        gaim_new_item(menu, _("Preferences"), GTK_SIGNAL_FUNC(show_prefs));
+        gaim_new_item_with_pixmap(menu, _("Preferences"), prefs_small_xpm, GTK_SIGNAL_FUNC(show_prefs));
 
 #ifdef GAIM_PLUGINS
-        gaim_new_item(menu, _("Plugins"), GTK_SIGNAL_FUNC(show_plugins));
+        gaim_new_item_with_pixmap(menu, _("Plugins"), plugins_small_xpm, GTK_SIGNAL_FUNC(show_plugins));
 #endif
 #ifdef USE_PERL
 	perlmenu = gtk_menu_new();
--- a/src/conversation.c	Wed Aug 30 19:45:01 2000 +0000
+++ b/src/conversation.c	Wed Aug 30 21:32:44 2000 +0000
@@ -1300,7 +1300,7 @@
 	gtk_widget_show(palette_p);
 
 	wood_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask, 
-	     &win->style->white, bold_xpm );
+	     &win->style->white, wood_xpm );
 	wood_p = gtk_pixmap_new(wood_i, mask);
 	gtk_widget_show(wood_p);
 	speaker_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,