[gq-commit] gq/src dt_clist.c,1.4,1.5 dt_time.c,1.7,1.8 errorchain.c,1.15,1.16 filter.c,1.20,1.21 input.c,1.61,1.62 mainwin.c,1.37,1.38 prefs.c,1.35,1.36 util.c,1.63,1.64

[<sta...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5388

Modified Files:
	dt_clist.c dt_time.c errorchain.c filter.c input.c mainwin.c 
	prefs.c util.c 
Log Message:
* Introduced GTK2 stock buttons. Those buttons have nice icons attached and
  make the GUI more friendly


Index: dt_clist.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_clist.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dt_clist.c	29 Sep 2003 19:24:16 -0000	1.4
--- dt_clist.c	9 Oct 2003 05:15:06 -0000	1.5
***************
*** 193,197 ****
       gtk_box_pack_end(GTK_BOX(vbox), hbox1, FALSE, FALSE, 0);
  
!      ok_button = gtk_button_new_with_label(_("OK"));
       gtk_widget_show(ok_button);
       gtk_box_pack_start(GTK_BOX(hbox1), ok_button, FALSE, FALSE, 0);
--- 193,201 ----
       gtk_box_pack_end(GTK_BOX(vbox), hbox1, FALSE, FALSE, 0);
  
! #if GTK_MAJOR >= 2
!      ok_button = gtk_button_new_from_stock(GTK_STOCK_OK);
! #else
!      ok_button = gq_button_new_with_label(_("_OK"));
! #endif
       gtk_widget_show(ok_button);
       gtk_box_pack_start(GTK_BOX(hbox1), ok_button, FALSE, FALSE, 0);

Index: dt_time.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_time.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** dt_time.c	29 Sep 2003 19:24:16 -0000	1.7
--- dt_time.c	9 Oct 2003 05:15:06 -0000	1.8
***************
*** 397,401 ****
       gtk_widget_show(hbox2);
  
!      button2 = gtk_button_new_with_label(_("OK"));
       gtk_widget_show(button2);
       gtk_signal_connect(GTK_OBJECT(button2), "clicked",
--- 397,405 ----
       gtk_widget_show(hbox2);
  
! #if GTK_MAJOR >= 2
!      button2 = gtk_button_new_from_stock(GTK_STOCK_OK);
! #else
!      button2 = gq_button_new_with_label(_("_OK"));
! #endif
       gtk_widget_show(button2);
       gtk_signal_connect(GTK_OBJECT(button2), "clicked",
***************
*** 406,410 ****
       gtk_widget_grab_default(button2);
  
!      button2 = gtk_button_new_with_label(_("Cancel"));
       gtk_box_pack_end(GTK_BOX(hbox2), button2, FALSE, TRUE, 0);
       gtk_signal_connect_object(GTK_OBJECT(button2), "clicked",
--- 410,418 ----
       gtk_widget_grab_default(button2);
  
! #if GTK_MAJOR >= 2
!      button2 = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
! #else
!      button2 = gq_button_new_with_label(_("_Cancel"));
! #endif
       gtk_box_pack_end(GTK_BOX(hbox2), button2, FALSE, TRUE, 0);
       gtk_signal_connect_object(GTK_OBJECT(button2), "clicked",

Index: errorchain.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/errorchain.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** errorchain.c	8 Oct 2003 22:01:07 -0000	1.15
--- errorchain.c	9 Oct 2003 05:15:06 -0000	1.16
***************
*** 268,272 ****
  	  gtk_widget_show(hbox0);
  
! 	  okbutton = gtk_button_new_with_label(_("OK"));
  	  gtk_signal_connect_object(GTK_OBJECT(okbutton), "clicked",
  				    GTK_SIGNAL_FUNC(gtk_widget_destroy),
--- 268,276 ----
  	  gtk_widget_show(hbox0);
  
! #if GTK_MAJOR >= 2
! 	  okbutton = gtk_button_new_from_stock(GTK_STOCK_OK);
! #else
! 	  okbutton = gq_button_new_with_label(_("_OK"));
! #endif
  	  gtk_signal_connect_object(GTK_OBJECT(okbutton), "clicked",
  				    GTK_SIGNAL_FUNC(gtk_widget_destroy),

Index: filter.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/filter.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** filter.c	5 Oct 2003 13:39:35 -0000	1.20
--- filter.c	9 Oct 2003 05:15:06 -0000	1.21
***************
*** 249,253 ****
       gtk_box_pack_start(GTK_BOX(vbox2), hbox0, TRUE, TRUE, 0);
  
!      button = gtk_button_new_with_label(_("OK"));
       gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
                                 GTK_SIGNAL_FUNC(add_filter), GTK_OBJECT(filternamebox));
--- 249,257 ----
       gtk_box_pack_start(GTK_BOX(vbox2), hbox0, TRUE, TRUE, 0);
  
! #if GTK_MAJOR >= 2
!      button = gtk_button_new_from_stock(GTK_STOCK_OK);
! #else
!      button = gq_button_new_with_label(_("_OK"));
! #endif
       gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
                                 GTK_SIGNAL_FUNC(add_filter), GTK_OBJECT(filternamebox));
***************
*** 340,344 ****
--- 344,352 ----
       gtk_box_pack_start(GTK_BOX(hbox0), hbox1, FALSE, FALSE, 0);
  
+ #if GTK_MAJOR >= 2
+      new_button = gtk_button_new_from_stock(GTK_STOCK_NEW);
+ #else
       new_button = gq_button_new_with_label(_("_New"));
+ #endif
       GTK_WIDGET_UNSET_FLAGS(new_button, GTK_CAN_DEFAULT);
  #ifdef OLD_FOCUS_HANDLING
***************
*** 348,352 ****
--- 356,364 ----
       gtk_box_pack_start(GTK_BOX(hbox1), new_button, FALSE, FALSE, 0);
  
+ #if GTK_MAJOR >= 2
+      delete_button = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ #else
       delete_button = gq_button_new_with_label(_("_Delete"));
+ #endif
       GTK_WIDGET_UNSET_FLAGS(delete_button, GTK_CAN_DEFAULT);
  #ifdef OLD_FOCUS_HANDLING
***************
*** 356,360 ****
--- 368,376 ----
       gtk_box_pack_start(GTK_BOX(hbox1), delete_button, FALSE, FALSE, 5);
  
+ #if GTK_MAJOR >= 2
+      copy_button = gtk_button_new_from_stock(GTK_STOCK_COPY);
+ #else
       copy_button = gq_button_new_with_label(_("_Copy"));
+ #endif
       GTK_WIDGET_UNSET_FLAGS(copy_button, GTK_CAN_DEFAULT);
       GTK_WIDGET_UNSET_FLAGS(copy_button, GTK_CAN_FOCUS);
***************
*** 401,405 ****
       gtk_box_pack_start(GTK_BOX(vbox1), hbox2, FALSE, FALSE, 5);
  
!      ok_button = gtk_button_new_with_label(_("OK"));
       gtk_widget_show(ok_button);
       gtk_box_pack_start(GTK_BOX(hbox2), ok_button, FALSE, FALSE, 0);
--- 417,425 ----
       gtk_box_pack_start(GTK_BOX(vbox1), hbox2, FALSE, FALSE, 5);
  
! #if GTK_MAJOR >= 2
!      ok_button = gtk_button_new_from_stock(GTK_STOCK_OK);
! #else
!      ok_button = gq_button_new_with_label(_("_OK"));
! #endif
       gtk_widget_show(ok_button);
       gtk_box_pack_start(GTK_BOX(hbox2), ok_button, FALSE, FALSE, 0);
***************
*** 702,706 ****
--- 722,730 ----
       gtk_box_pack_start(GTK_BOX(vbox1), hbox2, FALSE, FALSE, 0);
  
+ #if GTK_MAJOR >= 2
+      save = gtk_button_new_from_stock(GTK_STOCK_SAVE);
+ #else
       save = gq_button_new_with_label(_("_Save"));
+ #endif
       gtk_signal_connect_object(GTK_OBJECT(save), "clicked",
                                 GTK_SIGNAL_FUNC(save_filter), GTK_OBJECT(window));
***************
*** 711,715 ****
       gtk_widget_show(save);
  
!      cancel = gtk_button_new_with_label(_("Cancel"));
       GTK_WIDGET_UNSET_FLAGS(cancel, GTK_CAN_FOCUS);
       gtk_box_pack_end(GTK_BOX(hbox2), cancel, FALSE, FALSE, 0);
--- 735,743 ----
       gtk_widget_show(save);
  
! #if GTK_MAJOR >= 2
!      cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
! #else
!      cancel = gq_button_new_with_label(_("_Cancel"));
! #endif
       GTK_WIDGET_UNSET_FLAGS(cancel, GTK_CAN_FOCUS);
       gtk_box_pack_end(GTK_BOX(hbox2), cancel, FALSE, FALSE, 0);

Index: input.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/input.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** input.c	8 Oct 2003 22:01:10 -0000	1.61
--- input.c	9 Oct 2003 05:15:06 -0000	1.62
***************
*** 266,270 ****
--- 266,274 ----
  
       if(iform->edit) {
+ #if GTK_MAJOR >= 2
+ 	  button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
+ #else
  	  button = gq_button_new_with_label(_("_Apply"));
+ #endif
            gtk_widget_show(button);
            gtk_box_pack_start(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
***************
*** 286,290 ****
--- 290,298 ----
  	  iform->add_as_new_button = button;
  
+ #if GTK_MAJOR >= 2
+ 	  button = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
+ #else
            button = gq_button_new_with_label(_("_Refresh"));
+ #endif
  /*  	  gtk_widget_set_sensitive(button, FALSE); */
  /*            GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS); */
***************
*** 299,303 ****
  
  	  if(iform->close_window) {
! 	       button = gtk_button_new_with_label(_("Close"));
  	       gtk_widget_show(button);
  	       gtk_box_pack_end(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
--- 307,315 ----
  
  	  if(iform->close_window) {
! #if GTK_MAJOR >= 2
! 	       button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
! #else
! 	       button = gq_button_new_with_label(_("_Close"));
! #endif
  	       gtk_widget_show(button);
  	       gtk_box_pack_end(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
***************
*** 315,319 ****
       }
       else {
!           button = gtk_button_new_with_label(_("OK"));
            gtk_widget_show(button);
            gtk_box_pack_start(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
--- 327,335 ----
       }
       else {
! #if GTK_MAJOR >= 2
! 	  button = gtk_button_new_from_stock(GTK_STOCK_OK);
! #else
! 	  button = gq_button_new_with_label(_("_OK"));
! #endif
            gtk_widget_show(button);
            gtk_box_pack_start(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
***************
*** 337,341 ****
  /*                                      (gpointer) iform); */
  
!           button = gtk_button_new_with_label(_("Cancel"));
            gtk_widget_show(button);
            gtk_box_pack_end(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
--- 353,361 ----
  /*                                      (gpointer) iform); */
  
! #if GTK_MAJOR >= 2
! 	  button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
! #else
! 	  button = gq_button_new_with_label(_("_Cancel"));
! #endif
            gtk_widget_show(button);
            gtk_box_pack_end(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
***************
*** 2047,2051 ****
       gtk_box_pack_start(GTK_BOX(vbox2), hbox0, TRUE, TRUE, 0);
  
!      button = gtk_button_new_with_label(_("OK"));
       gtk_signal_connect(GTK_OBJECT(button), "clicked",
  			GTK_SIGNAL_FUNC(attr_ok), &comm);
--- 2067,2075 ----
       gtk_box_pack_start(GTK_BOX(vbox2), hbox0, TRUE, TRUE, 0);
  
! #if GTK_MAJOR >= 2
!      button = gtk_button_new_from_stock(GTK_STOCK_OK);
! #else
!      button = gq_button_new_with_label(_("_OK"));
! #endif
       gtk_signal_connect(GTK_OBJECT(button), "clicked",
  			GTK_SIGNAL_FUNC(attr_ok), &comm);
***************
*** 2056,2060 ****
       gtk_widget_show(button);
  
!      button = gtk_button_new_with_label(_("Cancel"));
       gtk_signal_connect(GTK_OBJECT(button), "clicked",
  			GTK_SIGNAL_FUNC(attr_cancel), 
--- 2080,2088 ----
       gtk_widget_show(button);
  
! #if GTK_MAJOR >= 2
!      button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
! #else
!      button = gq_button_new_with_label(_("_Cancel"));
! #endif
       gtk_signal_connect(GTK_OBJECT(button), "clicked",
  			GTK_SIGNAL_FUNC(attr_cancel), 

Index: mainwin.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/mainwin.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** mainwin.c	5 Oct 2003 22:21:37 -0000	1.37
--- mainwin.c	9 Oct 2003 05:15:06 -0000	1.38
***************
*** 675,679 ****
       gtk_box_pack_start(GTK_BOX(vbox2), hbox0, TRUE, FALSE, 0);
  
!      ok_button = gtk_button_new_with_label(_("OK"));
       gtk_widget_show(ok_button);
       gtk_box_pack_start(GTK_BOX(hbox0), ok_button,
--- 675,683 ----
       gtk_box_pack_start(GTK_BOX(vbox2), hbox0, TRUE, FALSE, 0);
  
! #if GTK_MAJOR >= 2
!      ok_button = gtk_button_new_from_stock(GTK_STOCK_OK);
! #else
!      ok_button = gq_button_new_with_label(_("_OK"));
! #endif
       gtk_widget_show(ok_button);
       gtk_box_pack_start(GTK_BOX(hbox0), ok_button,
***************
*** 762,766 ****
  			TRUE, FALSE, 0);
  
!      about_ok_button = gtk_button_new_with_label(_("OK"));
       gtk_widget_show(about_ok_button);
       gtk_box_pack_start(GTK_BOX(hbox0), about_ok_button,
--- 766,774 ----
  			TRUE, FALSE, 0);
  
! #if GTK_MAJOR >= 2
!      about_ok_button = gtk_button_new_from_stock(GTK_STOCK_OK);
! #else
!      about_ok_button = gq_button_new_with_label(_("_OK"));
! #endif
       gtk_widget_show(about_ok_button);
       gtk_box_pack_start(GTK_BOX(hbox0), about_ok_button,

Index: prefs.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/prefs.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** prefs.c	5 Oct 2003 22:20:58 -0000	1.35
--- prefs.c	9 Oct 2003 05:15:06 -0000	1.36
***************
*** 900,904 ****
       gtk_box_pack_start(GTK_BOX(main_vbox), hbox, FALSE, TRUE, 10);
  
!      okbutton = gtk_button_new_with_label(_("OK"));
       gtk_widget_show(okbutton);
       gtk_signal_connect(GTK_OBJECT(okbutton), "clicked",
--- 900,908 ----
       gtk_box_pack_start(GTK_BOX(main_vbox), hbox, FALSE, TRUE, 10);
  
! #if GTK_MAJOR >= 2
!      okbutton = gtk_button_new_from_stock(GTK_STOCK_OK);
! #else
!      okbutton = gq_button_new_with_label(_("_OK"));
! #endif
       gtk_widget_show(okbutton);
       gtk_signal_connect(GTK_OBJECT(okbutton), "clicked",
***************
*** 909,913 ****
       gtk_widget_grab_default(okbutton);
  
!      cancelbutton = gtk_button_new_with_label(_("Cancel"));
       gtk_widget_show(cancelbutton);
       gtk_signal_connect(GTK_OBJECT(cancelbutton), "clicked",
--- 913,921 ----
       gtk_widget_grab_default(okbutton);
  
! #if GTK_MAJOR >= 2
!      cancelbutton = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
! #else
!      cancelbutton = gq_button_new_with_label(_("_Cancel"));
! #endif
       gtk_widget_show(cancelbutton);
       gtk_signal_connect(GTK_OBJECT(cancelbutton), "clicked",
***************
*** 1206,1210 ****
  /*       gtk_container_border_width(GTK_CONTAINER(hbox_buttons), 10); */
  
!      okbutton = gtk_button_new_with_label(_("OK"));
       gtk_widget_show(okbutton);
       gtk_signal_connect_object(GTK_OBJECT(okbutton), "clicked",
--- 1214,1222 ----
  /*       gtk_container_border_width(GTK_CONTAINER(hbox_buttons), 10); */
  
! #if GTK_MAJOR >= 2
!      okbutton = gtk_button_new_from_stock(GTK_STOCK_OK);
! #else
!      okbutton = gq_button_new_with_label(_("_OK"));
! #endif
       gtk_widget_show(okbutton);
       gtk_signal_connect_object(GTK_OBJECT(okbutton), "clicked",
***************
*** 1216,1220 ****
       gtk_widget_grab_default(okbutton);
  
!      cancelbutton = gtk_button_new_with_label(_("Cancel"));
       gtk_widget_show(cancelbutton);
       gtk_box_pack_end(GTK_BOX(hbox_buttons), cancelbutton, FALSE, TRUE, 0);
--- 1228,1236 ----
       gtk_widget_grab_default(okbutton);
  
! #if GTK_MAJOR >= 2
!      cancelbutton = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
! #else
!      cancelbutton = gq_button_new_with_label(_("_Cancel"));
! #endif
       gtk_widget_show(cancelbutton);
       gtk_box_pack_end(GTK_BOX(hbox_buttons), cancelbutton, FALSE, TRUE, 0);
***************
*** 1277,1281 ****
--- 1293,1303 ----
  
       /* New button */
+ 
+ #if GTK_MAJOR >= 2
+      button_new = gtk_button_new_from_stock(GTK_STOCK_NEW);
+ #else
       button_new = gq_button_new_with_label(_("_New"));
+ #endif
+ 
  #ifdef OLD_FOCUS_HANDLING
       GTK_WIDGET_UNSET_FLAGS(button_new, GTK_CAN_FOCUS);
***************
*** 1391,1395 ****
--- 1413,1422 ----
  
       /* New button */
+ #if GTK_MAJOR >= 2
+      button_new = gtk_button_new_from_stock(GTK_STOCK_NEW);
+ #else
       button_new = gq_button_new_with_label(_("_New"));
+ #endif
+ 
  #ifdef OLD_FOCUS_HANDLING
       GTK_WIDGET_UNSET_FLAGS(button_new, GTK_CAN_FOCUS);
***************
*** 1415,1419 ****
--- 1442,1450 ----
  
       /* Delete button */
+ #if GTK_MAJOR >= 2
+      button_delete = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ #else
       button_delete = gq_button_new_with_label(_("_Delete"));
+ #endif
  #ifdef OLD_FOCUS_HANDLING
       GTK_WIDGET_UNSET_FLAGS(button_delete, GTK_CAN_FOCUS);

Index: util.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/util.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** util.c	8 Oct 2003 22:01:13 -0000	1.63
--- util.c	9 Oct 2003 05:15:06 -0000	1.64
***************
*** 968,972 ****
       gtk_box_pack_start(GTK_BOX(vbox3), hbox0, TRUE, TRUE, 0);
  
!      ok_button = gtk_button_new_with_label(_("OK"));
       gtk_signal_connect_object(GTK_OBJECT(ok_button), "clicked",
  			       (GtkSignalFunc) gtk_widget_destroy,
--- 968,976 ----
       gtk_box_pack_start(GTK_BOX(vbox3), hbox0, TRUE, TRUE, 0);
  
! #if GTK_MAJOR >= 2
!      ok_button = gtk_button_new_from_stock(GTK_STOCK_OK);
! #else
!      ok_button = gq_button_new_with_label(_("_OK"));
! #endif
       gtk_signal_connect_object(GTK_OBJECT(ok_button), "clicked",
  			       (GtkSignalFunc) gtk_widget_destroy,
***************
*** 1329,1333 ****
       gtk_box_pack_start(GTK_BOX(vbox2), hbox0, TRUE, TRUE, 0);
  
!      button = gtk_button_new_with_label(_("OK"));
       gtk_signal_connect(GTK_OBJECT(button), "clicked",
  			GTK_SIGNAL_FUNC(query_ok), GTK_OBJECT(comm));
--- 1333,1342 ----
       gtk_box_pack_start(GTK_BOX(vbox2), hbox0, TRUE, TRUE, 0);
  
! #if GTK_MAJOR >= 2
!      button = gtk_button_new_from_stock(GTK_STOCK_OK);
! #else
!      button = gq_button_new_with_label(_("_OK"));
! #endif
! 
       gtk_signal_connect(GTK_OBJECT(button), "clicked",
  			GTK_SIGNAL_FUNC(query_ok), GTK_OBJECT(comm));
***************
*** 1338,1342 ****
       gtk_widget_show(button);
  
!      button = gtk_button_new_with_label(_("Cancel"));
       gtk_signal_connect(GTK_OBJECT(button), "clicked",
  			GTK_SIGNAL_FUNC(query_cancel), 
--- 1347,1356 ----
       gtk_widget_show(button);
  
! #if GTK_MAJOR >= 2
!      button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
! #else
!      button = gq_button_new_with_label(_("_Cancel"));
! #endif
! 
       gtk_signal_connect(GTK_OBJECT(button), "clicked",
  			GTK_SIGNAL_FUNC(query_cancel),