提交: f225364d27d9b450c9c91508049c3093c2463d9d - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修訂: f225364d27d9b450c9c91508049c3093c2463d9d (tree)
• 時間: 2004-05-21 22:58:46
• 作者: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Fixes from Hans, random bug fixes from bugzilla.

Change Summary

• modified: ChangeLog
• modified: acinclude.m4
• modified: app/diagram_tree.c
• modified: app/diaunitspinner.c
• modified: lib/dia_svg.c
• modified: lib/diaarrowchooser.c
• modified: lib/dialinechooser.c
• modified: lib/font.c
• modified: lib/paper.c
• modified: lib/widgets.c
• modified: objects/custom/shape_info.c
• modified: objects/standard/line.c
• modified: plug-ins/python/Makefile.am
• modified: plug-ins/python/diasvg_import.py
• modified: plug-ins/python/scascale.py
• modified: plug-ins/svg/svg-import.c

差異

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
[phone]  Hans Breuer  <[e-mail]>
+ 
+        * acinclude.m4 : disable setting of PYTHON_PREFIX
+	and PYTHON_EXEC_PREFIX from prefix and exec_prefix
+	as workaround for bug #142032 (the real fix would 
+	involve some auto* knowledge which I don't have
+	either;)
+	
+	* plug-ins/python/Makefile.am : more python 
+	plug-ins to be installed (especially svg import,
+	but also 'simple scale' should be useable 
+	sometimes)
+	
+	* plug-ins/python/scascale.py : update display
+	after modifying selected objects
+	
+	* plug-ins/python/diasvg_import.py : initialize
+	stroke to none
+	
[phone]  Lars Clausen  <[e-mail]>
+
+	* app/diagram_tree.c (select_node): Use
+	diagram_remove_all_selected to kill selected list.
+
+	* lib/font.c: Set language when using a different context.
+
+	* plug-ins/svg/svg-import.c: Changed isdigit to g_ascii_isdigit
+	and removed ctype include (#142661).
+
+	* lib/paper.c (get_default_paper): Changed isalnum to
+	g_ascii_isalnum and removed ctype include. (#142661)
+
+	* objects/custom/shape_info.c: 
+	* lib/dia_svg.c: 
+	* app/diaunitspinner.c: Removed unrequired ctype.h include. (#142661)
+
[phone]  Hans Breuer  <[e-mail]>
+
+	* lib/object_defaults.c : don't 'failed to load external 
+	entity "NULL"' when the defaults file does not exist, 
+	bug #108764
+
+	* lib/widgets.c : fixed possible menu leak
+	* lib/dialinechooser.c lib/diaarrowchooser.c : finally
+	avoid finalization of floating references, bug #142307
+
 2004-05-15  Lars Clausen  <[e-mail]>
 
 	* plug-ins/xfig/xfig-import.c: Handle default fonts and illegal

--- a/acinclude.m4
+++ b/acinclude.m4
@@ -96,8 +96,9 @@ else:
   dnl distinct variables so they can be overridden if need be.  However,
   dnl general consensus is that you shouldn't need this ability.
 
-  AC_SUBST([PYTHON_PREFIX], [${prefix}])
-  AC_SUBST([PYTHON_EXEC_PREFIX], [${exec_prefix}])
+  dnl FIXME: with this you'll get NONE/lib/sitepackages below
+  dnl AC_SUBST([PYTHON_PREFIX], [${prefix}])
+  dnl AC_SUBST([PYTHON_EXEC_PREFIX], [${exec_prefix}])
 
   dnl At times (like when building shared libraries) you may want
   dnl to know which OS platform Python thinks this is.

--- a/app/diagram_tree.c
+++ b/app/diagram_tree.c
@@ -74,7 +74,7 @@ select_node(DiagramTree *tree, GtkCTreeNode *node, gboolean raise)
     if (is_object_node(node)) {
       if (o) {
 	update_object(tree, node, o);
-	diagram_unselect_objects(d, d->data->selected);
+	diagram_remove_all_selected(d, FALSE);
 	diagram_select(d, o);
       }
     }

--- a/app/diaunitspinner.c
+++ b/app/diaunitspinner.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include <ctype.h>
 #include <string.h> /* strcmp */
 #include "diaunitspinner.h"
 #include "gdk/gdkkeysyms.h"

--- a/lib/dia_svg.c
+++ b/lib/dia_svg.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <ctype.h>
 #include <locale.h>
 #include <string.h>
 #include <stdlib.h>

--- a/lib/diaarrowchooser.c
+++ b/lib/diaarrowchooser.c
@@ -289,6 +289,8 @@ dia_arrow_chooser_new(gboolean left, DiaChangeArrowCallback callback,
   dia_arrow_chooser_dialog_new(NULL, chooser);
 
   menu = gtk_menu_new();
+  g_object_ref(G_OBJECT(menu));
+  gtk_object_sink(GTK_OBJECT(menu));
   gtk_object_set_data_full(GTK_OBJECT(chooser), button_menu_key, menu,
 			   (GtkDestroyNotify)gtk_widget_unref);
   for (i = 0; arrow_types[i].name != NULL; i++) {

--- a/lib/dialinechooser.c
+++ b/lib/dialinechooser.c
@@ -115,6 +115,7 @@ dia_line_preview_expose(GtkWidget *widget, GdkEventExpose *event)
   GdkGC *gc;
   GdkGCValues gcvalues;
   char dash_list[6];
+  int line_width = 2;
 
   if (GTK_WIDGET_DRAWABLE(widget)) {
     width = widget->allocation.width - misc->xpad * 2;
@@ -130,18 +131,18 @@ dia_line_preview_expose(GtkWidget *widget, GdkEventExpose *event)
     gdk_gc_get_values(gc, &gcvalues);
     switch (line->lstyle) {
     case LINESTYLE_SOLID:
-      gdk_gc_set_line_attributes(gc, 1, GDK_LINE_SOLID,
+      gdk_gc_set_line_attributes(gc, line_width, GDK_LINE_SOLID,
 				 gcvalues.cap_style, gcvalues.join_style);
       break;
     case LINESTYLE_DASHED:
-      gdk_gc_set_line_attributes(gc, 1, GDK_LINE_ON_OFF_DASH,
+      gdk_gc_set_line_attributes(gc, line_width, GDK_LINE_ON_OFF_DASH,
 				 gcvalues.cap_style, gcvalues.join_style);
       dash_list[0] = 10;
       dash_list[1] = 10;
       gdk_gc_set_dashes(gc, 0, dash_list, 2);
       break;
     case LINESTYLE_DASH_DOT:
-      gdk_gc_set_line_attributes(gc, 1, GDK_LINE_ON_OFF_DASH,
+      gdk_gc_set_line_attributes(gc, line_width, GDK_LINE_ON_OFF_DASH,
 				 gcvalues.cap_style, gcvalues.join_style);
       dash_list[0] = 10;
       dash_list[1] = 4;
@@ -150,7 +151,7 @@ dia_line_preview_expose(GtkWidget *widget, GdkEventExpose *event)
       gdk_gc_set_dashes(gc, 0, dash_list, 4);
       break;
     case LINESTYLE_DASH_DOT_DOT:
-      gdk_gc_set_line_attributes(gc, 1, GDK_LINE_ON_OFF_DASH,
+      gdk_gc_set_line_attributes(gc, line_width, GDK_LINE_ON_OFF_DASH,
 				 gcvalues.cap_style, gcvalues.join_style);
       dash_list[0] = 10;
       dash_list[1] = 2;
@@ -161,7 +162,7 @@ dia_line_preview_expose(GtkWidget *widget, GdkEventExpose *event)
       gdk_gc_set_dashes(gc, 0, dash_list, 6);
       break;
     case LINESTYLE_DOTTED:
-      gdk_gc_set_line_attributes(gc, 1, GDK_LINE_ON_OFF_DASH,
+      gdk_gc_set_line_attributes(gc, line_width, GDK_LINE_ON_OFF_DASH,
 				 gcvalues.cap_style, gcvalues.join_style);
       dash_list[0] = 2;
       dash_list[1] = 2;
@@ -314,6 +315,8 @@ dia_line_chooser_init (DiaLineChooser *lchooser)
   lchooser->selector = DIALINESTYLESELECTOR(wid);
 
   menu = gtk_menu_new();
+  g_object_ref(G_OBJECT(menu));
+  gtk_object_sink(GTK_OBJECT(menu));
   g_object_set_data_full(G_OBJECT(lchooser), button_menu_key, menu,
 			 (GDestroyNotify)gtk_widget_unref);
   for (i = 0; i <= LINESTYLE_DOTTED; i++) {

--- a/lib/font.c
+++ b/lib/font.c
@@ -106,6 +106,7 @@ void
 dia_font_push_context(PangoContext *pcontext) {
   pango_contexts = g_list_prepend(pango_contexts, pango_context);
   pango_context = pcontext;
+  pango_context_set_language (pango_context, gtk_get_default_language ());
   g_object_ref(pcontext);
 }
 
@@ -113,6 +114,7 @@ void
 dia_font_pop_context() {
   g_object_unref(pango_context);
   pango_context = (PangoContext*)pango_contexts->data;
+  pango_context_set_language (pango_context, gtk_get_default_language ());
   pango_contexts = g_list_next(pango_contexts);
 }
 

--- a/lib/paper.c
+++ b/lib/paper.c
@@ -20,7 +20,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "paper.h"
 
@@ -86,7 +85,7 @@ get_default_paper(void)
   }
   else if((papersize = fopen("/etc/papersize", "r")) != NULL) {
     while(fgets(paper, sizeof(paper), papersize))
-      if(isalnum(paper[0])) {
+      if(g_ascii_isalnum(paper[0])) {
 	break;
       }
     fclose(papersize);

--- a/lib/widgets.c
+++ b/lib/widgets.c
@@ -631,7 +631,7 @@ dia_font_selector_set_styles(DiaFontSelector *fs, FontSelectorEntry *fse,
   int i=0, select = 0;
   PangoFontFace **faces;
   int nfaces;
-  GtkWidget *menu = gtk_menu_new();
+  GtkWidget *menu = NULL;
   long stylebits = 0;
   int menu_item_nr = 0;
   GSList *group = NULL;
@@ -644,6 +644,7 @@ dia_font_selector_set_styles(DiaFontSelector *fs, FontSelectorEntry *fse,
       return;
   }
 
+  menu = gtk_menu_new ();
   pango_font_family_list_faces(fse->family, &faces, &nfaces);
 
   for (i = 0; i < nfaces; i++) {

--- a/objects/custom/shape_info.c
+++ b/objects/custom/shape_info.c
@@ -25,7 +25,6 @@
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 #include <float.h>
-#include <ctype.h>
 #include <string.h>
 #include <locale.h>
 #include "dia_xml_libxml.h"

--- a/objects/standard/line.c
+++ b/objects/standard/line.c
@@ -59,7 +59,6 @@ typedef struct _Line {
 struct _LineProperties {
   real absolute_start_gap, absolute_end_gap;
   real fractional_start_gap, fractional_end_gap;
-  gboolean object_edge_start, object_edge_end;
 };
 
 static LineProperties default_properties;
@@ -141,7 +140,6 @@ static PropDescription line_props[] = {
     N_("Start point"), NULL },
   { "end_point", PROP_TYPE_POINT, 0,
     N_("End point"), NULL },
-  /*
   PROP_FRAME_BEGIN("gaps",0,N_("Line gaps")),
   { "absolute_start_gap", PROP_TYPE_REAL, 0,
     N_("Absolute start gap"), NULL, &gap_range },
@@ -151,12 +149,7 @@ static PropDescription line_props[] = {
     N_("Fractional start gap"), NULL, &gap_range },
   { "fractional_end_gap", PROP_TYPE_REAL, 0,
     N_("Fractional end gap"), NULL, &gap_range },
-  { "object_edge_start", PROP_TYPE_BOOL, 0,
-    N_("Start at object edge"), },
-  { "object_edge_end", PROP_TYPE_BOOL, 0,
-    N_("End at object edge"), },
   PROP_FRAME_END("gaps",0),
-  */
   PROP_DESC_END
 };
 
@@ -178,14 +171,10 @@ static PropOffset line_offsets[] = {
   { "end_arrow", PROP_TYPE_ARROW, offsetof(Line, end_arrow) },
   { "start_point", PROP_TYPE_POINT, offsetof(Connection, endpoints[0]) },
   { "end_point", PROP_TYPE_POINT, offsetof(Connection, endpoints[1]) },
-  /*
   { "absolute_start_gap", PROP_TYPE_REAL, offsetof(Line, absolute_start_gap) },
   { "absolute_end_gap", PROP_TYPE_REAL, offsetof(Line, absolute_end_gap) },
   { "fractional_start_gap", PROP_TYPE_REAL, offsetof(Line, fractional_start_gap) },
   { "fractional_end_gap", PROP_TYPE_REAL, offsetof(Line, fractional_end_gap) },
-  { "object_edge_start", PROP_TYPE_BOOL, offsetof(Line, object_edge_start) },
-  { "object_edge_end", PROP_TYPE_BOOL, offsetof(Line, object_edge_end) },
-  */
   { NULL, 0, 0 }
 };
 
@@ -213,8 +202,6 @@ line_init_defaults() {
     default_properties.absolute_end_gap = 0.0;
     default_properties.fractional_start_gap = 0;
     default_properties.fractional_end_gap = 0;
-    default_properties.object_edge_start = FALSE;
-    default_properties.object_edge_end = FALSE;
     defaults_initialized = 1;
   }
 }
@@ -279,6 +266,7 @@ line_get_object_menu(Line *line, Point *clickedpoint)
   length which could be optionally added to the object intersection
   gap.
 */
+/* This is currently dead code, but may find new use in other places. */
 Point
 calculate_object_edge(Point *objmid, Point *end, DiaObject *obj) 
 {
@@ -484,8 +472,6 @@ line_create(Point *startpoint,
   line->absolute_end_gap = default_properties.absolute_end_gap;
   line->fractional_start_gap = default_properties.fractional_start_gap;
   line->fractional_end_gap = default_properties.fractional_end_gap;
-  line->object_edge_start = default_properties.object_edge_start;
-  line->object_edge_end = default_properties.object_edge_end;
     
   conn = &line->connection;
   conn->endpoints[0] = *startpoint;
@@ -644,12 +630,6 @@ line_save(Line *line, ObjectNode obj_node, const char *filename)
   if (line->fractional_end_gap)
     data_add_real(new_attribute(obj_node, "fractional_end_gap"),
                  line->fractional_end_gap);
-  if (line->object_edge_start)
-    data_add_boolean(new_attribute(obj_node, "object_edge_start"),
-		     line->object_edge_start);
-  if (line->object_edge_end)
-    data_add_boolean(new_attribute(obj_node, "object_edge_end"),
-		     line->object_edge_end);
 
   if (line->line_style != LINESTYLE_SOLID && line->dashlength != DEFAULT_LINESTYLE_DASHLEN)
     data_add_real(new_attribute(obj_node, "dashlength"),
@@ -731,14 +711,6 @@ line_load(ObjectNode obj_node, int version, const char *filename)
   attr = object_find_attribute(obj_node, "fractional_end_gap");
   if (attr != NULL)
     line->fractional_end_gap =  data_real( attribute_first_data(attr) );
-  line->object_edge_start = FALSE;
-  attr = object_find_attribute(obj_node, "object_edge_start");
-  if (attr != NULL)
-    line->object_edge_start = data_boolean( attribute_first_data(attr) );
-  line->object_edge_end = FALSE;
-  attr = object_find_attribute(obj_node, "object_edge_end");
-  if (attr != NULL)
-    line->object_edge_end = data_boolean( attribute_first_data(attr) );
 
   line->dashlength = DEFAULT_LINESTYLE_DASHLEN;
   attr = object_find_attribute(obj_node, "dashlength");

--- a/plug-ins/python/Makefile.am
+++ b/plug-ins/python/Makefile.am
@@ -59,8 +59,11 @@ pyplugindir = $(pkgdatadir)/python
 pyplugin_DATA = \
 	gtkcons.py \
 	diasvg.py \
+	diasvg_import.py \
 	group_props.py \
 	otypes.py \
+	scascale.py \
+	select_by.py \
 	pydiadoc.py
 ## are the other python plugins good for more than just testing purposes?
 
@@ -72,7 +75,10 @@ EXTRA_DIST = \
 	export-object.py \
 	export-render.py \
 	diasvg.py \
+	diasvg_import.py \
 	group_props.py \
 	otypes.py \
+	scascale.py \
+	select_by.py \
 	pydiadoc.py \
 	gtkcons.py

--- a/plug-ins/python/diasvg_import.py
+++ b/plug-ins/python/diasvg_import.py
@@ -58,7 +58,7 @@ def Color(s) :
 	return string.strip(s)
 class Object :
 	def __init__(self) :
-		self.props = {"x" : 0, "y" : 0}
+		self.props = {"x" : 0, "y" : 0, "stroke" : none}
 		# "line_width", "line_colour", "line_style"
 	def style(self, s) :
 		sp1 = string.split(s, ";")

--- a/plug-ins/python/scascale.py
+++ b/plug-ins/python/scascale.py
@@ -137,6 +137,7 @@ def SimpleScale(data, factor) :
 			sMsg = sMsg + "\n%s (%d)" % (s, scaleFailed[s])
 		dia.message(1, sMsg)
 	data.update_extents ()
+	dia.active_display().add_update_all()
 
 def scale_cb(data, flags) :
 	dlg = CScaleDialog(dia.active_display().diagram, data)

--- a/plug-ins/svg/svg-import.c
+++ b/plug-ins/svg/svg-import.c
@@ -34,7 +34,6 @@
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 #include <float.h>
-#include <ctype.h>
 
 #include "intl.h"
 #include "message.h"
@@ -320,7 +319,7 @@ read_poly_svg(xmlNodePtr node, DiagramData *dia, char *object_type) {
     tmp = str = xmlGetProp(node, "points");
     while (tmp[0] != '\0') {
       /* skip junk */
-      while (tmp[0] != '\0' && !isdigit(tmp[0]) && tmp[0]!='.'&&tmp[0]!='-')
+      while (tmp[0] != '\0' && !g_ascii_isdigit(tmp[0]) && tmp[0]!='.'&&tmp[0]!='-')
 	tmp++;
       if (tmp[0] == '\0') break;
       old_locale = setlocale(LC_NUMERIC, "C");