Commit: 6b5edf96e0379e8bbb9078e784b319bba90dfc31 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: 6b5edf96e0379e8bbb9078e784b319bba90dfc31 (tree)
• Time: 2004-04-02 00:56:29
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Persistent arrow types, too.

Change Summary

• modified: ChangeLog
• modified: app/interface.c
• modified: lib/arrows.c
• modified: lib/arrows.h
• modified: lib/attributes.c

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-04-01  Lars Clausen  <[e-mail]>
 
+	* lib/attributes.c: 
+	* app/interface.c: Default arrows now stored persistently, too.
+
+	* lib/arrows.[ch]: New function to get arrow type from name.
+
 	* app/color_area.c (color_area_create): 
 	* lib/attributes.c: 
 	* app/linewidth_area.c: Also persistent colors and line width.

--- a/app/interface.c
+++ b/app/interface.c
@@ -37,6 +37,7 @@
 #include "persistence.h"
 #include "diaarrowchooser.h"
 #include "dialinechooser.h"
+#include "widgets.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include "dia-app-icons.h"
@@ -1109,9 +1110,15 @@ static void
 create_lineprops_area(GtkWidget *parent)
 {
   GtkWidget *chooser;
+  Arrow arrow;
 
   chooser = dia_arrow_chooser_new(TRUE, change_start_arrow_style, NULL, tool_tips);
   gtk_wrap_box_pack_wrapped(GTK_WRAP_BOX(parent), chooser, FALSE, TRUE, FALSE, TRUE, TRUE);
+  arrow.width = persistence_register_real("start-arrow-width", DEFAULT_ARROW_WIDTH);
+  arrow.length = persistence_register_real("start-arrow-length", DEFAULT_ARROW_LENGTH);
+  arrow.type = arrow_type_from_name(persistence_register_string("start-arrow-type", "None"));
+  dia_arrow_chooser_set_arrow_type(DIA_ARROW_CHOOSER(chooser), arrow.type);
+  attributes_set_default_start_arrow(arrow);
   gtk_tooltips_set_tip(tool_tips, chooser, _("Arrow style at the beginning of new lines.  Click to pick an arrow, or set arrow parameters with Details..."), NULL);
   gtk_widget_show(chooser);
 
@@ -1121,7 +1128,12 @@ create_lineprops_area(GtkWidget *parent)
   gtk_widget_show(chooser);
 
   chooser = dia_arrow_chooser_new(FALSE, change_end_arrow_style, NULL, tool_tips);
-  dia_arrow_chooser_set_arrow_type(DIA_ARROW_CHOOSER(chooser), ARROW_FILLED_CONCAVE);
+  arrow.width = persistence_register_real("end-arrow-width", DEFAULT_ARROW_WIDTH);
+  arrow.length = persistence_register_real("end-arrow-length", DEFAULT_ARROW_LENGTH);
+  arrow.type = arrow_type_from_name(persistence_register_string("end-arrow-type", "Filled Concave"));
+  dia_arrow_chooser_set_arrow_type(DIA_ARROW_CHOOSER(chooser), arrow.type);
+  attributes_set_default_end_arrow(arrow);
+
   gtk_wrap_box_pack(GTK_WRAP_BOX(parent), chooser, FALSE, TRUE, FALSE, TRUE);
   gtk_tooltips_set_tip(tool_tips, chooser, _("Arrow style at the end of new lines.  Click to pick an arrow, or set arrow parameters with Details..."), NULL);
   gtk_widget_show(chooser);

--- a/lib/arrows.c
+++ b/lib/arrows.c
@@ -18,6 +18,8 @@
 
 #include <config.h>
 
+#include <stdio.h>
+#include <string.h>
 #include <glib.h>
 #include <math.h>
 
@@ -1399,3 +1401,14 @@ arrow_draw(DiaRenderer *renderer, ArrowType type,
     break;
   } 
 }
+
+ArrowType
+arrow_type_from_name(gchar *name)
+{
+  int i;
+  for (i = 0; arrow_types[i].name != NULL; i++) {
+    if (!strcmp(arrow_types[i].name, name)) return arrow_types[i].enum_value;
+  }
+  printf("Unknown arrow type %s\n", name);
+  return 0;
+}

--- a/lib/arrows.h
+++ b/lib/arrows.h
@@ -101,4 +101,7 @@ calculate_arrow_point(const Arrow *arrow, const Point *to, const Point *from,
 void arrow_transform_points(Arrow *arrow, Point *start, Point *to,
 			    int linewidth, Point *arrowtip);
 
+/** Returns the ArrowType for a given name of an arrow, or 0 if not found. */
+ArrowType arrow_type_from_name(gchar *name);
+
 #endif /* ARROWS_H */

--- a/lib/attributes.c
+++ b/lib/attributes.c
@@ -101,6 +101,9 @@ void
 attributes_set_default_start_arrow(Arrow arrow)
 {
   attributes_start_arrow = arrow;
+  persistence_set_string("start-arrow-type", arrow_types[arrow.type].name);
+  persistence_set_real("start-arrow-width", arrow.width);
+  persistence_set_real("start-arrow-length", arrow.length);
 }
 
 Arrow