提交: 2c7f0103b325cf0f216d940585482a0c6714d240 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修訂: 2c7f0103b325cf0f216d940585482a0c6714d240 (tree)
• 時間: 2004-05-05 20:36:04
• 作者: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Better undo

Change Summary

• modified: ChangeLog
• modified: app/commands.c
• modified: app/dia-props.c
• modified: app/diagram.c
• modified: app/disp_callbacks.c
• modified: app/load_save.c

差異

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* app/dia-props.c (diagram_properties_respond): 
+	* app/diagram.c (diagram_set_modified): 
+	* app/undo.c: 
+	* app/disp_callbacks.c: 
+	* app/commands.c: 
+	* app/load_save.c (diagram_save): 
+	Better handling of undo and modified status -- only diagram
+	properties and page setup explicitly set modified status, all
+	other important changes should be done through the undo stack
+	now.
+
 2004-05-04  Lars Clausen  <[e-mail]>
 
 	* app/app_procs.c (app_init): Consistently open a new diagram if

--- a/app/commands.c
+++ b/app/commands.c
@@ -311,8 +311,10 @@ insert_text(DDisplay *ddisp, Focus *focus, const gchar *text)
     diagram_flush(ddisp->diagram);
   }
 
-  if (any_modified) 
+  if (any_modified) {
+    diagram_modified(ddisp->diagram);
     undo_set_transactionpoint(ddisp->diagram->undo);
+  }
 }
 
 
@@ -428,6 +430,7 @@ edit_cut_text_callback(gpointer data, guint action, GtkWidget *widget)
     object_add_updates(obj, ddisp->diagram);
     undo_object_change(ddisp->diagram, obj, change);
     undo_set_transactionpoint(ddisp->diagram->undo);
+    diagram_modified(ddisp->diagram);
     diagram_flush(ddisp->diagram);
   }
 }
@@ -483,6 +486,7 @@ edit_undo_callback(gpointer data, guint action, GtkWidget *widget)
   dia = ddisp->diagram;
 
   undo_revert_to_last_tp(dia->undo);
+  diagram_modified(dia);
 
   diagram_flush(dia);
 } 
@@ -497,6 +501,7 @@ edit_redo_callback(gpointer data, guint action, GtkWidget *widget)
   dia = ddisp->diagram;
 
   undo_apply_to_next_tp(dia->undo);
+  diagram_modified(dia);
 
   diagram_flush(dia);
 } 
@@ -1045,6 +1050,7 @@ objects_align_h_callback(gpointer data, guint action, GtkWidget *widget)
   diagram_update_connections_selection(dia);
   object_add_updates_list(objects, dia);
   diagram_flush(dia);     
+  diagram_modified(dia);
 
   undo_set_transactionpoint(dia->undo);
 }
@@ -1066,6 +1072,7 @@ objects_align_v_callback(gpointer data, guint action, GtkWidget *widget)
   diagram_update_connections_selection(dia);
   object_add_updates_list(objects, dia);
   diagram_flush(dia);     
+  diagram_modified(dia);
 
   undo_set_transactionpoint(dia->undo);
 }

--- a/app/dia-props.c
+++ b/app/dia-props.c
@@ -272,8 +272,8 @@ diagram_properties_respond(GtkWidget *widget,
 {
   Diagram *active_diagram = ddisplay_active_diagram();
 
-  if (response_id != GTK_RESPONSE_OK ||
-      response_id != GTK_RESPONSE_APPLY) {
+  if (response_id == GTK_RESPONSE_OK ||
+      response_id == GTK_RESPONSE_APPLY) {
     if (active_diagram) {
       active_diagram->data->grid.dynamic =
         gtk_toggle_button_get_active(GTK_CHECK_BUTTON(dynamic_check));
@@ -293,6 +293,7 @@ diagram_properties_respond(GtkWidget *widget,
   				 &active_diagram->data->pagebreak_color);
       diagram_add_update_all(active_diagram);
       diagram_flush(active_diagram);
+      diagram_set_modified(active_diagram, TRUE);
     }
   }
   if (response_id != GTK_RESPONSE_APPLY)

--- a/app/diagram.c
+++ b/app/diagram.c
@@ -214,32 +214,38 @@ diagram_destroy(Diagram *dia)
 gboolean
 diagram_is_modified(Diagram *dia)
 {
-  return dia->mollified;
+  return dia->mollified || !undo_is_saved(dia->undo);
 }
 
+/** We might just have change the diagrams modified status.
+ * This doesn't set the status, but merely updates the display.
+ */
 void
 diagram_modified(Diagram *dia)
 {
-  diagram_set_modified(dia, TRUE);
+  GSList *displays;
+  displays = dia->displays;
+  while (displays != NULL) {
+    DDisplay *display = (DDisplay*) displays->data;
+    ddisplay_update_statusbar(display);
+    displays = g_slist_next(displays);
+  }
+  if (diagram_is_modified(dia)) dia->autosaved = FALSE;
+  /*  diagram_set_modified(dia, TRUE);*/
 }
 
+/** Set this diagram explicitly modified.  This should not be called
+ * by things that change the undo stack, as those modifications are
+ * noticed through changes in the undo stack.
+ */
 void
 diagram_set_modified(Diagram *dia, int modified)
 {
-  GSList *displays;
-
   if (dia->mollified != modified)
   {
     dia->mollified = modified;
-    displays = dia->displays;
-    while (displays != NULL)
-    {
-      DDisplay *display = (DDisplay*) displays->data;
-      ddisplay_update_statusbar(display);
-      displays = g_slist_next(displays);
-    }
   }
-  dia->autosaved = FALSE;
+  diagram_modified(dia);
 }
 
 /* ************ Functions that check for menu sensitivity ********* */

--- a/app/disp_callbacks.c
+++ b/app/disp_callbacks.c
@@ -375,11 +375,11 @@ static void handle_key_event(DDisplay *ddisp, Focus *focus, guint keysym,
   object_add_updates(obj, ddisp->diagram);
 
   if (modified) {
-    diagram_modified(ddisp->diagram);
     if (obj_change != NULL) {
       undo_object_change(ddisp->diagram, obj, obj_change);
       undo_set_transactionpoint(ddisp->diagram->undo);
     }
+    diagram_modified(ddisp->diagram);
   }
 
   diagram_flush(ddisp->diagram);
@@ -942,9 +942,9 @@ ddisplay_drop_object(DDisplay *ddisp, gint x, gint y, DiaObjectType *otype,
   list = g_list_prepend(NULL, obj);
   undo_insert_objects(ddisp->diagram, list, 1);
   diagram_update_extents(ddisp->diagram);
-  diagram_modified(ddisp->diagram);
 
   undo_set_transactionpoint(ddisp->diagram->undo);
+  diagram_modified(ddisp->diagram);
   if (prefs.reset_tools_after_create)
     tool_reset();
   return obj;

--- a/app/load_save.c
+++ b/app/load_save.c
@@ -921,8 +921,8 @@ diagram_save(Diagram *dia, const char *filename)
   }
 
   dia->unsaved = FALSE;
-  diagram_set_modified (dia, FALSE);
   undo_mark_save(dia->undo);
+  diagram_set_modified (dia, FALSE);
 
   diagram_cleanup_autosave(dia);