[Ayttm-commits] CVS: ayttm/src add_contact_window.c,1.21,1.22 away_window.c,1.16,1.17 edit_account_window.c,1.14,1.15 edit_contact_window.c,1.14,1.15 smileys.c,1.21,1.22trigger.c,1.14,1.15

[Colin Leroy <address@hidden>]

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

Modified Files:
        add_contact_window.c away_window.c edit_account_window.c 
        edit_contact_window.c smileys.c trigger.c 
Log Message:
Micro fixes to GUI (alignment...)



Index: add_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/add_contact_window.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- add_contact_window.c        22 Mar 2003 20:40:17 -0000      1.21
+++ add_contact_window.c        28 Mar 2003 18:07:37 -0000      1.22
@@ -253,10 +253,10 @@
 
                /*Section for adding account*/
 
-               label = gtk_label_new(_("Account:"));
+               label = gtk_label_new(_("Account: "));
                gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 5);
                gtk_widget_show(label);
-               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 0, 1, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 0, 1, GTK_FILL, 
GTK_FILL, 0, 0);
                gtk_widget_show(hbox);
 
                account_name = gtk_entry_new();
@@ -270,10 +270,10 @@
              
                hbox = gtk_hbox_new(FALSE, 0);
 
-               label = gtk_label_new(_("Protocol:"));
+               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, 0, 1, 1, 2, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 1, 2, GTK_FILL, 
GTK_FILL, 0, 0);
                gtk_widget_show(hbox);
 
                /*List of Protocols*/
@@ -282,17 +282,17 @@
                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, 1, 2, 1, 2, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_table_attach(GTK_TABLE(table), service_list, 1, 2, 1, 2, 
GTK_FILL, GTK_FILL, 0, 0);
                gtk_widget_show(service_list);
 
                /*Section for Contact Name*/
 
                hbox = gtk_hbox_new(FALSE, 0);
 
-               label = gtk_label_new(_("Contact:"));
+               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_table_attach(GTK_TABLE(table), hbox, 0, 1, 2, 3, GTK_FILL, 
GTK_FILL, 0, 0);
                gtk_widget_show(hbox);
 
                /*List of available contacts*/
@@ -307,17 +307,17 @@
                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_table_attach(GTK_TABLE(table), contact_name, 1, 2, 2, 3, 
GTK_FILL, GTK_FILL, 0, 0);
                gtk_widget_show(contact_name);
 
                /*Section for Group declaration*/
 
                hbox = gtk_hbox_new(FALSE, 0);
 
-               label = gtk_label_new(_("Group:"));
-               gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+               label = gtk_label_new(_("Group: "));
+               gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 5);
                gtk_widget_show(label);
-               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 3, 4, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 3, 4, GTK_FILL, 
GTK_FILL, 0, 0);
                gtk_widget_show(hbox);
 
                /*List of available groups*/
@@ -341,7 +341,7 @@
                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, 3, 4, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_table_attach(GTK_TABLE(table), group_name, 1, 2, 3, 4, 
GTK_FILL, GTK_FILL, 0, 0);
                gtk_widget_show(group_name);
 
                /*Lets create a frame to put all of this in*/
@@ -402,7 +402,7 @@
                gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
                gtk_widget_show(hbox);
 
-               gtk_table_attach(GTK_TABLE(table), vbox, 0, 1, 0, 1, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_table_attach(GTK_TABLE(table), vbox, 0, 1, 0, 1, GTK_FILL, 
GTK_FILL, 0, 0);
                gtk_widget_show(vbox);
 
                gtk_container_add(GTK_CONTAINER(add_contact_window), table);

Index: away_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/away_window.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- away_window.c       22 Mar 2003 12:39:29 -0000      1.16
+++ away_window.c       28 Mar 2003 18:07:37 -0000      1.17
@@ -295,18 +295,27 @@
 
                table = gtk_table_new(2, 3, FALSE);
 
-               label = gtk_label_new(_("Title:"));
-               gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
+               hbox = gtk_hbox_new(FALSE, 5);
+               label = gtk_label_new(_("Title: "));
+               gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 0, 1,
+                                GTK_FILL, GTK_FILL, 0, 0);
                gtk_widget_show(label);
+               gtk_widget_show(hbox);
 
                title = gtk_entry_new();
-               gtk_table_attach_defaults(GTK_TABLE(table), title, 1, 2, 0, 1);
+               gtk_table_attach(GTK_TABLE(table), title, 1, 2, 0, 1,
+                                GTK_FILL, GTK_FILL, 0, 0);
                gtk_widget_show(title);
                
-               label = gtk_label_new(_("Away Message:"));
-               gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
+               hbox = gtk_hbox_new(FALSE, 5);
+               label = gtk_label_new(_("Away Message: "));
+               gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 1, 2,
+                                GTK_FILL, GTK_FILL, 0, 0);
                gtk_widget_show(label);
-
+               gtk_widget_show(hbox);
+               
                away_message_text_entry = gtk_text_new(NULL,NULL);
                gtk_text_set_editable(GTK_TEXT(away_message_text_entry), TRUE);
                gtk_widget_set_usize(away_message_text_entry, 300, 60);
@@ -314,7 +323,8 @@
                gtk_widget_show(away_message_text_entry);
 
                save_later = gtk_check_button_new_with_label(_("Save for later 
use"));
-               gtk_table_attach_defaults(GTK_TABLE(table), save_later, 1, 2, 
2, 3);
+               gtk_table_attach(GTK_TABLE(table), save_later, 1, 2, 2, 3,
+                                GTK_FILL, GTK_FILL, 0, 0);
                gtk_widget_show(save_later);
 
                frame = gtk_frame_new(_("New Away Message"));

Index: edit_account_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_account_window.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- edit_account_window.c       22 Mar 2003 12:39:29 -0000      1.14
+++ edit_account_window.c       28 Mar 2003 18:07:37 -0000      1.15
@@ -147,10 +147,10 @@
 
                /*Entry for Group Name*/
 
-               label = gtk_label_new(_("Group Name:"));
+               label = gtk_label_new(_("Group Name: "));
                gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 5);
                gtk_widget_show(label);
-               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 0, 1, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 0, 1, GTK_FILL, 
GTK_FILL, 0, 0);
                gtk_widget_show(hbox);
 
                group = gtk_combo_new();
@@ -160,24 +160,24 @@
                g_list_free(list);
                gtk_signal_connect(GTK_OBJECT(GTK_COMBO(group)->entry), 
"changed",
                                GTK_SIGNAL_FUNC(group_changed), NULL);
-               gtk_table_attach(GTK_TABLE(table), group, 1, 2, 0, 1, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_table_attach(GTK_TABLE(table), group, 1, 2, 0, 1, GTK_FILL, 
GTK_FILL, 0, 0);
                gtk_widget_show(group);
 
                /*Entry for Contact Name*/
 
                hbox = gtk_hbox_new(FALSE, 5);
 
-               label = gtk_label_new(_("Contact Name:"));
+               label = gtk_label_new(_("Contact Name: "));
                gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 5);
                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, 1, 2, GTK_FILL, 
GTK_FILL, 0, 0);
                gtk_widget_show(hbox);
 
                nick = gtk_combo_new();
                list = llist_to_glist(get_contacts(COMBO_TEXT(group)), 1);
                gtk_combo_set_popdown_strings(GTK_COMBO(nick), list);
                g_list_free(list);
-               gtk_table_attach(GTK_TABLE(table), nick, 1, 2, 1, 2, 
GTK_EXPAND, GTK_EXPAND, 0, 0);
+               gtk_table_attach(GTK_TABLE(table), nick, 1, 2, 1, 2, GTK_FILL, 
GTK_FILL, 0, 0);
                gtk_widget_show(nick);
 
                /*Lets create the frame to put this in*/

Index: edit_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_contact_window.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- edit_contact_window.c       22 Mar 2003 20:40:17 -0000      1.14
+++ edit_contact_window.c       28 Mar 2003 18:07:37 -0000      1.15
@@ -92,11 +92,11 @@
                
                /* Contact */
                
-               label = gtk_label_new(_("Contact Name:"));
+               label = gtk_label_new(_("Contact Name: "));
                gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 5);
                gtk_widget_show(label);
-               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 0, 1, GTK_EXPAND,
-                               GTK_EXPAND, 0, 0);
+               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 0, 1, GTK_FILL,
+                               GTK_FILL, 0, 0);
                gtk_widget_show(hbox);
                
                nick = gtk_entry_new();
@@ -110,12 +110,12 @@
 
                /* Group */
                
-               label = gtk_label_new(_("Group Name:"));
+               label = gtk_label_new(_("Group Name: "));
                gtk_box_pack_end(GTK_BOX(hbox),label, FALSE, FALSE, 5);
                gtk_widget_show(label);
 
                gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 1, 2,
-                               GTK_EXPAND, GTK_EXPAND, 0, 0);
+                               GTK_FILL, GTK_FILL, 0, 0);
                gtk_widget_show(hbox);
                
                group_list = gtk_combo_new();
@@ -123,7 +123,7 @@
                gtk_combo_set_popdown_strings(GTK_COMBO(group_list), list );
                g_list_free(list);
                gtk_table_attach(GTK_TABLE(table), group_list, 1, 2, 1, 2,
-                               GTK_EXPAND, GTK_EXPAND, 0, 0);
+                               GTK_FILL, GTK_FILL, 0, 0);
 
                gtk_widget_show(group_list);
                gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(group_list)->entry), 
@@ -133,10 +133,10 @@
 
                /* Default service */
                
-               label = gtk_label_new(_("Default Protocol:"));
+               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,
+               gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 2, 3, GTK_FILL, 
GTK_FILL,
                                0, 0);
                gtk_widget_show(hbox);
 
@@ -148,7 +148,7 @@
                                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_FILL, GTK_FILL, 0, 0);
                gtk_widget_show(service_list);
                
                frame = gtk_frame_new(NULL);
@@ -203,7 +203,7 @@
                
                table = gtk_table_new(1, 1, FALSE);
                gtk_table_attach(GTK_TABLE(table), vbox, 0, 1, 0, 1,
-                               GTK_EXPAND, GTK_EXPAND, 0, 0);
+                               GTK_FILL, GTK_FILL, 0, 0);
                gtk_widget_show(vbox);
                
                gtk_container_add(GTK_CONTAINER(edit_contact_window), table);

Index: smileys.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/smileys.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- smileys.c   27 Mar 2003 21:36:27 -0000      1.21
+++ smileys.c   28 Mar 2003 18:07:37 -0000      1.22
@@ -221,10 +221,10 @@
        if (ipos < strlen(text))
                g_string_append_c(newstr, text[ipos++]);
       }
-      if(text[ipos] == '>')
+      if(text[ipos] == '>') {
        if (ipos < strlen(text))
                g_string_append_c(newstr, text[ipos++]);
-      else     /* text[ipos] is null */
+      } else   /* text[ipos] is null */
         break;
     }
 

Index: trigger.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/trigger.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- trigger.c   25 Mar 2003 23:04:59 -0000      1.14
+++ trigger.c   28 Mar 2003 18:07:38 -0000      1.15
@@ -315,7 +315,7 @@
   gtk_widget_realize(edit_trigger_window);
   gtk_container_set_border_width(GTK_CONTAINER(edit_trigger_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);
@@ -324,10 +324,10 @@
      
   /*Section for letting the user know which trigger they are editing*/
      
-  label = gtk_label_new(_("User:"));
+  label = gtk_label_new(_("User: "));
   gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 5);
   gtk_widget_show(label);
-  gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 0, 1, GTK_EXPAND, GTK_EXPAND, 
0, 0);
+  gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 
0);
   gtk_widget_show(hbox);
      
   account_name = gtk_label_new(con -> nick);
@@ -338,10 +338,10 @@
   /*Section for declaring the trigger*/
   hbox = gtk_hbox_new(FALSE, 0);
      
-  label = gtk_label_new(_("Trigger:"));
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+  label = gtk_label_new(_("Trigger: "));
+  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_FILL, GTK_FILL, 0, 
0);
   gtk_widget_show(hbox);
      
   /*List of trigger types*/
@@ -353,17 +353,17 @@
        
   gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO(trigger_list)->entry), 0);
   g_list_free(list);
-  gtk_table_attach(GTK_TABLE(table), trigger_list, 3, 4, 0, 1, GTK_EXPAND, 
GTK_EXPAND, 0, 0);
+  gtk_table_attach(GTK_TABLE(table), trigger_list, 1, 2, 1, 2, GTK_FILL, 
GTK_FILL, 0, 0);
   gtk_widget_show(trigger_list);
      
   /*Section for action declaration*/
      
   hbox = gtk_hbox_new(FALSE, 0);
      
-  label = gtk_label_new(_("Action:"));
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+  label = gtk_label_new(_("Action: "));
+  gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 5);
   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, 2, 3, GTK_FILL, GTK_FILL, 0, 
0);
   gtk_widget_show(hbox);
      
   /*List of available actions*/
@@ -374,16 +374,16 @@
   gtk_list_select_item(GTK_LIST(GTK_COMBO(action_name)->list), 
con->trigger.action);
 
   g_list_free(list);
-  gtk_table_attach(GTK_TABLE(table), action_name, 1, 2, 1, 2, GTK_EXPAND, 
GTK_EXPAND, 0, 0);
+  gtk_table_attach(GTK_TABLE(table), action_name, 1, 2, 2, 3, GTK_FILL, 
GTK_FILL, 0, 0);
   gtk_widget_show(action_name);
       
   /*Section for Contact Name*/
   hbox = gtk_hbox_new(FALSE, 0);
       
-  label = gtk_label_new(_("Parameter:"));
-  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+  label = gtk_label_new(_("Parameter: "));
+  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_table_attach(GTK_TABLE(table), hbox, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 0, 
0);
   gtk_widget_show(hbox);
      
   /*Entry for parameter*/
@@ -400,7 +400,7 @@
                     con);
   gtk_box_pack_start(GTK_BOX(hbox_param), browse_button, FALSE, FALSE, 0);
        
-  gtk_table_attach(GTK_TABLE(table), hbox_param, 3, 4, 1, 2, GTK_EXPAND, 
GTK_EXPAND, 0, 0);
+  gtk_table_attach(GTK_TABLE(table), hbox_param, 1, 2, 3, 4, GTK_FILL, 
GTK_FILL, 0, 0);
   gtk_widget_show(parameter);
   gtk_widget_show(browse_button);
   gtk_widget_show(hbox_param);