Commit: 80c646fa5b55c423ffa94ea525080775ce4bedb3 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: 80c646fa5b55c423ffa94ea525080775ce4bedb3 (tree)
• Time: 2004-08-10 03:39:38
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Pre6 commit

Change Summary

• modified: ChangeLog
• modified: NEWS
• modified: RELEASE-PROCESS
• modified: app/highlight.c
• modified: app/load_save.c
• modified: config.h.win32
• modified: configure.in
• modified: dia.spec
• modified: doc/en/dia.xml
• modified: doc/pl/dia.xml
• modified: plug-ins/shape/shape-export.c

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2004-08-07  Lars Clausen  <[e-mail]>
 
+	* configure.in:
+	* config.h.win32: 
+	* doc/pl/dia.xml: 
+	* doc/en/dia.xml: 
+	* dia.spec (Release): 
+	* NEWS: New release 0.94-pre6
+
[phone]  Lars Clausen  <[e-mail]>
+
+	* app/highlight.c (highlight_reset_objects): Unhighlight inside
+	groups as well.
+
+	* app/load_save.c: 
+	* plug-ins/shape/shape-export.c: String capitalization fix from
+	Alan Horkan <[e-mail]>
+
 	* objects/UML/class.c (umlclass_show_comments_callback): Make UML
 	Class object menu kinda work, rather than blow up.  Doesn't do a
 	proper undoable change yet.

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+dia-0.94-pre6: 7-Aug-2004
+
+Fixed crash bug in save as, as well as string sorting issue and crash bug
+in UML class and group unhighlighting bug.
+
 dia-0.94-pre5: 2-Aug-2004
 
 Finally fixed memory leak from layout cache.

--- a/RELEASE-PROCESS
+++ b/RELEASE-PROCESS
@@ -61,7 +61,7 @@ When a new version is about to be released:
 
 4) once the new release is complete and uploaded, announcements on
    freshmeat, the dia web site, the dia mailing list,
-   [e-mail] and maybe a gnotices story
+   [e-mail], gnomefiles.org and maybe a gnotices story
    (news.gnome.org) are made.  Alerting the package maintainers for the
    various distributions is also a good idea, get names from MAINTAINERS
    and update those who have changed.

--- a/app/highlight.c
+++ b/app/highlight.c
@@ -24,6 +24,7 @@
 #include "diagramdata.h"
 #include "object.h"
 #include "object_ops.h"
+#include "group.h"
 
 /* One could argue that the actual setting of the object's field
  * should happen inside lib rather than app.  I think that'd be overkill.
@@ -66,14 +67,14 @@ highlight_object_off(DiaObject *obj, Diagram *dia)
  * highlight_reset_all
  */
 static void
-highlight_reset_layer(Layer *layer, Diagram *dia)
+highlight_reset_objects(GList *objects, Diagram *dia)
 {
-  GList *objects;
-
-  for (objects = layer->objects; objects != NULL;
-       objects = g_list_next(objects)) {
+  for (; objects != NULL; objects = g_list_next(objects)) {
     DiaObject *object = (DiaObject*)objects->data;
     highlight_object_off(object, dia);
+    if (IS_GROUP(object)) {
+      highlight_reset_objects(group_objects(object), dia);
+    }
   }
 }
 
@@ -87,6 +88,6 @@ void
 highlight_reset_all(Diagram *dia) {
   int i;
   for (i = 0; i < dia->data->layers->len; i++) {
-    highlight_reset_layer((Layer*)g_ptr_array_index(dia->data->layers, i), dia);
+    highlight_reset_objects(((Layer*)g_ptr_array_index(dia->data->layers, i))->objects, dia);
   }
 }

--- a/app/load_save.c
+++ b/app/load_save.c
@@ -1005,12 +1005,12 @@ export_native(DiagramData *data, const gchar *filename,
 
 static const gchar *extensions[] = { "dia", NULL };
 DiaExportFilter dia_export_filter = {
-  N_("Native Dia Diagram"),
+  N_("Dia Diagram File"),
   extensions,
   export_native
 };
 DiaImportFilter dia_import_filter = {
-  N_("Native Dia Diagram"),
+  N_("Dia Diagram File"),
   extensions,
   diagram_data_load
 };

--- a/config.h.win32
+++ b/config.h.win32
@@ -17,7 +17,7 @@
 #define GETTEXT_PACKAGE "dia"
 #define LOCALEDIR "../lib/locale"
 
-#define VERSION "0.94-pre5"
+#define VERSION "0.94-pre6"
 
 /*
  * We are linking libxml as DLL with either msvc or mingw, but this

--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this -*- autoconf -*- file with autoconf to produce a 
 dnl configure script.
-AC_INIT(dia, 0.94-pre5, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.94-pre6, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
 AC_CONFIG_SRCDIR(app/diagram.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 

--- a/dia.spec
+++ b/dia.spec
@@ -6,7 +6,7 @@ Summary: A gtk+ based diagram creation program.
 Name: %name
 Version: %ver
 # This indicates changes to the spec file after last time %ver has changed.
-Release: pre5
+Release: pre6
 Copyright: GPL
 Group: Applications/
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{ver}.tar.gz

--- a/doc/en/dia.xml
+++ b/doc/en/dia.xml
@@ -8,7 +8,7 @@
 
   [
 
-    <!ENTITY VERSION "0.94-pre5">
+    <!ENTITY VERSION "0.94-pre6">
 
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 

--- a/doc/pl/dia.xml
+++ b/doc/pl/dia.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd"[
-<!ENTITY VERSION "0.94-pre5">
+<!ENTITY VERSION "0.94-pre6">
 <!ENTITY INTRODUCTION SYSTEM "intro.sgml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.sgml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.sgml">

--- a/plug-ins/shape/shape-export.c
+++ b/plug-ins/shape/shape-export.c
@@ -494,7 +494,7 @@ export_shape(DiagramData *data, const gchar *filename,
 
 static const gchar *extensions[] = { "shape", NULL };
 DiaExportFilter shape_export_filter = {
-    N_("dia shape file"),
+    N_("Dia Shape File"),
     extensions,
     export_shape
 };