Commit: 062b67e4756fed290cc5c05e0f32aa86aeb29e0d - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: 062b67e4756fed290cc5c05e0f32aa86aeb29e0d (tree)
• Time: 2004-04-07 21:10:07
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Persistent diagram properties window

Change Summary

• modified: ChangeLog
• modified: app/app_procs.c
• modified: app/commands.c
• modified: app/dia-props.c
• modified: app/diagram.c
• modified: app/diagram.h
• modified: app/display.c
• modified: app/filedlg.c
• modified: app/interface.c
• modified: app/recent_files.c

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* app/recent_files.c (open_recent_file_callback): 
+	* app/interface.c (origin_button_press): 
+	* app/filedlg.c (file_open_ok_callback): 
+	* app/display.c: 
+	* app/diagram.[ch]: 
+	* app/commands.c (dialogs_layers_callback): Using new
+	diagram_set_current() function to ensure auxilliary windows are
+	updated. 
+
+	* app/layer_dialog.c: Trying to unify with dia-props.  Diagram
+	menu now borken.  *sniff*
+
+	* app/dia-props.c: Diagram properties window attempted
+	persistentified.  Trying to make more like layer dialog (since it
+	already changes when the diagram changes), but some things still
+	borken.	
+
 2004-04-06  Lars Clausen  <[e-mail]>
 
 	* lib/dialinechooser.[ch] (dia_line_chooser_set_line_style): 

--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -312,7 +312,7 @@ handle_initial_diagram(const char *in_file_name,
     if (diagram != NULL) {
       diagram_update_extents(diagram);
       if (app_is_interactive()) {
-	layer_dialog_set_diagram(diagram);
+	diagram_set_current(diagram);
 	ddisp = new_display(diagram);
       }
     }
@@ -544,6 +544,9 @@ app_init (int argc, char **argv)
     persistence_register_window_create("layer_window",
 				       (NullaryFunc*)&create_layer_dialog);
 
+    persistence_register_window_create("diagram_properties",
+				       (NullaryFunc*)create_diagram_properties_dialog());
+
     /*fill recent file menu */
     recent_file_history_init();
 
@@ -555,6 +558,7 @@ app_init (int argc, char **argv)
     persistence_register_window_create("sheets_main_dialog",
 				       (NullaryFunc*)&sheets_dialog_create);
 
+
     /* In current setup, we can't find the autosaved files. */
     /*autosave_restore_documents();*/
   } else {

--- a/app/commands.c
+++ b/app/commands.c
@@ -1023,7 +1023,8 @@ dialogs_properties_callback(gpointer data, guint action, GtkWidget *widget)
 void
 dialogs_layers_callback(gpointer data, guint action, GtkWidget *widget)
 {
-  layer_dialog_set_diagram(ddisplay_active()->diagram);
+  /* This shouldn't really be necessary */
+  diagram_set_current(ddisplay_active()->diagram);
   layer_dialog_show();
 }
 

--- a/app/dia-props.c
+++ b/app/dia-props.c
@@ -31,8 +31,10 @@
 #include "display.h"
 #include "widgets.h"
 #include "display.h"
+#include "persistence.h"
 
 static GtkWidget *dialog = NULL;
+static GtkWidget *diagram_omenu;
 static GtkWidget *dynamic_check;
 static GtkWidget *width_x_entry, *width_y_entry;
 static GtkWidget *visible_x_entry, *visible_y_entry;
@@ -41,6 +43,28 @@ static GtkWidget *bg_colour, *grid_colour, *pagebreak_colour;
 static void diagram_properties_respond(GtkWidget *widget,
                                        gint response_id,
                                        gpointer user_data);
+static void diagram_properties_retrieve(Diagram *dia);
+void create_diagram_properties_dialog(void);
+void diagram_properties_update_diagram_list(void);
+
+/* diagram_properties_set_diagram
+ * Called when the active diagram is changed. It updates the contents
+ * of the diagram properties dialog
+ */
+void
+diagram_properties_set_diagram(Diagram *dia)
+{
+  int i;
+
+  if (dialog && dia != NULL)
+  {
+    diagram_properties_retrieve(dia);
+
+    i = g_list_index(dia_open_diagrams(), dia);
+    if (i >= 0)
+      gtk_option_menu_set_history(GTK_OPTION_MENU(diagram_omenu), i);
+  }
+}
 
 static void
 diagram_properties_dialog_destroyed(GtkWidget *widget, gpointer userdata)
@@ -49,31 +73,135 @@ diagram_properties_dialog_destroyed(GtkWidget *widget, gpointer userdata)
   dialog = NULL;
 }
 
+/* Update widget sensitivity to deal with dynamic grid and lack of diagram */
 static void
 diagram_properties_update_sensitivity(GtkToggleButton *widget,
 				      gpointer userdata)
 {
   Diagram *dia = ddisplay_active_diagram();
-  dia->data->grid.dynamic =
-        gtk_toggle_button_get_active(GTK_CHECK_BUTTON(dynamic_check));
-  gtk_widget_set_sensitive(width_x_entry, !dia->data->grid.dynamic);
-  gtk_widget_set_sensitive(width_y_entry, !dia->data->grid.dynamic);
-  gtk_widget_set_sensitive(visible_x_entry, !dia->data->grid.dynamic);
-  gtk_widget_set_sensitive(visible_y_entry, !dia->data->grid.dynamic);
+  if (dia == NULL) {
+    gtk_widget_set_sensitive(dynamic_check, FALSE);
+    gtk_widget_set_sensitive(width_x_entry, FALSE);
+    gtk_widget_set_sensitive(width_y_entry, FALSE);
+    gtk_widget_set_sensitive(visible_x_entry, FALSE);
+    gtk_widget_set_sensitive(visible_y_entry, FALSE);
+    gtk_widget_set_sensitive(bg_colour, FALSE);
+    gtk_widget_set_sensitive(grid_colour, FALSE);
+    gtk_widget_set_sensitive(pagebreak_colour, FALSE);
+  } else {
+    dia->data->grid.dynamic =
+      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dynamic_check));
+    gtk_widget_set_sensitive(dynamic_check, TRUE);
+    gtk_widget_set_sensitive(width_x_entry, !dia->data->grid.dynamic);
+    gtk_widget_set_sensitive(width_y_entry, !dia->data->grid.dynamic);
+    gtk_widget_set_sensitive(visible_x_entry, !dia->data->grid.dynamic);
+    gtk_widget_set_sensitive(visible_y_entry, !dia->data->grid.dynamic);
+    gtk_widget_set_sensitive(bg_colour, TRUE);
+    gtk_widget_set_sensitive(grid_colour, TRUE);
+    gtk_widget_set_sensitive(pagebreak_colour, TRUE);
+  }
 }
 
 static void
-create_diagram_properties_dialog(Diagram *dia)
+diagram_properties_select_diagram_callback(GtkWidget *widget, gpointer gdata)
+{
+  Diagram *dia = (Diagram *)gdata;
+
+  diagram_properties_set_diagram(dia);
+}
+
+void
+diagram_properties_update_diagram_list(void)
+{
+  GtkWidget *new_menu;
+  GtkWidget *menu_item;
+  GList *dia_list;
+  Diagram *dia;
+  char *filename;
+  int i;
+  int current_nr;
+
+  if (dialog == NULL) return;
+        
+  new_menu = gtk_menu_new();
+
+  current_nr = -1;
+  
+  i = 0;
+  dia_list = dia_open_diagrams();
+  while (dia_list != NULL) {
+    dia = (Diagram *) dia_list->data;
+
+    if (ddisplay_active() && dia == ddisplay_active()->diagram) {
+      current_nr = i;
+    }
+    
+    filename = strrchr(dia->filename, G_DIR_SEPARATOR);
+    if (filename==NULL) {
+      filename = dia->filename;
+    } else {
+      filename++;
+    }
+    printf("Adding filename %s to menu\n", filename);
+
+    menu_item = gtk_menu_item_new_with_label(filename);
+
+    g_signal_connect (GTK_OBJECT (menu_item), "activate",
+		      /**/
+		      (GtkSignalFunc) diagram_properties_select_diagram_callback,
+		      (gpointer) dia);
+
+    gtk_menu_append( GTK_MENU(new_menu), menu_item);
+    gtk_widget_show (menu_item);
+
+    dia_list = g_list_next(dia_list);
+    i++;
+  }
+
+  if (dia_open_diagrams()==NULL) {
+    menu_item = gtk_menu_item_new_with_label (_("none"));
+    g_signal_connect (GTK_OBJECT (menu_item), "activate",
+		      /**/
+		      (GtkSignalFunc) diagram_properties_select_diagram_callback,
+		      (gpointer) NULL);
+    gtk_menu_append( GTK_MENU(new_menu), menu_item);
+    gtk_widget_show (menu_item);
+  }
+  
+  gtk_option_menu_remove_menu(GTK_OPTION_MENU(diagram_omenu));
+
+  gtk_option_menu_set_menu(GTK_OPTION_MENU(diagram_omenu),
+			   new_menu);
+
+  gtk_option_menu_set_history(GTK_OPTION_MENU(diagram_omenu),
+			      current_nr);
+  gtk_menu_set_active(GTK_MENU(new_menu), current_nr);
+
+  if (current_nr == -1) {
+    dia = NULL;
+    if (dia_open_diagrams()!=NULL) {
+      dia = (Diagram *) dia_open_diagrams()->data;
+    }
+    /**/
+    diagram_properties_set_diagram(dia);
+  }
+}
+
+void
+create_diagram_properties_dialog()
 {
   GtkWidget *dialog_vbox;
   GtkWidget *notebook;
   GtkWidget *table;
   GtkWidget *label;
+  GtkWidget *hbox;
+  GtkWidget *menu;
+  GtkWidget *separator;
   GtkAdjustment *adj;
 
   dialog = gtk_dialog_new_with_buttons(
              _("Diagram Properties"),
-             GTK_WINDOW(ddisplay_active()->shell),
+	     NULL,
              GTK_DIALOG_DESTROY_WITH_PARENT,
              GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
              GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
@@ -83,8 +211,6 @@ create_diagram_properties_dialog(Diagram *dia)
   //GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_OK);
 
-  dialog_vbox = GTK_DIALOG(dialog)->vbox;
-
   gtk_window_set_role(GTK_WINDOW(dialog), "diagram_properties");
 
   g_signal_connect(G_OBJECT(dialog), "response",
@@ -95,6 +221,28 @@ create_diagram_properties_dialog(Diagram *dia)
   g_signal_connect(G_OBJECT(dialog), "destroy_event",
 		   G_CALLBACK(diagram_properties_dialog_destroyed), NULL);
 
+  dialog_vbox = GTK_DIALOG(dialog)->vbox;
+
+  hbox = gtk_hbox_new(FALSE, 1);
+  
+  label = gtk_label_new(_("Diagrams:"));
+  gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
+  gtk_widget_show (label);
+  
+  diagram_omenu = gtk_option_menu_new();
+  gtk_box_pack_start(GTK_BOX(hbox), diagram_omenu, TRUE, TRUE, 2);
+  gtk_widget_show (diagram_omenu);
+
+  menu = gtk_menu_new();
+  gtk_option_menu_set_menu(GTK_OPTION_MENU(diagram_omenu), menu);
+
+  gtk_box_pack_start(GTK_BOX(dialog_vbox), hbox, FALSE, FALSE, 2);
+  gtk_widget_show (hbox);
+
+  separator = gtk_hseparator_new();
+  gtk_box_pack_start(GTK_BOX(dialog_vbox), separator, FALSE, FALSE, 2);
+  gtk_widget_show (separator);
+
   notebook = gtk_notebook_new();
   gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_TOP);
   gtk_box_pack_start(GTK_BOX(dialog_vbox), notebook, TRUE, TRUE, 0);
@@ -231,8 +379,8 @@ diagram_properties_retrieve(Diagram *dia)
   gtk_window_set_title(GTK_WINDOW(dialog), title);
   g_free(name);
   g_free(title);
-  gtk_toggle_button_set_active(GTK_CHECK_BUTTON(dynamic_check),
-			   dia->data->grid.dynamic);
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dynamic_check),
+			       dia->data->grid.dynamic);
   gtk_spin_button_set_value(GTK_SPIN_BUTTON(width_x_entry),
 			    dia->data->grid.width_x);
   gtk_spin_button_set_value(GTK_SPIN_BUTTON(width_y_entry),
@@ -255,8 +403,11 @@ diagram_properties_retrieve(Diagram *dia)
 void
 diagram_properties_show(Diagram *dia)
 {
-  if (!dialog)
-    create_diagram_properties_dialog(dia);
+  if (!dialog) {
+    create_diagram_properties_dialog();
+    persistence_register_window(GTK_WINDOW(dialog));
+    diagram_properties_update_diagram_list();
+  }
  
   diagram_properties_retrieve(dia);
   
@@ -276,7 +427,7 @@ diagram_properties_respond(GtkWidget *widget,
       response_id != GTK_RESPONSE_APPLY) {
     if (active_diagram) {
       active_diagram->data->grid.dynamic =
-        gtk_toggle_button_get_active(GTK_CHECK_BUTTON(dynamic_check));
+        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dynamic_check));
       active_diagram->data->grid.width_x =
         gtk_spin_button_get_value(GTK_SPIN_BUTTON(width_x_entry));
       active_diagram->data->grid.width_y =
@@ -298,17 +449,3 @@ diagram_properties_respond(GtkWidget *widget,
   if (response_id != GTK_RESPONSE_APPLY)
     gtk_widget_hide(dialog);
 }
-
-/* diagram_properties_set_diagram
- * Called when the active diagram is changed. It updates the contents
- * of the diagram properties dialog
- */
-void
-diagram_properties_set_diagram(Diagram *dia)
-{
-  if (dialog && dia != NULL)
-  {
-    diagram_properties_retrieve(dia);
-  }
-}
-

--- a/app/diagram.c
+++ b/app/diagram.c
@@ -76,8 +76,9 @@ diagram_init(Diagram *dia, const char *filename)
   if (!g_list_find(open_diagrams, dia))
     open_diagrams = g_list_prepend(open_diagrams, dia);
 
-  if (app_is_interactive())
-    layer_dialog_update_diagram_list();
+  if (app_is_interactive()) {
+    diagram_set_current(dia);
+  }
 }
 
 int
@@ -129,16 +130,29 @@ new_diagram(const char *filename)  /* Note: filename is copied */
 }
 
 void
+diagram_set_current(Diagram *dia) {
+  layer_dialog_set_diagram(dia);
+  diagram_properties_set_diagram(dia);
+}
+
+void
 diagram_destroy(Diagram *dia)
 {
+  Diagram *other_diagram;
+
   assert(dia->displays==NULL);
 
   diagram_data_destroy(dia->data);
   
   g_free(dia->filename);
 
+  other_diagram = g_list_find(open_diagrams, dia);
+  if (g_list_next(other_diagram) != NULL) other_diagram = g_list_next(other_diagram);
+  else if (g_list_previous(other_diagram) != NULL) other_diagram = g_list_previous(other_diagram);
+  else other_diagram = NULL;
+  printf("Found other diagram %p for %p\n", other_diagram, dia);
   open_diagrams = g_list_remove(open_diagrams, dia);
-  layer_dialog_update_diagram_list();
+  diagram_set_current(other_diagram);
 
   undo_destroy(dia->undo);
   
@@ -1204,7 +1218,7 @@ diagram_set_filename(Diagram *dia, char *filename)
 
   g_free(title);
 
-  layer_dialog_update_diagram_list();
+  diagram_set_current(dia);
   recent_file_history_add((const char *)filename);
 
   diagram_tree_update_name(diagram_tree(), dia);

--- a/app/diagram.h
+++ b/app/diagram.h
@@ -61,6 +61,8 @@ GList *dia_open_diagrams(void); /* Read only! */
 Diagram *diagram_load(const char *filename, DiaImportFilter *ifilter);
 int diagram_load_into (Diagram *dest, const char *filename, DiaImportFilter *ifilter);
 Diagram *new_diagram(const char *filename); /*Note: filename is copied*/
+/** Perform updates related to getting a new current diagram */
+void diagram_set_current(Diagram *diagram);
 void diagram_destroy(Diagram *dia);
 gboolean diagram_is_modified(Diagram *dia);
 void diagram_modified(Diagram *dia);

--- a/app/display.c
+++ b/app/display.c
@@ -1201,16 +1201,16 @@ display_set_active(DDisplay *ddisp)
     active_display = ddisp;
 
     /* perform notification here (such as switch layers dialog) */
-    layer_dialog_set_diagram(ddisp ? ddisp->diagram : NULL);
-    diagram_properties_set_diagram(ddisp ? ddisp->diagram : NULL);
-
     if (ddisp) {
+      diagram_set_current(ddisp->diagram);
       display_update_menu_state(ddisp);
 
       if (prefs.toolbox_on_top) {
         gtk_window_set_transient_for(GTK_WINDOW(interface_get_toolbox_shell()),
                                      GTK_WINDOW(ddisp->shell));
       }
+    } else {
+      diagram_set_current(NULL);
     }
   }
 }

--- a/app/filedlg.c
+++ b/app/filedlg.c
@@ -153,7 +153,7 @@ file_open_ok_callback(GtkWidget *w, GtkFileSelection *fs)
 
   if (diagram != NULL) {
     diagram_update_extents(diagram);
-    layer_dialog_set_diagram(diagram);
+    diagram_set_current(diagram);
 
     ddisp = new_display(diagram);
   }

--- a/app/interface.c
+++ b/app/interface.c
@@ -1129,7 +1129,7 @@ create_lineprops_area(GtkWidget *parent)
   gtk_tooltips_set_tip(tool_tips, chooser, _("Line style for new lines.  Click to pick a line style, or set line style parameters with Details..."), NULL);
   style = persistence_register_integer("line-style", LINESTYLE_SOLID);
   dash_length = persistence_register_real("dash-length", DEFAULT_LINESTYLE_DASHLEN);
-  dia_line_chooser_set_line_style(chooser, style, dash_length);
+  dia_line_chooser_set_line_style(DIA_LINE_CHOOSER(chooser), style, dash_length);
   gtk_widget_show(chooser);
 
   chooser = dia_arrow_chooser_new(FALSE, change_end_arrow_style, NULL, tool_tips);
@@ -1224,7 +1224,7 @@ dia_dnd_file_drag_data_received (GtkWidget        *widget,
 
           if (diagram != NULL) {
             diagram_update_extents(diagram);
-            layer_dialog_set_diagram(diagram);
+	    diagram_set_current(diagram);
             
             ddisp = new_display(diagram);
           }

--- a/app/recent_files.c
+++ b/app/recent_files.c
@@ -205,7 +205,8 @@ recent_file_history_remove (const char *fname)
 }
     
 static void
-open_recent_file_callback (GtkWidget *widget, gpointer data) {
+open_recent_file_callback(GtkWidget *widget, gpointer data)
+{
 	DiaImportFilter *ifilter = NULL;
 	Diagram *diagram = NULL;
 	gchar *filename = (gchar *)data;
@@ -215,7 +216,7 @@ open_recent_file_callback (GtkWidget *widget, gpointer data) {
 	diagram = diagram_load(filename, ifilter);
 	if (diagram != NULL) {
 	    diagram_update_extents(diagram);
-	    layer_dialog_set_diagram(diagram);
+	    diagram_set_current(diagram);
 	    new_display(diagram);
 	} else
 	    recent_file_history_remove (filename);