Mercurial > pidgin.yaz

changeset 595:3fd5311a3894

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 605] experimenting with some icons committer: Tailor Script <tailor@pidgin.im>
author Todd Kulesza <fflewddur>
date Thu, 03 Aug 2000 16:52:38 +0000
parents 824114726aac
children 2838c9ca0823
files pixmaps/fontface2.xpm pixmaps/refresh.xpm src/dialogs.c src/prefs.c
diffstat 4 files changed, 130 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/fontface2.xpm	Thu Aug 03 16:52:38 2000 +0000
@@ -0,0 +1,52 @@
+/* XPM */
+static char * fontface2_xpm[] = {
+"24 24 25 1",
+" 	c None",
+".	c #FFFF99",
+"+	c #FFC777",
+"@	c #FF5533",
+"#	c #FF1D11",
+"$	c #FF0000",
+"%	c #FF3922",
+"&	c #FF8E55",
+"*	c #FFAA66",
+"=	c #FF7244",
+"-	c #FFE388",
+";	c #FF5935",
+">	c #FF9157",
+",	c #FFD07D",
+"'	c #FF4E2F",
+")	c #FF190F",
+"!	c #FF331E",
+"~	c #FF472A",
+"{	c #FFDC84",
+"]	c #FF7D4B",
+"^	c #FFDF86",
+"/	c #FFBB70",
+"(	c #FF3F25",
+"_	c #FF4E2E",
+":	c #FFB36B",
+"       .........        ",
+"      .+@#$$$$%&.       ",
+"     .*$=+.-#$$$.       ",
+"     .@&...=$#$$.       ",
+"     .;>..-$=@$$.       ",
+"     .,'..=#.@$$.       ",
+"      .,..#=.@$$.       ",
+"        .&$&*%$$..-**.. ",
+"        .#$$$$$$.%$$$#*.",
+"...    .&#...*$$.@-.&$$+",
+"...........  *$$.*. .&$+",
+".+@)!~@$%@+. *$$$@.  .*.",
+"=$&..+*.+#$*.-***..     ",
+"$&..@$@..+$#..$$*.      ",
+"%- .@$@. .$#..$$=.      ",
+"{] .@$@..-$*..$$#..     ",
+" + .@$@.^##-..@$$@.  ./.",
+"   .@$@.^#$%..+$$$&..-%.",
+"   .@$@..+$$* .*$$$%@$=.",
+"   .@$@. .$$*  .-&@@=+..",
+"   .@$=..-$$+    .....  ",
+"  .^#$@(_#$@.           ",
+"  :_@@@(_@+..           ",
+"  .........             "};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/refresh.xpm	Thu Aug 03 16:52:38 2000 +0000
@@ -0,0 +1,38 @@
+/* XPM */
+static char * refresh_xpm[] = {
+"24 24 11 1",
+" 	c None",
+".	c #000000",
+"+	c #566B43",
+"@	c #4C603C",
+"#	c #526741",
+"$	c #5A7046",
+"%	c #445636",
+"&	c #37452B",
+"*	c #425334",
+"=	c #475937",
+"-	c #5C7449",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"           .            ",
+"          ..            ",
+"         .+@...         ",
+"        .#$##@%..       ",
+"         .+#...%%.      ",
+"       .  ..   .&.      ",
+"      .    .    .&.     ",
+"     ..          ..     ",
+"     ..          ..     ",
+"     .*.    .    .      ",
+"      .*.   ..  .       ",
+"      .%@...#=.         ",
+"       ..##-#@#.        ",
+"         ...@%.         ",
+"            ..          ",
+"            .           ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
--- a/src/dialogs.c	Thu Aug 03 16:47:04 2000 +0000
+++ b/src/dialogs.c	Thu Aug 03 16:52:38 2000 +0000
@@ -2547,7 +2547,7 @@
 
 	gtk_widget_set_usize(ok, 75, 30);
 	gtk_widget_set_usize(cancel, 75, 30);
-        gtk_box_pack_end(GTK_BOX(bbox), ok, FALSE, FALSE, 10);
+        gtk_box_pack_start(GTK_BOX(bbox), ok, FALSE, FALSE, 10);
         gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 10);
 
 	/* Line 1 */
--- a/src/prefs.c	Thu Aug 03 16:47:04 2000 +0000
+++ b/src/prefs.c	Thu Aug 03 16:52:38 2000 +0000
@@ -36,6 +36,8 @@
 #include "proxy.h"
 #include "gnome_applet_mgr.h"
 #include "pixmaps/cancel.xpm"
+#include "pixmaps/fontface2.xpm"
+#include "pixmaps/refresh.xpm"
 
 struct prefs_data *pd = NULL;
 struct debug_window *dw = NULL;
@@ -344,7 +346,7 @@
 	GtkWidget *away_page;
 	GtkWidget *select_font;
 	GtkWidget *font_face_for_text;
-	GtkWidget *button_box, *icon_i, *close_label;
+	GtkWidget *button_box, *icon_i, *button_label;
 	GdkBitmap *mask;
 	GdkPixmap *icon;
 	
@@ -790,15 +792,27 @@
 	gaim_button(_("Strike Text"), &font_options, OPT_FONT_STRIKE, fontbox);
 	font_face_for_text = gaim_button(_("Font Face for Text"), &font_options, OPT_FONT_FACE, fontbox);
 		
-	select_font = gtk_button_new_with_label(_("Select Font"));
+	/* Build font button */
+	select_font = gtk_button_new();
+	button_box = gtk_hbox_new(FALSE, 5);
+	icon = gdk_pixmap_create_from_xpm_d (pd->window->window, &mask, NULL, fontface2_xpm);
+	icon_i = gtk_pixmap_new(icon, mask);
+	button_label = gtk_label_new(_("Select Font Face"));
+	gtk_box_pack_start(GTK_BOX(button_box), icon_i, FALSE, FALSE, 2);
+	gtk_box_pack_end(GTK_BOX(button_box), button_label, FALSE, FALSE, 2);
+	gtk_widget_show(button_label);
+	gtk_widget_show(icon_i);
 	if (display_options & OPT_DISP_COOL_LOOK)
 		gtk_button_set_relief(GTK_BUTTON(select_font), GTK_RELIEF_NONE);
+	gtk_widget_show(button_box);
+	gtk_container_add(GTK_CONTAINER(select_font), button_box);
 	gtk_box_pack_start(GTK_BOX(fontbox), select_font, FALSE, FALSE, 0);
 	gtk_signal_connect(GTK_OBJECT(select_font), "clicked", GTK_SIGNAL_FUNC(show_font_dialog), NULL);
 	if (!(font_options & OPT_FONT_FACE))
 	    gtk_widget_set_sensitive(GTK_WIDGET(select_font), FALSE);
 	gtk_widget_show(select_font);
 	gtk_signal_connect(GTK_OBJECT(font_face_for_text), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), select_font);
+	/* end of font button */
 	
 	gtk_widget_show(appearance_page);
 	gtk_widget_show(fontbox);
@@ -827,12 +841,12 @@
 
 	icon_i = gtk_pixmap_new(icon, mask);
 	
-	close_label = gtk_label_new(_("Close"));
+	button_label = gtk_label_new(_("Close"));
 
 	gtk_box_pack_start(GTK_BOX(button_box), icon_i, FALSE, FALSE, 2);
-	gtk_box_pack_end(GTK_BOX(button_box), close_label, FALSE, FALSE, 2);
+	gtk_box_pack_end(GTK_BOX(button_box), button_label, FALSE, FALSE, 2);
 
-	gtk_widget_show(close_label);
+	gtk_widget_show(button_label);
 	gtk_widget_show(icon_i);
 
 	gtk_widget_show(button_box);
@@ -1017,6 +1031,9 @@
 	GtkWidget *label;
 	GtkWidget *sw1, *sw2;
 	GtkWidget *item;
+	GtkWidget *button_box, *icon_i, *button_label;
+	GdkPixmap *icon;
+	GdkBitmap *mask;
 	struct chat_page *cp = g_new0(struct chat_page, 1);
 	GList *crs = chat_rooms;
 	GList *items = NULL;
@@ -1033,7 +1050,23 @@
 	list2 = gtk_list_new();
 	sw1 = gtk_scrolled_window_new(NULL, NULL);
 	sw2 = gtk_scrolled_window_new(NULL, NULL);
-	ref_button = gtk_button_new_with_label(_("Refresh"));
+
+	/* Build refresh button */
+	ref_button = gtk_button_new();
+	button_box = gtk_hbox_new(FALSE, 5);
+	icon = gdk_pixmap_create_from_xpm_d ( pd->window->window, &mask, NULL, refresh_xpm);
+	icon_i = gtk_pixmap_new(icon, mask);
+	button_label = gtk_label_new(_("Refresh List"));
+	gtk_box_pack_start(GTK_BOX(button_box), icon_i, FALSE, FALSE, 2);
+	gtk_box_pack_end(GTK_BOX(button_box), button_label, FALSE, FALSE, 2);
+	gtk_widget_show(button_label);
+	gtk_widget_show(icon_i);
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(ref_button), GTK_RELIEF_NONE);
+	gtk_widget_show(button_box);
+	gtk_container_add(GTK_CONTAINER(ref_button), button_box);
+	/* End of refresh button */
+	
 	add_button = gtk_button_new_with_label(_("Add"));
 	rem_button = gtk_button_new_with_label(_("Remove"));
 	if (display_options & OPT_DISP_COOL_LOOK)