Commit: 89284a67bc36b26216b8d5aa0e99c95d50d211f3 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Révision: 89284a67bc36b26216b8d5aa0e99c95d50d211f3 (tree)
• l'heure: 2004-04-06 18:42:12
• Auteur: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Message de Log

Persistent linestyle

Change Summary

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

Modification

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2004-04-02  Lars Clausen  <[e-mail]>
[phone]  Lars Clausen  <[e-mail]>
+
+	* lib/dialinechooser.[ch] (dia_line_chooser_set_line_style): 
+	* lib/attributes.c (attributes_set_default_line_style): 
+	* app/interface.c (create_lineprops_area): 
+	Make line style persistent as well.  Added function to directly
+	set the style and dashlength of a dialinechooser. 
+
[phone]  Lars Clausen  <[e-mail]>
 
 	* app/recent_files.c: Use absolute name for recent files list.
 

--- a/app/interface.c
+++ b/app/interface.c
@@ -1111,6 +1111,8 @@ create_lineprops_area(GtkWidget *parent)
 {
   GtkWidget *chooser;
   Arrow arrow;
+  real dash_length;
+  LineStyle style;
 
   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);
@@ -1125,6 +1127,9 @@ create_lineprops_area(GtkWidget *parent)
   chooser = dia_line_chooser_new(change_line_style, NULL);
   gtk_wrap_box_pack(GTK_WRAP_BOX(parent), chooser, TRUE, TRUE, FALSE, TRUE);
   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);
   gtk_widget_show(chooser);
 
   chooser = dia_arrow_chooser_new(FALSE, change_end_arrow_style, NULL, tool_tips);

--- a/lib/attributes.c
+++ b/lib/attributes.c
@@ -135,6 +135,8 @@ attributes_set_default_line_style(LineStyle style, real dash_length)
 {
   attributes_linestyle = style;
   attributes_dash_length = dash_length;
+  persistence_set_integer("line-style", style);
+  persistence_set_real("dash-length", dash_length);
 }
 
 void

--- a/lib/dialinechooser.c
+++ b/lib/dialinechooser.c
@@ -258,15 +258,24 @@ dia_line_chooser_change_line_style(GtkMenuItem *mi, DiaLineChooser *lchooser)
   LineStyle lstyle = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mi),
 						       menuitem_enum_key));
 
-  if (lchooser->lstyle != lstyle) {
+  dia_line_chooser_set_line_style(lchooser, lstyle, lchooser->dash_length);
+}
+
+void
+dia_line_chooser_set_line_style(DiaLineChooser *lchooser, 
+				LineStyle lstyle,
+				real dashlength)
+{
+  if (lstyle != lchooser->lstyle) {
     dia_line_preview_set(lchooser->preview, lstyle);
     lchooser->lstyle = lstyle;
     dia_line_style_selector_set_linestyle(lchooser->selector, lchooser->lstyle,
 					  lchooser->dash_length);
-    if (lchooser->callback)
-      (* lchooser->callback)(lchooser->lstyle, lchooser->dash_length,
-			     lchooser->user_data);
   }
+  lchooser->dash_length = dashlength;
+  if (lchooser->callback)
+    (* lchooser->callback)(lchooser->lstyle, lchooser->dash_length,
+			   lchooser->user_data);
 }
 
 static void

--- a/lib/dialinechooser.h
+++ b/lib/dialinechooser.h
@@ -88,7 +88,9 @@ struct _DiaLineChooserClass
   GtkButtonClass parent_class;
 };
 
-
+void dia_line_chooser_set_line_style(DiaLineChooser *lchooser, 
+				     LineStyle style,
+				     real dashlength);
 GtkWidget *dia_line_chooser_new  (DiaChangeLineCallback callback,
 				  gpointer user_data);