Alex,
Sorry about those diffs I sent earlier not being context or
unified. Here's a unified diff I got by doing a cvs diff -u
from the dia root directory and then removing the output
from cvs other than the diff output. It contains all of the
diffs I previously sent to you. No more, no less.
-Ben
----------------begin dia-benh-4-11-99.patch------------------
--- app/preferences.c 1999/03/25 15:29:59 1.2
+++ app/preferences.c 1999/04/11 15:55:52
@@ -340,13 +340,18 @@
}
static gint
+prefs_okay(GtkWidget *widget, gpointer data)
+{
+ gint ret = prefs_apply(widget,data);
+ gtk_widget_hide(widget);
+ return ret;
+}
+
+static gint
prefs_apply(GtkWidget *widget, gpointer data)
{
prefs_update_prefs_from_dialog();
prefs_save();
-
- gtk_widget_hide(prefs_dialog);
-
return 1;
}
@@ -482,15 +487,16 @@
dialog_vbox = GTK_DIALOG (prefs_dialog)->vbox;
- button = gtk_button_new_with_label( _("Close") );
+ button = gtk_button_new_with_label( _("OK") );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (prefs_dialog)->action_area),
button, TRUE, TRUE, 0);
gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
- GTK_SIGNAL_FUNC(gtk_widget_hide),
+ GTK_SIGNAL_FUNC(prefs_okay),
GTK_OBJECT(prefs_dialog));
gtk_widget_grab_default (button);
gtk_widget_show (button);
+
button = gtk_button_new_with_label( _("Apply") );
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (prefs_dialog)->action_area),
@@ -498,10 +504,21 @@
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC(prefs_apply),
NULL);
- gtk_signal_connect (GTK_OBJECT (prefs_dialog), "delete_event",
- GTK_SIGNAL_FUNC(gtk_widget_hide), NULL);
gtk_widget_grab_default (button);
gtk_widget_show (button);
+
+ button = gtk_button_new_with_label( _("Close") );
+ GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (prefs_dialog)->action_area),
+ button, TRUE, TRUE, 0);
+ gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
+ GTK_SIGNAL_FUNC(gtk_widget_hide),
+ GTK_OBJECT(prefs_dialog));
+ gtk_widget_grab_default (button);
+ gtk_widget_show (button);
+
+ gtk_signal_connect (GTK_OBJECT (prefs_dialog), "delete_event",
+ GTK_SIGNAL_FUNC(gtk_widget_hide), NULL);
notebook = gtk_notebook_new ();
gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_TOP);
--- app/properties.c 1999/03/14 22:18:32 1.7
+++ app/properties.c 1999/04/11 15:55:52
@@ -31,6 +31,7 @@
static GtkWidget *no_properties_dialog = NULL;
+static gint properties_okay(GtkWidget *canvas, gpointer data);
static gint properties_apply(GtkWidget *canvas, gpointer data);
static void create_dialog()
@@ -48,12 +49,12 @@
dialog_vbox = GTK_DIALOG(dialog)->vbox;
- button = gtk_button_new_with_label( _("Close") );
+ button = gtk_button_new_with_label( _("OK") );
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
button, TRUE, TRUE, 0);
gtk_signal_connect_object(GTK_OBJECT (button), "clicked",
- GTK_SIGNAL_FUNC(gtk_widget_hide),
+ GTK_SIGNAL_FUNC(properties_okay),
GTK_OBJECT(dialog));
gtk_widget_show (button);
@@ -67,6 +68,15 @@
gtk_widget_grab_default(button);
gtk_widget_show(button);
+ button = gtk_button_new_with_label( _("Close") );
+ GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
+ button, TRUE, TRUE, 0);
+ gtk_signal_connect_object(GTK_OBJECT (button), "clicked",
+ GTK_SIGNAL_FUNC(gtk_widget_hide),
+ GTK_OBJECT(dialog));
+ gtk_widget_show (button);
+
gtk_signal_connect(GTK_OBJECT (dialog), "delete_event",
GTK_SIGNAL_FUNC(gtk_widget_hide), NULL);
@@ -83,6 +93,14 @@
current_dia = NULL;
}
return 0;
+}
+
+static gint
+properties_okay(GtkWidget *canvas, gpointer data)
+{
+ gint ret = properties_apply(canvas,data);
+ gtk_widget_hide(canvas);
+ return ret;
}
static gint
--- objects/UML/message.c 1999/03/28 11:20:47 1.11
+++ objects/UML/message.c 1999/04/11 15:55:53
@@ -519,6 +519,8 @@
str = strdup(message->text);
gtk_entry_set_text(prop_dialog->text, str);
g_free(str);
+ } else {
+ gtk_entry_set_text(prop_dialog->text, "");
}
switch (message->type) {
--- objects/UML/object.c 1999/03/25 15:30:56 1.10
+++ objects/UML/object.c 1999/04/11 15:55:53
@@ -464,6 +464,10 @@
strdup(pkg->exstate): NULL;
newpkg->attributes = text_copy(pkg->attributes);
+
+ newpkg->is_active = pkg->is_active;
+ newpkg->show_attributes = pkg->show_attributes;
+ newpkg->is_multiple = pkg->is_multiple;
objet_update_data(newpkg);
--- objects/UML/state.c 1999/04/08 18:34:24 1.1
+++ objects/UML/state.c 1999/04/11 15:55:53
@@ -360,6 +360,8 @@
newstate->connections[i].last_pos = state->connections[i].last_pos;
}
+ newstate->state_type = state->state_type;
+
state_update_data(newstate);
return (Object *)newstate;
--- objects/UML/usecase.c 1999/04/08 18:21:41 1.8
+++ objects/UML/usecase.c 1999/04/11 15:55:54
@@ -371,6 +371,8 @@
newusecase->connections[i].last_pos = usecase->connections[i].last_pos;
}
+ newusecase->text_outside = usecase->text_outside;
+
usecase_update_data(newusecase);
return (Object *)newusecase;
----------------end dia-benh-4-11-99.patch------------------
