Mercurial > pidgin

changeset 441:995b0fc981a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 451] The away message menu looks a lot better. committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Thu, 29 Jun 2000 08:37:27 +0000
parents 7d61632b2591
children fbf45eb2cd4e
files intl/Makefile.in pixmaps/Makefile.am pixmaps/cancel.xpm pixmaps/save.xpm src/dialogs.c
diffstat 5 files changed, 174 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/intl/Makefile.in	Thu Jun 29 05:15:55 2000 +0000
+++ b/intl/Makefile.in	Thu Jun 29 08:37:27 2000 +0000
@@ -147,7 +147,7 @@
 	  dists="$(DISTFILES.common)"; \
 	  for file in $$dists; do \
 	    rm -f $(gettextsrcdir)/$$file; \
-	  done
+	  done; \
 	else \
 	  : ; \
 	fi
--- a/pixmaps/Makefile.am	Thu Jun 29 05:15:55 2000 +0000
+++ b/pixmaps/Makefile.am	Thu Jun 29 08:37:27 2000 +0000
@@ -16,7 +16,7 @@
 	daemon-buddyadd.xpm daemon-buddychat.xpm daemon-buddydel.xpm \
 	daemon-im.xpm daemon-info.xpm daemon-permadd.xpm \
 	daemon-permdel.xpm daemon.xpm fontface.xpm smile_happy.xpm \
-	smile_sad.xpm smile_wink.xpm
+	smile_sad.xpm smile_wink.xpm save.xpm cancel.xpm
 
 pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = gaim.xpm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/cancel.xpm	Thu Jun 29 08:37:27 2000 +0000
@@ -0,0 +1,35 @@
+/* XPM */
+static char * cancel_xpm[] = {
+"24 24 8 1",
+" 	c None",
+".	c #000000",
+"+	c #C46D74",
+"@	c #9F3C44",
+"#	c #B5444E",
+"$	c #BD5A62",
+"%	c #7B2D34",
+"&	c #8C343C",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"         ..      .      ",
+"        .+@.    .#.     ",
+"        .##.   .$#.     ",
+"         .#@. .$#%.     ",
+"         .##..$#&.      ",
+"          .####@.       ",
+"          .####.        ",
+"         .$###.         ",
+"        .$####.         ",
+"       .$#&..#&.        ",
+"      .+#&. .@#.        ",
+"      .#&.   .#@.       ",
+"       ..    .@#.       ",
+"              ..        ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/save.xpm	Thu Jun 29 08:37:27 2000 +0000
@@ -0,0 +1,80 @@
+/* XPM */
+static char * save_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/dialogs.c	Thu Jun 29 05:15:55 2000 +0000
+++ b/src/dialogs.c	Thu Jun 29 08:37:27 2000 +0000
@@ -40,6 +40,9 @@
 #include "gaim.h"
 #include "gtkhtml.h"
 
+#include "pixmaps/cancel.xpm"
+#include "pixmaps/save.xpm"
+
 #define DEFAULT_FONT_NAME "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1"
 
 char *fontface;
@@ -362,6 +365,7 @@
 	GtkWidget *label;
 	GtkWidget *vbox;
         GtkWidget *bbox;
+
         struct warning *w = g_new0(struct warning, 1);
         
         char *buf = g_malloc(128);
@@ -2385,15 +2389,21 @@
 	GtkWidget *create;
 	GtkWidget *sw;
 	GtkWidget *label;
-	GtkWidget *cancel;
 	GtkWidget *frame;
 	GtkWidget *fbox;
+	GtkWidget *button_box;
+	GtkWidget *button;
+	GdkPixmap *icon;
+	GdkBitmap *mask;
+	GtkWidget *icon_i;
 
         struct create_away *ca = g_new0(struct create_away, 1);
         
 	/* Set up window */
 	ca->window = gtk_window_new(GTK_WINDOW_DIALOG);
-	gtk_container_border_width(GTK_CONTAINER(ca->window), 10);
+ 	gtk_widget_set_usize(ca->window, 275, 200); 
+	gtk_widget_show(ca->window);
+	gtk_container_border_width(GTK_CONTAINER(ca->window), 5);
 	gtk_window_set_policy(GTK_WINDOW(ca->window), FALSE, FALSE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(ca->window), _("Gaim - New away message"));
 	gtk_signal_connect(GTK_OBJECT(ca->window),"delete_event",
@@ -2413,6 +2423,7 @@
 	/* Make a label for away entry */
 	label = gtk_label_new(_("Away title: "));
 	gtk_box_pack_start(GTK_BOX(titlebox), label, TRUE, TRUE, 5);
+	gtk_widget_show(label);
 
 	/* make away title entry */
 	ca->entry = gtk_entry_new();
@@ -2432,15 +2443,51 @@
 	gtk_widget_show(ca->text);
 	gtk_box_pack_start(GTK_BOX(bbox), sw, TRUE, TRUE, 5);   
 
-	/* make create button */
-	create = gtk_button_new_with_label (_("Create new message"));
-	gtk_box_pack_start(GTK_BOX(hbox), create, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(create), "clicked", GTK_SIGNAL_FUNC(create_mess), ca);
+	/* create 'create' button */
 	
+	button_box = gtk_hbox_new(TRUE, 5);
+
+	icon = gdk_pixmap_create_from_xpm_d( ca->window->window , &mask, NULL, save_xpm);
+	icon_i = gtk_pixmap_new ( icon, mask );
+	label = gtk_label_new(_("Save"));
+
+	gtk_box_pack_start(GTK_BOX(button_box), icon_i, FALSE, FALSE, 2);
+	gtk_box_pack_start(GTK_BOX(button_box), label, FALSE, FALSE, 2);
+	gtk_widget_show(icon_i);
+	gtk_widget_show(label);
+
+	button = gtk_button_new();
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(create_mess), ca);
+	gtk_widget_show(button_box);
+	gtk_container_add(GTK_CONTAINER(button), button_box);
+	gtk_widget_show(button);
+
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5);
+
+	/* End of our create button code */
+
 	/* create cancel button */
-	cancel = gtk_button_new_with_label(_("Cancel"));
-	gtk_box_pack_end(GTK_BOX(hbox), cancel, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), ca->window);
+
+	button_box = gtk_hbox_new(TRUE, 5);
+
+	icon = gdk_pixmap_create_from_xpm_d( ca->window->window , &mask, NULL, cancel_xpm);
+	icon_i = gtk_pixmap_new ( icon, mask );
+	label = gtk_label_new(_("Cancel"));
+
+	gtk_box_pack_start(GTK_BOX(button_box), icon_i, FALSE, FALSE, 2);
+	gtk_box_pack_start(GTK_BOX(button_box), label, FALSE, FALSE, 2);
+	gtk_widget_show(icon_i);
+	gtk_widget_show(label);
+
+	button = gtk_button_new();
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), ca->window);
+	gtk_widget_show(button_box);
+	gtk_container_add(GTK_CONTAINER(button), button_box);
+	gtk_widget_show(button);
+
+	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5);
+
+	/* End of our cancel button code */
 
 	/* Checkbox for showing away msg */
 	ca->checkbx = gtk_check_button_new_with_label(_("Make away now"));
@@ -2453,14 +2500,12 @@
 	gtk_container_add(GTK_CONTAINER(frame), fbox);
 	gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
 	gtk_box_pack_start(GTK_BOX(tbox), frame, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(tbox), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(tbox), hbox, TRUE, FALSE, 0);
 	
 	gtk_container_add(GTK_CONTAINER(ca->window), tbox);
 
 	/* let the world see what we have done. */
 	gtk_widget_show(label);
-	gtk_widget_show(create);
-	gtk_widget_show(cancel);
 	gtk_widget_show(ca->checkbx);
 	gtk_widget_show(ca->entry);
 	gtk_widget_show(titlebox);
@@ -2472,8 +2517,4 @@
 
         gtk_widget_realize(ca->window);
         aol_icon(ca->window->window);
-
-	gtk_widget_show(ca->window);
-
-
 }