[Ayttm-commits] CVS: ayttm/src add_contact_window.c,1.20,1.21 edit_contact_window.c,1.13,1.14 edit_group_window.c,1.10,1.11

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv4986/src

Modified Files:
        add_contact_window.c edit_contact_window.c edit_group_window.c 
Log Message:
fix ugly windows


Index: add_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/add_contact_window.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- add_contact_window.c        22 Mar 2003 20:03:48 -0000      1.20
+++ add_contact_window.c        22 Mar 2003 20:40:17 -0000      1.21
@@ -145,6 +145,9 @@
                GList * list = 
llist_to_glist(get_contacts(COMBO_TEXT(group_name)), 1);
                
gtk_signal_handler_block(GTK_OBJECT(GTK_COMBO(contact_name)->entry),
                                contact_input_handler);
+               
+               list = g_list_prepend(list, "");
+               
                gtk_combo_set_popdown_strings(GTK_COMBO(contact_name), list);
                g_list_free(list);
                
gtk_signal_handler_unblock(GTK_OBJECT(GTK_COMBO(contact_name)->entry),
@@ -231,20 +234,17 @@
                GtkWidget *vbox;
                GtkWidget *label;
                GtkWidget *button;
-               GtkWidget *iconwid;
                GtkWidget *table;
                GtkWidget *frame;
                GtkWidget *separator;
                GList *list;
-               GdkPixmap *icon;
-               GdkBitmap *mask;
 
                add_contact_window = gtk_window_new(GTK_WINDOW_DIALOG);
                gtk_window_set_position(GTK_WINDOW(add_contact_window), 
GTK_WIN_POS_MOUSE);
                gtk_widget_realize(add_contact_window);
                
gtk_container_set_border_width(GTK_CONTAINER(add_contact_window), 5);      
 
-               table = gtk_table_new(2, 4, FALSE);
+               table = gtk_table_new(4, 2, FALSE);
                gtk_table_set_row_spacings(GTK_TABLE(table), 5);
                gtk_table_set_row_spacings(GTK_TABLE(table), 5);
                gtk_container_set_border_width(GTK_CONTAINER(table), 5);
@@ -273,7 +273,7 @@
                label = gtk_label_new(_("Protocol:"));
                gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 5);
                gtk_widget_show(label);
-               gtk_table_attach(GTK_TABLE(table), hbox, 2, 3, 0, 1, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 1, 2, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
                gtk_widget_show(hbox);
 
                /*List of Protocols*/
@@ -282,9 +282,34 @@
                list = llist_to_glist(get_service_list(), 1);
                gtk_combo_set_popdown_strings(GTK_COMBO(service_list), list );
                g_list_free(list);
-               gtk_table_attach(GTK_TABLE(table), service_list, 3, 4, 0, 1, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_table_attach(GTK_TABLE(table), service_list, 1, 2, 1, 2, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
                gtk_widget_show(service_list);
 
+               /*Section for Contact Name*/
+
+               hbox = gtk_hbox_new(FALSE, 0);
+
+               label = gtk_label_new(_("Contact:"));
+               gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+               gtk_widget_show(label);
+               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 2, 3, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_widget_show(hbox);
+
+               /*List of available contacts*/
+
+               contact_name = gtk_combo_new();
+               list = llist_to_glist(get_all_contacts(), 1);
+               gtk_combo_set_popdown_strings(GTK_COMBO(contact_name), list );
+               if(cont != NULL)
+                       
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(contact_name)->entry), cont->nick);
+               else
+                       
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(contact_name)->entry), "");
+               g_list_free(list);
+               contact_input_handler = 
gtk_signal_connect(GTK_OBJECT(GTK_ENTRY(GTK_COMBO(contact_name)->entry)), 
"changed",
+                                                                               
                        GTK_SIGNAL_FUNC(con_modified), NULL);
+               gtk_table_attach(GTK_TABLE(table), contact_name, 1, 2, 2, 3, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_widget_show(contact_name);
+
                /*Section for Group declaration*/
 
                hbox = gtk_hbox_new(FALSE, 0);
@@ -292,7 +317,7 @@
                label = gtk_label_new(_("Group:"));
                gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
                gtk_widget_show(label);
-               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 1, 2, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 3, 4, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
                gtk_widget_show(hbox);
 
                /*List of available groups*/
@@ -316,34 +341,9 @@
                g_list_free(list);
                gtk_signal_connect(GTK_OBJECT(GTK_COMBO(group_name)->entry), 
"changed",
                                        GTK_SIGNAL_FUNC(dif_group), NULL);
-               gtk_table_attach(GTK_TABLE(table), group_name, 1, 2, 1, 2, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_table_attach(GTK_TABLE(table), group_name, 1, 2, 3, 4, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
                gtk_widget_show(group_name);
 
-               /*Section for Contact Name*/
-
-               hbox = gtk_hbox_new(FALSE, 0);
-
-               label = gtk_label_new(_("Contact:"));
-               gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 5);
-               gtk_widget_show(label);
-               gtk_table_attach(GTK_TABLE(table), hbox, 2, 3, 1, 2, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
-               gtk_widget_show(hbox);
-
-               /*List of available contacts*/
-
-               contact_name = gtk_combo_new();
-               list = llist_to_glist(get_all_contacts(), 1);
-               gtk_combo_set_popdown_strings(GTK_COMBO(contact_name), list );
-               if(cont != NULL)
-                       
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(contact_name)->entry), cont->nick);
-               else
-                       
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(contact_name)->entry), "");
-               g_list_free(list);
-               contact_input_handler = 
gtk_signal_connect(GTK_OBJECT(GTK_ENTRY(GTK_COMBO(contact_name)->entry)), 
"changed",
-                                                                               
                        GTK_SIGNAL_FUNC(con_modified), NULL);
-               gtk_table_attach(GTK_TABLE(table), contact_name, 3, 4, 1, 2, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
-               gtk_widget_show(contact_name);
-
                /*Lets create a frame to put all of this in*/
 
                frame = gtk_frame_new(NULL);
@@ -368,42 +368,18 @@
 
                gtk_widget_set_usize(hbox2, 200,25);
 
-               icon = gdk_pixmap_create_from_xpm_d(add_contact_window->window, 
&mask, NULL, tb_preferences_xpm);
-               iconwid = gtk_pixmap_new(icon, mask);
-               label = gtk_label_new(_("Add"));
-
-               gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
-               gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-
-               gtk_widget_show(iconwid);
-               gtk_widget_show(label);
-
-               button = gtk_button_new();
+               button = do_icon_button(_("Add"), tb_preferences_xpm, 
add_contact_window);
 
                gtk_signal_connect(GTK_OBJECT(button), "clicked",
                                                        
GTK_SIGNAL_FUNC(add_button_callback),
                                                        NULL);
-               gtk_widget_show(hbox);     
-
-               gtk_container_add(GTK_CONTAINER(button), hbox);         
 
                gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
                gtk_widget_show(button);
 
                /*Cancel Button*/
 
-               hbox = gtk_hbox_new(FALSE, 5);
-               icon = gdk_pixmap_create_from_xpm_d(add_contact_window->window, 
&mask, NULL, cancel_xpm);
-               iconwid = gtk_pixmap_new(icon, mask);
-               label = gtk_label_new(_("Cancel"));
-
-               gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
-               gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-
-               gtk_widget_show(iconwid);
-               gtk_widget_show(label);
-
-               button = gtk_button_new();
+               button = do_icon_button(_("Cancel"), cancel_xpm, 
add_contact_window);
 
                gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
                                                
GTK_SIGNAL_FUNC(gtk_widget_destroy),

Index: edit_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_contact_window.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- edit_contact_window.c       29 Jan 2003 19:19:22 -0000      1.13
+++ edit_contact_window.c       22 Mar 2003 20:40:17 -0000      1.14
@@ -76,22 +76,22 @@
                GtkWidget * hbox2;
                GtkWidget * button;
                GtkWidget * label;
-               GtkWidget * iconwid;
                GtkWidget * frame;
                GtkWidget * table;
                GtkWidget * separator;
-               GdkPixmap *icon;
-               GdkBitmap *mask;
                GList * list;
                edit_contact_window = gtk_window_new(GTK_WINDOW_DIALOG);
+               gtk_window_set_position(GTK_WINDOW(edit_contact_window), 
GTK_WIN_POS_MOUSE);
                gtk_widget_realize(edit_contact_window);
                
gtk_container_set_border_width(GTK_CONTAINER(edit_contact_window), 5);
                
-               table = gtk_table_new(2, 4, FALSE);
+               table = gtk_table_new(3, 2, FALSE);
                gtk_table_set_row_spacings(GTK_TABLE(table), 5);
                gtk_table_set_row_spacings(GTK_TABLE(table), 5);
                gtk_container_set_border_width(GTK_CONTAINER(table), 5);
                
+               /* Contact */
+               
                label = gtk_label_new(_("Contact Name:"));
                gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 5);
                gtk_widget_show(label);
@@ -106,27 +106,10 @@
                gtk_entry_set_text(GTK_ENTRY(nick), c->nick );
                gtk_widget_show(nick);
                
-               hbox = gtk_hbox_new(FALSE, 0);
-               label = gtk_label_new(_("Default Protocol:"));
-               gtk_box_pack_end(GTK_BOX(hbox),label, FALSE, FALSE, 5);
-               gtk_widget_show(label);
-               gtk_table_attach(GTK_TABLE(table), hbox, 2, 3, 0, 1, 
GTK_EXPAND, GTK_EXPAND,
-                               0, 0);
-               gtk_widget_show(hbox);
-
-               
-               service_list = gtk_combo_new();
-               list = llist_to_glist(get_service_list(), 1);
-               gtk_combo_set_popdown_strings(GTK_COMBO(service_list), list );
-               gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(service_list)->entry), 
-                               eb_services[c->default_chatb].name);
-               g_list_free(list);
-               gtk_table_attach(GTK_TABLE(table), service_list, 3, 4, 0, 1,
-                               GTK_EXPAND, GTK_EXPAND, 0, 0);
-               gtk_widget_show(service_list);
-               
                hbox = gtk_hbox_new( FALSE, 0 );
 
+               /* Group */
+               
                label = gtk_label_new(_("Group Name:"));
                gtk_box_pack_end(GTK_BOX(hbox),label, FALSE, FALSE, 5);
                gtk_widget_show(label);
@@ -146,6 +129,28 @@
                gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(group_list)->entry), 
                                c->group->name);
 
+               hbox = gtk_hbox_new(FALSE, 0);
+
+               /* Default service */
+               
+               label = gtk_label_new(_("Default Protocol:"));
+               gtk_box_pack_end(GTK_BOX(hbox),label, FALSE, FALSE, 5);
+               gtk_widget_show(label);
+               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 2, 3, 
GTK_EXPAND, GTK_EXPAND,
+                               0, 0);
+               gtk_widget_show(hbox);
+
+               
+               service_list = gtk_combo_new();
+               list = llist_to_glist(get_service_list(), 1);
+               gtk_combo_set_popdown_strings(GTK_COMBO(service_list), list );
+               gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(service_list)->entry), 
+                               eb_services[c->default_chatb].name);
+               g_list_free(list);
+               gtk_table_attach(GTK_TABLE(table), service_list, 1, 2, 2, 3,
+                               GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_widget_show(service_list);
+               
                frame = gtk_frame_new(NULL);
 
                g_snprintf(buff,1024,_("Edit Properties for %s"), c->nick);
@@ -167,47 +172,21 @@
                
                /*Ok Button*/
    
-               icon = gdk_pixmap_create_from_xpm_d( 
edit_contact_window->window, &mask, NULL, tb_edit_xpm);
-               iconwid = gtk_pixmap_new( icon, mask );
-               label = gtk_label_new(_("Apply"));
-
-               gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
-               gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-
-               gtk_widget_show(iconwid);
-               gtk_widget_show(label);
-
-               button = gtk_button_new();
+               button = do_icon_button(_("Apply"), tb_edit_xpm, 
edit_contact_window);
 
                gtk_signal_connect(GTK_OBJECT(button), "clicked", 
                                                   
GTK_SIGNAL_FUNC(ok_callback), NULL );
 
-               gtk_container_add (GTK_CONTAINER (button), hbox);
-               gtk_widget_show(hbox);
-
                gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
                gtk_widget_show(button);
                
                /*Cancel Button*/
       
-               hbox = gtk_hbox_new(FALSE, 5);
-               icon = gdk_pixmap_create_from_xpm_d( 
edit_contact_window->window, &mask, NULL, cancel_xpm);
-               iconwid = gtk_pixmap_new( icon, mask );
-               label = gtk_label_new(_("Cancel"));
-
-               gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
-               gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-
-               gtk_widget_show(iconwid);
-               gtk_widget_show(label);
-
-               button = gtk_button_new();
+               button = do_icon_button(_("Cancel"), cancel_xpm, 
edit_contact_window);
 
                gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
                                                                          
GTK_SIGNAL_FUNC(gtk_widget_destroy),
                                                                          
GTK_OBJECT(edit_contact_window));
-               gtk_container_add (GTK_CONTAINER (button), hbox);               
-               gtk_widget_show(hbox);     
 
                gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
                gtk_widget_show(button);

Index: edit_group_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_group_window.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- edit_group_window.c 29 Jan 2003 19:19:22 -0000      1.10
+++ edit_group_window.c 22 Mar 2003 20:40:17 -0000      1.11
@@ -28,6 +28,9 @@
 #include "status.h"
 #include "dialog.h"
 #include "util.h"
+#include "pixmaps/tb_edit.xpm"
+#include "pixmaps/cancel.xpm"
+
 
 
 static gint window_open = 0;
@@ -70,13 +73,18 @@
        {
                GtkWidget * vbox = gtk_vbox_new( FALSE, 5 );
                GtkWidget * hbox = gtk_hbox_new( FALSE, 5 );
+               GtkWidget * hbox2;
                GtkWidget * label;
-
+               GtkWidget * button;
+               GtkWidget * frame;
+               GtkWidget * separator;
+               
                edit_group_window = gtk_window_new(GTK_WINDOW_DIALOG);
                gtk_window_set_position(GTK_WINDOW(edit_group_window), 
GTK_WIN_POS_MOUSE);
                gtk_widget_realize(edit_group_window);
-
-               label = gtk_label_new(_("Group Name"));
+               
gtk_container_set_border_width(GTK_CONTAINER(edit_group_window), 5);
+               
+               label = gtk_label_new(_("Group Name:"));
                gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
                gtk_widget_show(label);
 
@@ -85,27 +93,54 @@
                gtk_entry_set_text(GTK_ENTRY(group_name), name);
                gtk_widget_show(group_name);
 
-               gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
+               frame = gtk_frame_new(NULL);
+
+               g_snprintf(buff,1024,_("%s group%s%s"), g?_("Edit"):_("Add"), 
g?" ":"", name);
+               
+               gtk_frame_set_label(GTK_FRAME(frame), buff);
+
+               hbox2=gtk_vbox_new(FALSE,5);
+               gtk_box_pack_start(GTK_BOX(hbox2),hbox,TRUE,TRUE,5);
+               gtk_container_add(GTK_CONTAINER(frame), hbox2);
                gtk_widget_show(hbox);
+               gtk_widget_show(hbox2);
+               
+               gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 5);
+               gtk_widget_show(frame);
+
+               separator = gtk_hseparator_new();
+               gtk_box_pack_start(GTK_BOX(vbox), separator, FALSE, FALSE, 5);
+               gtk_widget_show(separator);
 
                hbox = gtk_hbox_new(TRUE, 5);
 
-               label = gtk_button_new_with_label(_("OK"));
-               gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 5);
-               gtk_signal_connect(GTK_OBJECT(label), "clicked",
-                               GTK_SIGNAL_FUNC(ok_callback), NULL);
-               gtk_widget_show(label);
-
-               label = gtk_button_new_with_label(_("Cancel"));
-               gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 5);
-               gtk_signal_connect(GTK_OBJECT(label), "clicked",
-                               GTK_SIGNAL_FUNC(cancel_callback), NULL);
-
-               gtk_widget_show(label);         
-
-               gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
+               /*Ok Button*/
+               hbox2=gtk_hbox_new(FALSE,5);
+               button = do_icon_button(g?_("Edit"):_("Add"), tb_edit_xpm, 
edit_group_window);
+
+               gtk_signal_connect(GTK_OBJECT(button), "clicked", 
+                                                  
GTK_SIGNAL_FUNC(ok_callback), NULL );
+
+               gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
+               gtk_widget_show(button);
+               
+               /*Cancel Button*/
+      
+               button = do_icon_button(_("Cancel"), cancel_xpm, 
edit_group_window);
+
+               gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
+                                               
GTK_SIGNAL_FUNC(cancel_callback), NULL);
+
+               gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
+               gtk_widget_show(button);
+               
+               hbox = gtk_hbox_new(FALSE, 5);
+               
+               gtk_box_pack_end(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0 );
                gtk_widget_show(hbox);
-
+               gtk_widget_show(hbox2);
+               
+               gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
                gtk_container_add(GTK_CONTAINER(edit_group_window), vbox);
                gtk_widget_show(vbox);