[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: x_attribedit.c
User: ahvezda
Date: 06/10/20 21:46:29
Modified: . x_attribedit.c x_dialog.c x_print.c
Log:
Applied patch by Patrick Bernaud to Change button order of dialogs to
be more standard on *nix desktops.
Revision Changes Path
1.5 +10 -10 eda/geda/gaf/gschem/src/x_attribedit.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_attribedit.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_attribedit.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- x_attribedit.c 19 Oct 2006 22:37:36 -0000 1.4
+++ x_attribedit.c 21 Oct 2006 01:46:29 -0000 1.5
@@ -389,16 +389,6 @@
gtk_box_pack_start (GTK_BOX (hbox1), hbuttonbox1, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox1), 1);
- okbutton = gtk_button_new_from_stock (GTK_STOCK_OK);
- gtk_widget_ref (okbutton);
- gtk_object_set_data_full (GTK_OBJECT (aewindow), "okbutton", okbutton,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (okbutton);
- gtk_container_add (GTK_CONTAINER (hbuttonbox1), okbutton);
- gtk_container_set_border_width (GTK_CONTAINER (okbutton), 3);
- GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
- gtk_button_set_relief (GTK_BUTTON (okbutton), GTK_RELIEF_HALF);
-
if (list) { /* gschem specific */
deletebutton = gtk_button_new_from_stock (GTK_STOCK_DELETE);
gtk_widget_ref (deletebutton);
@@ -419,6 +409,16 @@
gtk_container_set_border_width (GTK_CONTAINER (cancelbutton), 3);
GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
+ okbutton = gtk_button_new_from_stock (GTK_STOCK_OK);
+ gtk_widget_ref (okbutton);
+ gtk_object_set_data_full (GTK_OBJECT (aewindow), "okbutton", okbutton,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (okbutton);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox1), okbutton);
+ gtk_container_set_border_width (GTK_CONTAINER (okbutton), 3);
+ GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
+ gtk_button_set_relief (GTK_BUTTON (okbutton), GTK_RELIEF_HALF);
+
frame1 = gtk_frame_new (_("Add/Edit Attribute"));
gtk_widget_ref (frame1);
gtk_object_set_data_full (GTK_OBJECT (aewindow), "frame1", frame1,
1.62 +108 -108 eda/geda/gaf/gschem/src/x_dialog.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_dialog.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_dialog.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- x_dialog.c 4 Oct 2006 20:11:40 -0000 1.61
+++ x_dialog.c 21 Oct 2006 01:46:29 -0000 1.62
@@ -268,6 +268,16 @@
gtk_object_set_data(GTK_OBJECT(w_current->tiwindow),
"tientry",tientry);
+ buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
+ GTK_WIDGET_SET_FLAGS (buttoncancel, GTK_CAN_DEFAULT);
+ gtk_box_pack_start(
+ GTK_BOX(action_area),
+ buttoncancel, TRUE, TRUE, 0);
+ gtk_signal_connect (GTK_OBJECT (buttoncancel), "clicked",
+ GTK_SIGNAL_FUNC(text_input_dialog_close),
+ w_current);
+ gtk_widget_show (buttoncancel);
+
buttonok = gtk_button_new_from_stock (GTK_STOCK_APPLY);
GTK_WIDGET_SET_FLAGS (buttonok, GTK_CAN_DEFAULT);
gtk_box_pack_start(
@@ -279,15 +289,6 @@
gtk_widget_show (buttonok);
gtk_widget_grab_default (buttonok);
- buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- GTK_WIDGET_SET_FLAGS (buttoncancel, GTK_CAN_DEFAULT);
- gtk_box_pack_start(
- GTK_BOX(action_area),
- buttoncancel, TRUE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (buttoncancel), "clicked",
- GTK_SIGNAL_FUNC(text_input_dialog_close),
- w_current);
- gtk_widget_show (buttoncancel);
}
if (!GTK_WIDGET_VISIBLE (w_current->tiwindow)) {
@@ -650,6 +651,16 @@
gtk_widget_show(optionmenu);
+ buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+ GTK_WIDGET_SET_FLAGS(buttoncancel, GTK_CAN_DEFAULT);
+ gtk_box_pack_start(
+ GTK_BOX(action_area),
+ buttoncancel, TRUE, TRUE, 5);
+ gtk_signal_connect(GTK_OBJECT (buttoncancel), "clicked",
+ GTK_SIGNAL_FUNC(text_edit_dialog_cancel),
+ w_current);
+ gtk_widget_show(buttoncancel);
+
buttonok = gtk_button_new_from_stock (GTK_STOCK_OK);
GTK_WIDGET_SET_FLAGS (buttonok, GTK_CAN_DEFAULT);
gtk_box_pack_start(
@@ -661,16 +672,6 @@
gtk_widget_show(buttonok);
gtk_widget_grab_default(buttonok);
- buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
- GTK_WIDGET_SET_FLAGS(buttoncancel, GTK_CAN_DEFAULT);
- gtk_box_pack_start(
- GTK_BOX(action_area),
- buttoncancel, TRUE, TRUE, 5);
- gtk_signal_connect(GTK_OBJECT (buttoncancel), "clicked",
- GTK_SIGNAL_FUNC(text_edit_dialog_cancel),
- w_current);
- gtk_widget_show(buttoncancel);
-
}
if (!GTK_WIDGET_VISIBLE (w_current->tewindow)) {
@@ -1006,6 +1007,15 @@
space_entry,
TRUE, TRUE, 10);
+ buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+ GTK_WIDGET_SET_FLAGS(buttoncancel, GTK_CAN_DEFAULT);
+ gtk_box_pack_start(GTK_BOX(action_area),
+ buttoncancel,
+ TRUE, TRUE, 0);
+ gtk_signal_connect(GTK_OBJECT (buttoncancel), "clicked",
+ GTK_SIGNAL_FUNC(line_type_dialog_cancel),
+ line_type_data);
+
buttonok = gtk_button_new_from_stock (GTK_STOCK_OK);
GTK_WIDGET_SET_FLAGS (buttonok, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(action_area),
@@ -1016,15 +1026,6 @@
line_type_data);
gtk_widget_grab_default(buttonok);
- buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
- GTK_WIDGET_SET_FLAGS(buttoncancel, GTK_CAN_DEFAULT);
- gtk_box_pack_start(GTK_BOX(action_area),
- buttoncancel,
- TRUE, TRUE, 0);
- gtk_signal_connect(GTK_OBJECT (buttoncancel), "clicked",
- GTK_SIGNAL_FUNC(line_type_dialog_cancel),
- line_type_data);
-
/* populate the data structure */
line_type_data->dialog = dialog;
line_type_data->width_entry = width_entry;
@@ -1449,6 +1450,15 @@
fill_type_data);
+ buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+ GTK_WIDGET_SET_FLAGS (buttoncancel, GTK_CAN_DEFAULT);
+ gtk_box_pack_start (GTK_BOX (action_area),
+ buttoncancel,
+ TRUE, TRUE, 0);
+ gtk_signal_connect (GTK_OBJECT (buttoncancel), "clicked",
+ GTK_SIGNAL_FUNC (fill_type_dialog_cancel),
+ fill_type_data);
+
buttonok = gtk_button_new_from_stock (GTK_STOCK_OK);
GTK_WIDGET_SET_FLAGS (buttonok, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (action_area),
@@ -1459,15 +1469,6 @@
fill_type_data);
gtk_widget_grab_default (buttonok);
- buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
- GTK_WIDGET_SET_FLAGS (buttoncancel, GTK_CAN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (action_area),
- buttoncancel,
- TRUE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (buttoncancel), "clicked",
- GTK_SIGNAL_FUNC (fill_type_dialog_cancel),
- fill_type_data);
-
/* populate the data structure */
fill_type_data->dialog = dialog;
fill_type_data->fill_type = optionmenu;
@@ -1669,6 +1670,15 @@
w_current);
gtk_widget_show(w_current->aaentry_sweep);
+ buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+ GTK_WIDGET_SET_FLAGS (buttoncancel, GTK_CAN_DEFAULT);
+ gtk_box_pack_start (GTK_BOX (action_area),
+ buttoncancel, TRUE, TRUE, 0);
+ gtk_signal_connect (GTK_OBJECT (buttoncancel), "clicked",
+ GTK_SIGNAL_FUNC(arc_angles_dialog_cancel),
+ w_current);
+ gtk_widget_show (buttoncancel);
+
buttonok = gtk_button_new_from_stock (GTK_STOCK_OK);
GTK_WIDGET_SET_FLAGS (buttonok, GTK_CAN_DEFAULT);
gtk_box_pack_start (
@@ -1680,15 +1690,6 @@
gtk_widget_show (buttonok);
gtk_widget_grab_default (buttonok);
- buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
- GTK_WIDGET_SET_FLAGS (buttoncancel, GTK_CAN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (action_area),
- buttoncancel, TRUE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (buttoncancel), "clicked",
- GTK_SIGNAL_FUNC(arc_angles_dialog_cancel),
- w_current);
- gtk_widget_show (buttoncancel);
-
}
if (!GTK_WIDGET_VISIBLE (w_current->aawindow)) {
@@ -1814,16 +1815,6 @@
gtk_widget_show (w_current->trentry);
gtk_widget_grab_focus(w_current->trentry);
- buttonok = gtk_button_new_from_stock (GTK_STOCK_OK);
- GTK_WIDGET_SET_FLAGS (buttonok, GTK_CAN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (action_area),
- buttonok, TRUE, TRUE, 0);
- gtk_signal_connect(GTK_OBJECT (buttonok), "clicked",
- GTK_SIGNAL_FUNC(translate_dialog_ok),
- w_current);
- gtk_widget_show (buttonok);
- gtk_widget_grab_default (buttonok);
-
buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
GTK_WIDGET_SET_FLAGS (buttoncancel, GTK_CAN_DEFAULT);
gtk_box_pack_start(
@@ -1834,6 +1825,16 @@
w_current);
gtk_widget_show (buttoncancel);
+ buttonok = gtk_button_new_from_stock (GTK_STOCK_OK);
+ GTK_WIDGET_SET_FLAGS (buttonok, GTK_CAN_DEFAULT);
+ gtk_box_pack_start (GTK_BOX (action_area),
+ buttonok, TRUE, TRUE, 0);
+ gtk_signal_connect(GTK_OBJECT (buttonok), "clicked",
+ GTK_SIGNAL_FUNC(translate_dialog_ok),
+ w_current);
+ gtk_widget_show (buttonok);
+ gtk_widget_grab_default (buttonok);
+
}
if (!GTK_WIDGET_VISIBLE (w_current->trwindow)) {
@@ -1963,6 +1964,16 @@
gtk_widget_show (w_current->tsentry);
gtk_widget_grab_focus(w_current->tsentry);
+ buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+ GTK_WIDGET_SET_FLAGS (buttoncancel, GTK_CAN_DEFAULT);
+ gtk_box_pack_start(
+ GTK_BOX(action_area),
+ buttoncancel, TRUE, TRUE, 0);
+ gtk_signal_connect(GTK_OBJECT (buttoncancel), "clicked",
+ GTK_SIGNAL_FUNC(text_size_dialog_cancel),
+ w_current);
+ gtk_widget_show (buttoncancel);
+
buttonok = gtk_button_new_from_stock (GTK_STOCK_OK);
GTK_WIDGET_SET_FLAGS (buttonok, GTK_CAN_DEFAULT);
gtk_box_pack_start(
@@ -1973,16 +1984,6 @@
w_current);
gtk_widget_show (buttonok);
gtk_widget_grab_default (buttonok);
-
- buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
- GTK_WIDGET_SET_FLAGS (buttoncancel, GTK_CAN_DEFAULT);
- gtk_box_pack_start(
- GTK_BOX(action_area),
- buttoncancel, TRUE, TRUE, 0);
- gtk_signal_connect(GTK_OBJECT (buttoncancel), "clicked",
- GTK_SIGNAL_FUNC(text_size_dialog_cancel),
- w_current);
- gtk_widget_show (buttoncancel);
}
if (!GTK_WIDGET_VISIBLE (w_current->tswindow)) {
@@ -2112,17 +2113,6 @@
gtk_widget_show(w_current->tsentry);
gtk_widget_grab_focus(w_current->tsentry);
- buttonok = gtk_button_new_from_stock (GTK_STOCK_OK);
- GTK_WIDGET_SET_FLAGS (buttonok, GTK_CAN_DEFAULT);
- gtk_box_pack_start(
- GTK_BOX(action_area),
- buttonok, TRUE, TRUE, 0);
- gtk_signal_connect(GTK_OBJECT (buttonok), "clicked",
- GTK_SIGNAL_FUNC(snap_size_dialog_ok),
- w_current);
- gtk_widget_show (buttonok);
- gtk_widget_grab_default (buttonok);
-
buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
GTK_WIDGET_SET_FLAGS (buttoncancel, GTK_CAN_DEFAULT);
gtk_box_pack_start(
@@ -2133,6 +2123,16 @@
w_current);
gtk_widget_show(buttoncancel);
+ buttonok = gtk_button_new_from_stock (GTK_STOCK_OK);
+ GTK_WIDGET_SET_FLAGS (buttonok, GTK_CAN_DEFAULT);
+ gtk_box_pack_start(
+ GTK_BOX(action_area),
+ buttonok, TRUE, TRUE, 0);
+ gtk_signal_connect(GTK_OBJECT (buttonok), "clicked",
+ GTK_SIGNAL_FUNC(snap_size_dialog_ok),
+ w_current);
+ gtk_widget_show (buttonok);
+ gtk_widget_grab_default (buttonok);
}
if (!GTK_WIDGET_VISIBLE (w_current->tswindow)) {
@@ -2272,6 +2272,15 @@
gtk_widget_show (w_current->seentry);
gtk_widget_grab_focus(w_current->seentry);
+ buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+ GTK_WIDGET_SET_FLAGS (buttoncancel, GTK_CAN_DEFAULT);
+ gtk_box_pack_start (GTK_BOX (action_area), buttoncancel,
+ TRUE, TRUE, 0);
+ gtk_signal_connect (GTK_OBJECT (buttoncancel), "clicked",
+ GTK_SIGNAL_FUNC(slot_edit_dialog_cancel),
+ w_current);
+ gtk_widget_show (buttoncancel);
+
buttonok = gtk_button_new_from_stock (GTK_STOCK_OK);
GTK_WIDGET_SET_FLAGS (buttonok, GTK_CAN_DEFAULT);
gtk_box_pack_start(
@@ -2283,15 +2292,6 @@
gtk_widget_show (buttonok);
gtk_widget_grab_default (buttonok);
- buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
- GTK_WIDGET_SET_FLAGS (buttoncancel, GTK_CAN_DEFAULT);
- gtk_box_pack_start (GTK_BOX (action_area), buttoncancel,
- TRUE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (buttoncancel), "clicked",
- GTK_SIGNAL_FUNC(slot_edit_dialog_cancel),
- w_current);
- gtk_widget_show (buttoncancel);
-
}
if (!GTK_WIDGET_VISIBLE (w_current->sewindow)) {
@@ -2870,6 +2870,15 @@
optionmenu, TRUE, TRUE, 0);
gtk_widget_show (optionmenu);
+ buttonclose = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
+ gtk_box_pack_start(
+ GTK_BOX(action_area),
+ buttonclose, TRUE, TRUE, 0);
+ gtk_signal_connect(GTK_OBJECT (buttonclose), "clicked",
+ GTK_SIGNAL_FUNC(color_edit_dialog_close),
+ w_current);
+ gtk_widget_show(buttonclose);
+
buttonapply = gtk_button_new_from_stock (GTK_STOCK_APPLY);
GTK_WIDGET_SET_FLAGS (buttonapply, GTK_CAN_DEFAULT);
gtk_box_pack_start(
@@ -2881,15 +2890,6 @@
gtk_widget_show (buttonapply);
gtk_widget_grab_default(buttonapply);
- buttonclose = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- gtk_box_pack_start(
- GTK_BOX(action_area),
- buttonclose, TRUE, TRUE, 0);
- gtk_signal_connect(GTK_OBJECT (buttonclose), "clicked",
- GTK_SIGNAL_FUNC(color_edit_dialog_close),
- w_current);
- gtk_widget_show(buttonclose);
-
}
if (!GTK_WIDGET_VISIBLE(w_current->clwindow)) {
@@ -3551,18 +3551,18 @@
/* gtk_object_set_data (GTK_OBJECT (w_current->tswindow), "descend", w_current->preview_checkbox);*/
gtk_box_pack_start(GTK_BOX(vbox), checkdescend, TRUE, TRUE, 0);
- buttonok = gtk_button_new_from_stock (GTK_STOCK_FIND);
- GTK_WIDGET_SET_FLAGS(buttonok, GTK_CAN_DEFAULT);
- gtk_box_pack_start(GTK_BOX(action_area), buttonok, TRUE, TRUE, 0);
- gtk_signal_connect(GTK_OBJECT(buttonok), "clicked",
- GTK_SIGNAL_FUNC(find_text_ok), w_current);
-
buttondone = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
GTK_WIDGET_SET_FLAGS(buttondone, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(action_area), buttondone, TRUE, TRUE, 0);
gtk_signal_connect(GTK_OBJECT(buttondone), "clicked",
GTK_SIGNAL_FUNC(find_text_done), w_current);
+ buttonok = gtk_button_new_from_stock (GTK_STOCK_FIND);
+ GTK_WIDGET_SET_FLAGS(buttonok, GTK_CAN_DEFAULT);
+ gtk_box_pack_start(GTK_BOX(action_area), buttonok, TRUE, TRUE, 0);
+ gtk_signal_connect(GTK_OBJECT(buttonok), "clicked",
+ GTK_SIGNAL_FUNC(find_text_ok), w_current);
+
gtk_widget_show(buttonok);
@@ -4094,6 +4094,12 @@
/* Why is the entry attached to w_current ?? (Werner) */
w_current->tsentry = combo_entry1;
+ buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
+ gtk_box_pack_start(GTK_BOX(action_area), buttoncancel, TRUE, TRUE, 0);
+ gtk_signal_connect(GTK_OBJECT(buttoncancel), "clicked",
+ GTK_SIGNAL_FUNC(autonumber_text_done), w_current);
+ gtk_widget_show(buttoncancel);
+
buttonok = gtk_button_new_from_stock (GTK_STOCK_APPLY);
GTK_WIDGET_SET_FLAGS(buttonok, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(action_area), buttonok, TRUE, TRUE, 0);
@@ -4101,12 +4107,6 @@
GTK_SIGNAL_FUNC(autonumber_text_ok), w_current);
gtk_widget_show(buttonok);
gtk_widget_grab_default(buttonok);
-
- buttoncancel = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- gtk_box_pack_start(GTK_BOX(action_area), buttoncancel, TRUE, TRUE, 0);
- gtk_signal_connect(GTK_OBJECT(buttoncancel), "clicked",
- GTK_SIGNAL_FUNC(autonumber_text_done), w_current);
- gtk_widget_show(buttoncancel);
}
if (!GTK_WIDGET_VISIBLE(w_current->tswindow)) {
1.25 +4 -4 eda/geda/gaf/gschem/src/x_print.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_print.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_print.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- x_print.c 30 Sep 2006 18:38:33 -0000 1.24
+++ x_print.c 21 Oct 2006 01:46:29 -0000 1.25
@@ -90,10 +90,10 @@
filechooser = gtk_file_chooser_dialog_new (_("Save PostScript As..."),
GTK_WINDOW (dialog),
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_SAVE_AS,
- GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL, NULL);
+ GTK_RESPONSE_CANCEL,
+ GTK_STOCK_SAVE_AS,
+ GTK_RESPONSE_ACCEPT, NULL);
filename = gtk_entry_get_text (GTK_ENTRY (dialog->fnfield));
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filechooser), filename);
@@ -414,8 +414,8 @@
/* Add "Cancel" and "Print" buttons */
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_PRINT, GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+ GTK_STOCK_PRINT, GTK_RESPONSE_ACCEPT,
NULL);
/* Set initial radiobutton selection */
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs