Mercurial > pidgin.yaz

changeset 619:faa7603ae02e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 629] added more pixmaps and modified picture_button() so that they aren't spaced all funny committer: Tailor Script <tailor@pidgin.im>
author Todd Kulesza <fflewddur>
date Sat, 05 Aug 2000 19:22:41 +0000
parents ff7a04b30608
children 43c67e5583eb
files pixmaps/Makefile.am pixmaps/gnome_close.xpm pixmaps/gnome_preferences.xpm src/about.c src/dialogs.c src/plugins.c src/prefs.c src/util.c
diffstat 8 files changed, 158 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/pixmaps/Makefile.am	Sat Aug 05 17:57:39 2000 +0000
+++ b/pixmaps/Makefile.am	Sat Aug 05 19:22:41 2000 +0000
@@ -15,7 +15,6 @@
 		buddydel.xpm			\
 		burp.xpm			\
 		cancel.xpm			\
-		close.xpm			\
 		crossedlips.xpm			\
 		cry.xpm				\
 		daemon-buddyadd.xpm		\
@@ -30,7 +29,12 @@
 		embarrassed.xpm			\
 		fontface.xpm			\
 		free_icon.xpm			\
-		gaim.xpm			\
+		gaim.xpm				\
+		gnome_add.xpm		\
+		gnome_close.xpm		\
+		gnome_preferences.xpm	\
+		gnome_refresh.xpm	\
+		gnome_remove.xpm 	\
 		gnome/devil-connect.png		\
 		gnome/devil-offline.png		\
 		gnome/devil-online.png		\
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/gnome_close.xpm	Sat Aug 05 19:22:41 2000 +0000
@@ -0,0 +1,29 @@
+/* XPM */
+static char * gnome_close_xpm[] = {
+"24 24 2 1",
+" 	c None",
+".	c #000000",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"       .    ..          ",
+"       ..  ....         ",
+"        .. ...          ",
+"        .....           ",
+"         ...            ",
+"         ....           ",
+"        ......          ",
+"        .. ....         ",
+"       ..   ....        ",
+"       .     ..         ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/gnome_preferences.xpm	Sat Aug 05 19:22:41 2000 +0000
@@ -0,0 +1,80 @@
+/* XPM */
+static char * gnome_preferences_xpm[] = {
+"24 24 53 1",
+" 	c None",
+".	c #000000",
+"+	c #E5E5E5",
+"@	c #CECECE",
+"#	c #CDCDCD",
+"$	c #DCCB94",
+"%	c #DCDCDC",
+"&	c #C7C7C7",
+"*	c #8E7D45",
+"=	c #CFCFCF",
+"-	c #C1C1C1",
+";	c #AB5959",
+">	c #D9D9D9",
+",	c #878787",
+"'	c #DBDBDB",
+")	c #D4D4D4",
+"!	c #A84F4F",
+"~	c #A7A7A7",
+"{	c #9B9B9B",
+"]	c #F5F5F5",
+"^	c #F3F3F3",
+"/	c #A65757",
+"(	c #6E6E6E",
+"_	c #DACACA",
+":	c #AC5757",
+"<	c #C48B8B",
+"[	c #AA6C6C",
+"}	c #E9DDDD",
+"|	c #A65353",
+"1	c #C6C6C6",
+"2	c #D4C38D",
+"3	c #E4E4E4",
+"4	c #D6D6D0",
+"5	c #C0C0BB",
+"6	c #828279",
+"7	c #AD8E30",
+"8	c #756020",
+"9	c #C5C5BF",
+"0	c #A7A79A",
+"a	c #818174",
+"b	c #DFE1E1",
+"c	c #D6E1E0",
+"d	c #060605",
+"e	c #A3A395",
+"f	c #C8C8C8",
+"g	c #8B8B7D",
+"h	c #7E7E71",
+"i	c #B2B9B6",
+"j	c #D9D9D2",
+"k	c #D9D9D3",
+"l	c #DADAD4",
+"m	c #DADAD9",
+"n	c #DADADA",
+"                        ",
+"                        ",
+"                        ",
+"             ..         ",
+"           ..+@.     .  ",
+"         ..#+++.    .$. ",
+"      ...%+++++&.  .$*. ",
+"    ..#++++=+-++. .$*.  ",
+"   .%++++;+>+=,+'.$*.   ",
+"   .)++++!~+{,++.$*.    ",
+"    .++]^/+(+++.$*.     ",
+"    .%_:<[++++.$*.>.    ",
+"     .+}|/+++.$*.=+1.   ",
+"     .)+++++.2*.>3456.  ",
+"      .+++]78..90000a.  ",
+"      .%+bcd.ee0000f.   ",
+"       .+0ghijkl+m..    ",
+"       .)+++++++f.      ",
+"        .++++++..       ",
+"        .%+++f.         ",
+"         .+n..          ",
+"          ..            ",
+"                        ",
+"                        "};
--- a/src/about.c	Sat Aug 05 17:57:39 2000 +0000
+++ b/src/about.c	Sat Aug 05 19:22:41 2000 +0000
@@ -30,6 +30,7 @@
 #include <gtk/gtk.h>
 #include "gaim.h"
 #include "pixmaps/logo.xpm"
+#include "pixmaps/gnome_close.xpm"
 
 static GtkWidget *about=NULL;
 
@@ -116,7 +117,7 @@
 				   GTK_SIGNAL_FUNC(about_click), NULL);
 		gdk_window_set_cursor(eventbox->window, gdk_cursor_new(GDK_HAND2));
 		
-		button = gtk_button_new_with_label(_("Close"));
+		button = picture_button(about, _("Close"), gnome_close_xpm);
 		if (null == NULL) /* there's a mindtrip */
 			gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
         	                                  GTK_SIGNAL_FUNC(destroy_about), GTK_OBJECT(about));
--- a/src/dialogs.c	Sat Aug 05 17:57:39 2000 +0000
+++ b/src/dialogs.c	Sat Aug 05 19:22:41 2000 +0000
@@ -1626,6 +1626,7 @@
         GtkWidget *label;
 	GtkWidget *text;
         GtkWidget *bbox;
+        GtkWidget *button_box;
         GtkWidget *sw;
 
         struct info_dlg *b = g_new0(struct info_dlg, 1);
@@ -1635,8 +1636,9 @@
         gtk_container_border_width(GTK_CONTAINER(b->window), 5);
         bbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(b->window), bbox);
-
-        ok = gtk_button_new_with_label(_("OK"));
+		button_box = gtk_hbox_new(FALSE, 5);
+		gtk_widget_realize(GTK_WIDGET(b->window));
+        ok = picture_button(b->window, _("OK"), ok_xpm);
 	gtk_signal_connect(GTK_OBJECT(b->window), "destroy",
 			   GTK_SIGNAL_FUNC(destroy_dialog), b->window);
         gtk_signal_connect(GTK_OBJECT(ok), "clicked",
@@ -1661,9 +1663,9 @@
 
 	gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(bbox), sw, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(bbox), ok, FALSE, FALSE, 0);
-
-	gtk_widget_realize(b->window);
+	gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, FALSE, 0);
+/*	gtk_box_pack_start(GTK_BOX(button_box), ok, FALSE, FALSE, 0);*/
+
 	aol_icon(b->window->window);
 	gtk_widget_show_all(b->window);
 
--- a/src/plugins.c	Sat Aug 05 17:57:39 2000 +0000
+++ b/src/plugins.c	Sat Aug 05 19:22:41 2000 +0000
@@ -45,6 +45,11 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include "gaim.h"
+#include "pixmaps/gnome_add.xpm"
+#include "pixmaps/gnome_close.xpm"
+#include "pixmaps/gnome_preferences.xpm"
+#include "pixmaps/gnome_remove.xpm"
+#include "pixmaps/ok.xpm"
 
 #include <dlfcn.h>
 
@@ -125,7 +130,8 @@
 			"clicked", GTK_SIGNAL_FUNC(destroy_plugins), NULL);
 
 	g_free(buf);
-	gtk_widget_show(plugin_dialog);
+
+	gtk_widget_show(GTK_FILE_SELECTION(plugin_dialog)->ok_button);
 	gdk_window_raise(plugin_dialog->window);   
 }
 
@@ -262,7 +268,7 @@
 	aol_icon(plugwindow->window);
 	gtk_container_border_width(GTK_CONTAINER(plugwindow), 10);
 	gtk_window_set_title(GTK_WINDOW(plugwindow), _("Gaim - Plugins"));
-	gtk_widget_set_usize(plugwindow, 400, 250);
+	gtk_widget_set_usize(plugwindow, -1, 250);
 	gtk_signal_connect(GTK_OBJECT(plugwindow), "destroy",
 			   GTK_SIGNAL_FUNC(hide_plugins), NULL);
 
@@ -290,33 +296,33 @@
 	gtk_text_set_word_wrap(GTK_TEXT(plugtext), TRUE);
 	gtk_text_set_editable(GTK_TEXT(plugtext), FALSE);
 
-	add = gtk_button_new_with_label(_("Load Plugin"));
+	add = picture_button(plugwindow, _("Add Plugin"), gnome_add_xpm);
 	gtk_signal_connect(GTK_OBJECT(add), "clicked",
 			   GTK_SIGNAL_FUNC(load_file), NULL);
 	gtk_box_pack_start(GTK_BOX(botbox), add, TRUE, FALSE, 5);
-	if (display_options & OPT_DISP_COOL_LOOK)
-		gtk_button_set_relief(GTK_BUTTON(add), GTK_RELIEF_NONE);
 
-	config = gtk_button_new_with_label(_("Configure Plugin"));
+	config = picture_button(plugwindow, _("Configure Plugin"), gnome_preferences_xpm);
 	gtk_widget_set_sensitive(config, 0);
 	gtk_box_pack_start(GTK_BOX(botbox), config, TRUE, FALSE, 5);
-	if (display_options & OPT_DISP_COOL_LOOK)
-		gtk_button_set_relief(GTK_BUTTON(config), GTK_RELIEF_NONE);
 
-	remove = gtk_button_new_with_label(_("Unload Plugin"));
+	remove = picture_button(plugwindow, _("Remove Plugin"), gnome_remove_xpm);
 	gtk_signal_connect(GTK_OBJECT(remove), "clicked",
 			   GTK_SIGNAL_FUNC(unload), pluglist);
 	gtk_box_pack_start(GTK_BOX(botbox), remove, TRUE, FALSE, 5);
-	if (display_options & OPT_DISP_COOL_LOOK)
-		gtk_button_set_relief(GTK_BUTTON(remove), GTK_RELIEF_NONE);
 
-	close = gtk_button_new_with_label(_("Close"));
+	close = picture_button(plugwindow, _("Close"), gnome_close_xpm);
 	gtk_signal_connect(GTK_OBJECT(close), "clicked",
 			   GTK_SIGNAL_FUNC(hide_plugins), NULL);
 	gtk_box_pack_start(GTK_BOX(botbox), close, TRUE, FALSE, 5);
+
 	if (display_options & OPT_DISP_COOL_LOOK)
+	{
+		gtk_button_set_relief(GTK_BUTTON(add), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(config), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(remove), GTK_RELIEF_NONE);		
 		gtk_button_set_relief(GTK_BUTTON(close), GTK_RELIEF_NONE);
-
+	}
+					
 	gtk_box_pack_start(GTK_BOX(page), topbox, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(page), botbox, FALSE, FALSE, 0);
 
--- a/src/prefs.c	Sat Aug 05 17:57:39 2000 +0000
+++ b/src/prefs.c	Sat Aug 05 19:22:41 2000 +0000
@@ -793,7 +793,7 @@
 	font_face_for_text = gaim_button(_("Font Face for Text"), &font_options, OPT_FONT_FACE, fontbox);
 		
 	/* Build font button */
-	select_font = picture_button(pd->window, _("Select Font Face"), fontface2_xpm);
+	select_font = picture_button(pd->window, _("Select Font"), fontface2_xpm);
 	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 (display_options & OPT_DISP_COOL_LOOK)
--- a/src/util.c	Sat Aug 05 17:57:39 2000 +0000
+++ b/src/util.c	Sat Aug 05 19:22:41 2000 +0000
@@ -892,7 +892,7 @@
 GtkWidget *picture_button(GtkWidget *window, char *text, char **xpm)
 {
 	GtkWidget *button;
-	GtkWidget *button_box;
+	GtkWidget *button_box, *button_box_2, *button_box_3;
 	GtkWidget *label;
 	GdkBitmap *mask;
 	GdkPixmap *pm;
@@ -901,20 +901,27 @@
 	button = gtk_button_new();
 	if (display_options & OPT_DISP_COOL_LOOK)
 		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_widget_show(button);
 
 	button_box = gtk_hbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(button), button_box);
-	gtk_widget_show(button_box);
 
+	button_box_2 = gtk_hbox_new(FALSE, 0);
+	button_box_3 = gtk_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(button_box), button_box_3, TRUE, TRUE, 0);
 	pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
 	pixmap = gtk_pixmap_new(pm, mask);
-	gtk_box_pack_start(GTK_BOX(button_box), pixmap, FALSE, FALSE, 2);
-	gtk_widget_show(pixmap);
+	gtk_box_pack_end(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0);
 
 	label = gtk_label_new(text);
-	gtk_box_pack_end(GTK_BOX(button_box), label, FALSE, FALSE, 2);
+	gtk_box_pack_start(GTK_BOX(button_box_3), label, FALSE, FALSE, 2);
+
+	gtk_widget_show(pixmap);
 	gtk_widget_show(label);
-
+	gtk_widget_show(button_box_2);
+	gtk_widget_show(button_box_3);
+	gtk_widget_show(button_box);
+	gtk_widget_show(button);
+		
 	return button;
 }