Commit: e14a136b4bb63c05812fefdf75e31a2297341c9c - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: e14a136b4bb63c05812fefdf75e31a2297341c9c (tree)
• Time: 2007-03-11 22:38:18
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Pre7: Crash bugs, image rendering, unit spinner fix.

svn path=/trunk/; revision=3632

Change Summary

• modified: ChangeLog
• modified: Makefile.am
• modified: NEWS
• modified: app/diagram.c
• modified: app/textedit.c
• modified: config.h.win32
• modified: configure.in
• modified: doc/en/dia.xml
• modified: doc/eu/dia.xml
• modified: doc/pl/dia.xml
• modified: lib/dia_image.c
• modified: lib/dia_image.h
• modified: lib/diagdkrenderer.c
• modified: lib/prop_geomtypes.c
• modified: lib/widgets.c

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,38 @@
 2007-03-11  Lars Clausen  <[e-mail]>
 
+	* NEWS: 
+	* RELEASE-PROCESS: 
+	* config.h.win32: 
+	* doc/en/dia.xml: 
+	* doc/pl/dia.xml: 
+	* doc/eu/dia.xml:
+	* configure.in: Pre7
+
+	* lib/prop_geomtypes.c (lengthprop_get_widget): Default to cm in
+	display to be similar to other reals.
+
+	* lib/widgets.c (dia_unit_spinner_value_changed): Leave space
+	before unit.
+
+	* Makefile.am (desktopdir): Put .desktop file in right dir.  Fixes
+	bug #415767.
+
+	* app/diagram.c (diagram_group_selected): Don't try to group no
+	objects.  Fixes bug #410483, though the overall problem of
+	activateable insensitive menu items remains.
+
+	* lib/dia_image.c (dia_image_draw): 
+	* lib/dia_image.h: 
+	* lib/diagdkrenderer.c (draw_image): Give a GC to the image
+	rendering function -- also change to using gdk_draw_pixbuf.  Fixes
+	bug #401774.
+
 	* lib/focus.c (remove_focus_object): Make sure a removed object no
 	longer has the active focus.  Fixes bug #414708.
 
 	* app/textedit.c (textedit_end_edit): Don't assert active_focus
 	when it might not be true (during destruction).
+	(textedit_remove_focus): Free the old focus when done.
 
 2007-03-07  Steffen Macke <[e-mail]>
 

--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ CLEANFILES = core-translation-report dia.keys dia.desktop
 
 #--- Adapted from http://svn.xfce.org/svn/xfce/libexo/trunk/exo-helper/helpers/Makefile.am
 
-desktopdir = $(datadir)
+desktopdir = $(datadir)/applications
 desktop_in_files = dia.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+dia-0.96-pre7: 11-Mar-2007
+
+  * Seventh prerelease for 0.96. Fixes two crash bugs and image redrawing
+    issues, as well as a few minor issues.
+
 dia-0.96-pre6: 5-Mar-2007
 
   * Sixth prerelease for 0.96.  I18n fixes, debugging output removed, some

--- a/app/diagram.c
+++ b/app/diagram.c
@@ -1100,6 +1100,11 @@ void diagram_group_selected(Diagram *dia)
   GList *orig_list;
   Change *change;
 
+  if (g_list_length(dia->data->selected) < 1) {
+    message_error("Trying to group with no selected objects.");
+    return;
+  }
+  
 #if 0
   /* the following is wrong as it screws up the selected list, see bug #153525
      * I just don't get what was originally intented so please speak up if you know  --hb
@@ -1132,13 +1137,13 @@ void diagram_group_selected(Diagram *dia)
   group = group_create(group_list);
   change = undo_group_objects(dia, group_list, group, orig_list);
   (change->apply)(change, dia);
-
+  
   /* Select the created group */
   diagram_select(dia, group);
   
   diagram_modified(dia);
   diagram_flush(dia);
-
+  
   undo_set_transactionpoint(dia->undo);
 }
 

--- a/app/textedit.c
+++ b/app/textedit.c
@@ -170,6 +170,7 @@ textedit_remove_focus(DiaObject *obj, Diagram *diagram)
     /* TODO: make sure the focus is deactivated */
     textedit_end_edit(ddisplay_active(), old_focus);
   }
+  g_free(old_focus);
 }
 
 /** Call when the entire list of focusable texts gets reset. */

--- a/config.h.win32
+++ b/config.h.win32
@@ -18,7 +18,7 @@
 #undef LOCALEDIR /* needs to be calculated at runtime */
 /* NOT: #define LOCALEDIR "../lib/locale" */
 
-#define VERSION "0.96-pre6"
+#define VERSION "0.96-pre7"
 
 /*
  * 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.96-pre6, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.96-pre7, 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/doc/en/dia.xml
+++ b/doc/en/dia.xml
@@ -8,7 +8,7 @@
 
   [
 
-    <!ENTITY VERSION "0.96-pre6">
+    <!ENTITY VERSION "0.96-pre7">
 
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 

--- a/doc/eu/dia.xml
+++ b/doc/eu/dia.xml
@@ -4,7 +4,7 @@
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd" [
 
-    <!ENTITY VERSION "0.96-pre6">
+    <!ENTITY VERSION "0.96-pre7">
 
     <!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.96-pre6">
+<!ENTITY VERSION "0.96-pre7">
 <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.xml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.xml">

--- a/lib/dia_image.c
+++ b/lib/dia_image.c
@@ -134,7 +134,7 @@ dia_image_release(DiaImage image)
  * @param height Height in pixels of rendering in window.
  */
 void 
-dia_image_draw(DiaImage image, GdkWindow *window,
+dia_image_draw(DiaImage image, GdkWindow *window, GdkGC *gc,
 	       int x, int y, int width, int height)
 {
   GdkPixbuf *scaled;
@@ -164,10 +164,10 @@ dia_image_draw(DiaImage image, GdkWindow *window,
   }
 
   /* Once we can render Alpha, we'll do it! */
-  gdk_pixbuf_render_to_drawable_alpha(scaled, window,
-				      0, 0, x, y, width, height, 
-				      GDK_PIXBUF_ALPHA_BILEVEL, 128,
-				      GDK_RGB_DITHER_NORMAL, 0, 0);
+  gdk_draw_pixbuf(window, gc, scaled,
+		  0, 0, x, y, width, height, 
+		  GDK_RGB_DITHER_NORMAL, 0, 0);
+
 #ifndef SCALING_CACHE
   gdk_pixbuf_unref(scaled);
 #endif

--- a/lib/dia_image.h
+++ b/lib/dia_image.h
@@ -30,7 +30,7 @@ DiaImage dia_image_get_broken(void);
 DiaImage dia_image_load(gchar *filename);
 void dia_image_add_ref(DiaImage image);
 void dia_image_release(DiaImage image);
-void dia_image_draw(DiaImage image, GdkWindow *window,
+void dia_image_draw(DiaImage image, GdkWindow *window, GdkGC *gc,
 		    int x, int y, int width, int height);
 
 int dia_image_width(DiaImage image);

--- a/lib/diagdkrenderer.c
+++ b/lib/diagdkrenderer.c
@@ -813,7 +813,7 @@ draw_image (DiaRenderer *object,
     dia_transform_coords(renderer->transform, point->x, point->y,
 			 &real_x, &real_y);
 
-    dia_image_draw(image,  renderer->pixmap, real_x, real_y,
+    dia_image_draw(image,  renderer->pixmap, renderer->gc, real_x, real_y,
 		   real_width, real_height);
   }
 }

--- a/lib/prop_geomtypes.c
+++ b/lib/prop_geomtypes.c
@@ -181,7 +181,7 @@ lengthprop_get_widget(LengthProperty *prop, PropDialog *dialog)
                                                          G_MINFLOAT, 
                                                          G_MAXFLOAT,
                                                          0.1, 1.0, 1.0));
-  GtkWidget *ret = dia_unit_spinner_new(adj, 2, DIA_UNIT_MILLIMETER);
+  GtkWidget *ret = dia_unit_spinner_new(adj, 2, DIA_UNIT_CENTIMETER);
   /*  gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ret),TRUE);*/
   prophandler_connect(&prop->common,GTK_OBJECT(adj),"value_changed");
   

--- a/lib/widgets.c
+++ b/lib/widgets.c
@@ -1470,7 +1470,7 @@ dia_unit_spinner_value_changed(GtkAdjustment *adjustment,
   char buf[256];
   GtkSpinButton *sbutton = GTK_SPIN_BUTTON(spinner);
 
-  g_snprintf(buf, sizeof(buf), "%0.*f%s", sbutton->digits, adjustment->value,
+  g_snprintf(buf, sizeof(buf), "%0.*f %s", sbutton->digits, adjustment->value,
 	     units[spinner->unit_num].unit);
   gtk_entry_set_text(GTK_ENTRY(spinner), buf);
 }