ADG Commit Details - e7bb98db6826bad785675c7e061655fa990bf80f

Date:	2011-04-09 20:44:58 (1 year 1 month ago)
Author:	Nicola Fontana
Commit:	e7bb98db6826bad785675c7e061655fa990bf80f
Message:	[build] Got rid of adg-canvas-gtk.h hack Instead of using a conditional include, the file adg-canvas.h is modified by configure. autoconf does not help here (multiline editing is quit hackish) but it is better than having a spurious file around.
Files:	configure.ac (2 diffs) docs/adg/Makefile.am (1 diff) po-properties/it.po (10 diffs) src/adg.h.in (1 diff) src/adg/Makefile.am (1 diff) src/adg/adg-canvas-gtk.h (1 diff) src/adg/adg-canvas.c (2 diffs) src/adg/adg-canvas.h (2 diffs) src/adg/adg-canvas.h.in (1 diff) src/adg/adg-entity.c (1 diff)

Change Details

configure.ac
209	209	#include \"adg/adg-gtk-utils.h\"
210	210	#include \"adg/adg-gtk-area.h\"
211	211	#include \"adg/adg-gtk-layout.h\"
212		#include \"adg/adg-canvas-gtk.h\"
213	212	"
214	213	ADG_CANVAS_H_ADDITIONAL='
215	214	void adg_canvas_set_paper (AdgCanvas *canvas,
...	...
255	254	src/adg-1.pc
256	255	src/adg.h
257	256	src/adg/Makefile
	257	src/adg/adg-canvas.h
258	258	src/adg/tests/Makefile
259	259	demo/Makefile
260	260	demo/cpml-demo.ui

docs/adg/Makefile.am
23	23	adg-alignment-private.h \
24	24	adg-arrow-private.h \
25	25	adg-canvas-private.h \
26		adg-canvas-gtk.h \
27	26	adg-color-style-private.h \
28	27	adg-container-private.h \
29	28	adg-dim-private.h \

po-properties/it.po
9	9	msgstr ""
10	10	"Project-Id-Version: adg 1.0.x\n"
11	11	"Report-Msgid-Bugs-To: \n"
12		"POT-Creation-Date: 2011-04-09 19:31+0200\n"
	12	"POT-Creation-Date: 2011-04-09 20:41+0200\n"
13	13	"PO-Revision-Date: 2010-09-28 16:40+0200\n"
14	14	"Last-Translator: Nicola Fontana <ntd@entidi.it>\n"
15	15	"Language-Team: \n"
...	...
80	80	msgid "The opening angle of the arrow"
81	81	msgstr "L'angolo di apertura della freccia"
82	82
83		#: src/adg/adg-canvas.c:154
	83	#: src/adg/adg-canvas.c:152
84	84	msgid "Canvas Size"
85	85	msgstr "Dimensione Canvas"
86	86
87		#: src/adg/adg-canvas.c:155
	87	#: src/adg/adg-canvas.c:153
88	88	msgid ""
89	89	"The size set on this canvas: use 0 to have an automatic dimension based on "
90	90	"the canvas extents"
...	...
92	92	"La dimensione impostata per questo canvas: usare 0 per abilitare il "
93	93	"dimensionamento automatico basato sui limiti del canvas"
94	94
95		#: src/adg/adg-canvas.c:161
	95	#: src/adg/adg-canvas.c:159
96	96	msgid "Background Dress"
97	97	msgstr "Vestito Sfondo"
98	98
99		#: src/adg/adg-canvas.c:162
	99	#: src/adg/adg-canvas.c:160
100	100	msgid "The color dress to use for the canvas background"
101	101	msgstr "Il vestito colore da usare come sfondo per il canvas"
102	102
103		#: src/adg/adg-canvas.c:168 src/adg/adg-logo.c:109
	103	#: src/adg/adg-canvas.c:166 src/adg/adg-logo.c:109
104	104	#: src/adg/adg-table-style.c:110
105	105	msgid "Frame Dress"
106	106	msgstr "Vestito Riquadro"
107	107
108		#: src/adg/adg-canvas.c:169
	108	#: src/adg/adg-canvas.c:167
109	109	msgid "Line dress to use while drawing the frame around the canvas"
110	110	msgstr "Vesito linea da usare durante il rendering della cornice del canvas"
111	111
112		#: src/adg/adg-canvas.c:175
	112	#: src/adg/adg-canvas.c:173
113	113	msgid "Title Block"
114	114	msgstr "Blocco delle Iscrizioni"
115	115
116		#: src/adg/adg-canvas.c:176
	116	#: src/adg/adg-canvas.c:174
117	117	msgid "The title block to assign to this canvas"
118	118	msgstr "Il blocco delle iscrizioni da allegare a questo canvas"
119	119
120		#: src/adg/adg-canvas.c:182
	120	#: src/adg/adg-canvas.c:180
121	121	msgid "Top Margin"
122	122	msgstr "Margine Superiore"
123	123
124		#: src/adg/adg-canvas.c:183
	124	#: src/adg/adg-canvas.c:181
125	125	msgid "The margin (in global space) to leave above the frame"
126	126	msgstr "Lo spazio (in global space) da lasciare sopra la cornice"
127	127
128		#: src/adg/adg-canvas.c:189
	128	#: src/adg/adg-canvas.c:187
129	129	msgid "Right Margin"
130	130	msgstr "Margine Destro"
131	131
132		#: src/adg/adg-canvas.c:190
	132	#: src/adg/adg-canvas.c:188
133	133	msgid "The margin (in global space) to leave empty at the right of the frame"
134	134	msgstr "Lo spazio (in global space) da lasciare alla destra della cornice"
135	135
136		#: src/adg/adg-canvas.c:196
	136	#: src/adg/adg-canvas.c:194
137	137	msgid "Bottom Margin"
138	138	msgstr "Margine Inferiore"
139	139
140		#: src/adg/adg-canvas.c:197
	140	#: src/adg/adg-canvas.c:195
141	141	msgid "The margin (in global space) to leave empty below the frame"
142	142	msgstr "Lo spazio (in global space) da lasciare vuoto sotto la cornice"
143	143
144		#: src/adg/adg-canvas.c:203
	144	#: src/adg/adg-canvas.c:201
145	145	msgid "Left Margin"
146	146	msgstr "Margine Sinistro"
147	147
148		#: src/adg/adg-canvas.c:204
	148	#: src/adg/adg-canvas.c:202
149	149	msgid "The margin (in global space) to leave empty at the left of the frame"
150	150	msgstr ""
151	151	"Lo spazio (nello spazio globale) da lasciare vuoto alla sinistra della "
152	152	"cornice"
153	153
154		#: src/adg/adg-canvas.c:210 src/adg/adg-table.c:196
	154	#: src/adg/adg-canvas.c:208 src/adg/adg-table.c:196
155	155	msgid "Has Frame Flag"
156	156	msgstr "Flag di Riquadro Presente"
157	157
158		#: src/adg/adg-canvas.c:211
	158	#: src/adg/adg-canvas.c:209
159	159	msgid ""
160	160	"If enabled, a frame using the frame dress will be drawn around the canvas "
161	161	"extents, taking into account the margins"
...	...
163	163	"Se abilitato verrà disegnata una cornice, usando vestito cornice, attorno ai "
164	164	"limiti dal canvas tenendo in considerazione i margini"
165	165
166		#: src/adg/adg-canvas.c:217
	166	#: src/adg/adg-canvas.c:215
167	167	msgid "Top Padding"
168	168	msgstr "Spaziatura Superiore"
169	169
170		#: src/adg/adg-canvas.c:218
	170	#: src/adg/adg-canvas.c:216
171	171	msgid ""
172	172	"The padding (in global space) to leave empty above between the drawing and "
173	173	"the frame"
...	...
175	175	"La spaziatura (in global space) da lasciare vuota sopra tra il disegno e la "
176	176	"cornice"
177	177
178		#: src/adg/adg-canvas.c:224
	178	#: src/adg/adg-canvas.c:222
179	179	msgid "Right Padding"
180	180	msgstr "Spaziatura Destra"
181	181
182		#: src/adg/adg-canvas.c:225
	182	#: src/adg/adg-canvas.c:223
183	183	msgid ""
184	184	"The padding (in global space) to leave empty at the right between the "
185	185	"drawing and the frame"
...	...
187	187	"La spaziatura (in global space) da lasciare vuota a destra tra il disegno e "
188	188	"la cornice"
189	189
190		#: src/adg/adg-canvas.c:231
	190	#: src/adg/adg-canvas.c:229
191	191	msgid "Bottom Padding"
192	192	msgstr "Spaziatura Inferiore"
193	193
194		#: src/adg/adg-canvas.c:232
	194	#: src/adg/adg-canvas.c:230
195	195	msgid ""
196	196	"The padding (in global space) to leave empty below between the drawing and "
197	197	"the frame"
...	...
199	199	"La spaziatura (in global space) da lasciare vuota a sotto tra il disegno e "
200	200	"la cornice"
201	201
202		#: src/adg/adg-canvas.c:238
	202	#: src/adg/adg-canvas.c:236
203	203	msgid "Left Padding"
204	204	msgstr "Spaziatura Sinistra"
205	205
206		#: src/adg/adg-canvas.c:239
	206	#: src/adg/adg-canvas.c:237
207	207	msgid ""
208	208	"The padding (in global space) to leave empty at the left between the drawing "
209	209	"and the frame"
...	...
553	553	"L'angolo che definisce quando considerare uno spigolo (se l'angolo dello "
554	554	"spigolo è maggiore di questo valore) e quando ignorarlo"
555	555
556		#: src/adg/adg-entity.c:155
	556	#: src/adg/adg-entity.c:159
557	557	msgid "Parent Entity"
558	558	msgstr "Entità Genitore"
559	559
560		#: src/adg/adg-entity.c:156
	560	#: src/adg/adg-entity.c:160
561	561	msgid "The parent entity of this entity or NULL if this is a top-level entity"
562	562	msgstr ""
563	563	"L'entità che contiene questa entità o NULL se l'entità corrente è una top-"
564	564	"level"
565	565
566		#: src/adg/adg-entity.c:162
	566	#: src/adg/adg-entity.c:166
567	567	msgid "Global Map"
568	568	msgstr "Trasformazione Globale"
569	569
570		#: src/adg/adg-entity.c:163
	570	#: src/adg/adg-entity.c:167
571	571	msgid ""
572	572	"The transformation to be combined with the parent ones to get the global "
573	573	"matrix"
...	...
575	575	"La trasformazione da combinare insieme a quelle dei progenitori per ottenere "
576	576	"la matrice globale"
577	577
578		#: src/adg/adg-entity.c:169
	578	#: src/adg/adg-entity.c:173
579	579	msgid "Local Map"
580	580	msgstr "Trasformazione Locale"
581	581
582		#: src/adg/adg-entity.c:170
	582	#: src/adg/adg-entity.c:174
583	583	msgid ""
584	584	"The local transformation that could be used to compute the local matrix in "
585	585	"the way specified by the #AdgEntity:local-method property"
...	...
587	587	"La trasformazione locale che può venir usata per calcolare la matrice locale "
588	588	"nella modalità specificata dalla proprietà #AdgEntity:local-method"
589	589
590		#: src/adg/adg-entity.c:176
	590	#: src/adg/adg-entity.c:180
591	591	msgid "Local Mix Method"
592	592	msgstr "Metodo di Combinazione Locale"
593	593
594		#: src/adg/adg-entity.c:177
	594	#: src/adg/adg-entity.c:181
595	595	msgid ""
596	596	"Define how the local maps of the entity and its ancestors should be combined "
597	597	"to get the local matrix"

src/adg.h.in
58	58	#include "adg/adg-alignment.h"
59	59	#include "adg/adg-table.h"
60	60	#include "adg/adg-title-block.h"
61		#include "adg/adg-canvas.h"
62	61	#include "adg/adg-arrow.h"
63	62	#include "adg/adg-dim.h"
64	63	#include "adg/adg-ldim.h"
65	64	#include "adg/adg-rdim.h"
66	65	#include "adg/adg-adim.h"
67	66	@ADG_H_ADDITIONAL@
	67	#include "adg/adg-canvas.h"
	68
68	69	#endif /* __ADG_H__ */

src/adg/Makefile.am
160	160	## Optional GTK+2 related stuff
161	161	if HAVE_GTK2
162	162
163		h_sources+= adg-canvas-gtk.h \
164		adg-gtk-area.h \
	163	h_sources+= adg-gtk-area.h \
165	164	adg-gtk-layout.h \
166	165	adg-gtk-utils.h
167	166	private_h_sources+= adg-gtk-area-private.h \

src/adg/adg-canvas-gtk.h
1		/* ADG - Automatic Drawing Generation
2		* Copyright (C) 2011 Nicola Fontana <ntd at entidi.it>
3		*
4		* This library is free software; you can redistribute it and/or
5		* modify it under the terms of the GNU Lesser General Public
6		* License as published by the Free Software Foundation; either
7		* version 2 of the License, or (at your option) any later version.
8		*
9		* This library is distributed in the hope that it will be useful,
10		* but WITHOUT ANY WARRANTY; without even the implied warranty of
11		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12		* Lesser General Public License for more details.
13		*
14		* You should have received a copy of the GNU Lesser General Public
15		* License along with this library; if not, write to the
16		* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17		* Boston, MA 02110-1301, USA.
18		*/
19
20
21		#if !defined(__ADG_H__)
22		#error "Only <adg.h> can be included directly."
23		#endif
24
25
26		#ifndef __ADG_CANVAS_GTK_H__
27		#define __ADG_CANVAS_GTK_H__
28
29
30		G_BEGIN_DECLS
31
32		void adg_canvas_set_paper (AdgCanvas *canvas,
33		const gchar *paper_name,
34		GtkPageOrientation orientation);
35		void adg_canvas_set_page_setup (AdgCanvas *canvas,
36		GtkPageSetup *page_setup);
37
38		G_END_DECLS
39
40
41		#endif /* __ADG_CANVAS_GTK_H__ */

src/adg/adg-canvas.c
69	69
70	70
71	71	#include "adg-internal.h"
	72	#if GTK2_ENABLED
	73	#include <gtk/gtk.h>
	74	#endif
72	75
73	76	#include "adg-container.h"
74	77	#include "adg-table.h"
...	...
81	84	#include "adg-canvas.h"
82	85	#include "adg-canvas-private.h"
83	86
84		#if GTK2_ENABLED
85		#include <gtk/gtk.h>
86		#include "adg-canvas-gtk.h"
87		#endif
88
89	87
90	88	#define _ADG_OLD_OBJECT_CLASS ((GObjectClass *) adg_canvas_parent_class)
91	89	#define _ADG_OLD_ENTITY_CLASS ((AdgEntityClass *) adg_canvas_parent_class)

src/adg/adg-canvas.h
10	10	* but WITHOUT ANY WARRANTY; without even the implied warranty of
11	11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12	12	* Lesser General Public License for more details.
13		*
14		* You should have received a copy of the GNU Lesser General Public
	13	* * You should have received a copy of the GNU Lesser General Public
15	14	* License along with this library; if not, write to the
16	15	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17	16	* Boston, MA 02110-1301, USA.
...	...
112	111	gdouble right,
113	112	gdouble bottom,
114	113	gdouble left);
115		/* Declared by adg-canvas-gtk.h */
116		#if 0
	114
117	115	void adg_canvas_set_paper (AdgCanvas *canvas,
118	116	const gchar *paper_name,
119	117	GtkPageOrientation orientation);
120	118	void adg_canvas_set_page_setup (AdgCanvas *canvas,
121	119	GtkPageSetup *page_setup);
122		#endif
	120
123	121
124	122	G_END_DECLS
125	123

src/adg/adg-canvas.h.in
	1	/* ADG - Automatic Drawing Generation
	2	* Copyright (C) 2007,2008,2009,2010,2011 Nicola Fontana <ntd at entidi.it>
	3	*
	4	* This library is free software; you can redistribute it and/or
	5	* modify it under the terms of the GNU Lesser General Public
	6	* License as published by the Free Software Foundation; either
	7	* version 2 of the License, or (at your option) any later version.
	8	*
	9	* This library is distributed in the hope that it will be useful,
	10	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	12	* Lesser General Public License for more details.
	13	* * You should have received a copy of the GNU Lesser General Public
	14	* License along with this library; if not, write to the
	15	* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	16	* Boston, MA 02110-1301, USA.
	17	*/
	18
	19
	20	#if !defined(__ADG_H__)
	21	#error "Only <adg.h> can be included directly."
	22	#endif
	23
	24
	25	#ifndef __ADG_CANVAS_H__
	26	#define __ADG_CANVAS_H__
	27
	28
	29	G_BEGIN_DECLS
	30
	31	#define ADG_TYPE_CANVAS (adg_canvas_get_type())
	32	#define ADG_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYPE_CANVAS, AdgCanvas))
	33	#define ADG_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYPE_CANVAS, AdgCanvasClass))
	34	#define ADG_IS_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYPE_CANVAS))
	35	#define ADG_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYPE_CANVAS))
	36	#define ADG_CANVAS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYPE_CANVAS, AdgCanvasClass))
	37
	38	#if 0
	39	/* AdgCanvas declared in adg-entity.h */
	40	typedef struct _AdgCanvas AdgCanvas;
	41	#endif
	42	typedef struct _AdgCanvasClass AdgCanvasClass;
	43
	44
	45	struct _AdgCanvas {
	46	/< private >/
	47	AdgContainer parent;
	48	gpointer data;
	49	};
	50
	51	struct _AdgCanvasClass {
	52	/< private >/
	53	AdgContainerClass parent_class;
	54	};
	55
	56
	57	GType adg_canvas_get_type (void) G_GNUC_CONST;
	58
	59	AdgCanvas * adg_canvas_new (void);
	60	void adg_canvas_set_size (AdgCanvas *canvas,
	61	const AdgPair *pair);
	62	void adg_canvas_set_size_explicit (AdgCanvas *canvas,
	63	gdouble x,
	64	gdouble y);
	65	const AdgPair * adg_canvas_get_size (AdgCanvas *canvas);
	66	void adg_canvas_set_background_dress (AdgCanvas *canvas,
	67	AdgDress dress);
	68	AdgDress adg_canvas_get_background_dress (AdgCanvas *canvas);
	69	void adg_canvas_set_frame_dress (AdgCanvas *canvas,
	70	AdgDress dress);
	71	AdgDress adg_canvas_get_frame_dress (AdgCanvas *canvas);
	72	void adg_canvas_set_title_block (AdgCanvas *canvas,
	73	AdgTitleBlock *title_block);
	74	AdgTitleBlock * adg_canvas_get_title_block (AdgCanvas *canvas);
	75	void adg_canvas_set_top_margin (AdgCanvas *canvas,
	76	gdouble value);
	77	gdouble adg_canvas_get_top_margin (AdgCanvas *canvas);
	78	void adg_canvas_set_right_margin (AdgCanvas *canvas,
	79	gdouble value);
	80	gdouble adg_canvas_get_right_margin (AdgCanvas *canvas);
	81	void adg_canvas_set_bottom_margin (AdgCanvas *canvas,
	82	gdouble value);
	83	gdouble adg_canvas_get_bottom_margin (AdgCanvas *canvas);
	84	void adg_canvas_set_left_margin (AdgCanvas *canvas,
	85	gdouble value);
	86	gdouble adg_canvas_get_left_margin (AdgCanvas *canvas);
	87	void adg_canvas_set_margins (AdgCanvas *canvas,
	88	gdouble top,
	89	gdouble right,
	90	gdouble bottom,
	91	gdouble left);
	92	void adg_canvas_apply_margins (AdgCanvas *canvas,
	93	CpmlExtents *extents);
	94	void adg_canvas_switch_frame (AdgCanvas *canvas,
	95	gboolean new_state);
	96	gboolean adg_canvas_has_frame (AdgCanvas *canvas);
	97	void adg_canvas_set_top_padding (AdgCanvas *canvas,
	98	gdouble value);
	99	gdouble adg_canvas_get_top_padding (AdgCanvas *canvas);
	100	void adg_canvas_set_right_padding (AdgCanvas *canvas,
	101	gdouble value);
	102	gdouble adg_canvas_get_right_padding (AdgCanvas *canvas);
	103	void adg_canvas_set_bottom_padding (AdgCanvas *canvas,
	104	gdouble value);
	105	gdouble adg_canvas_get_bottom_padding (AdgCanvas *canvas);
	106	void adg_canvas_set_left_padding (AdgCanvas *canvas,
	107	gdouble value);
	108	gdouble adg_canvas_get_left_padding (AdgCanvas *canvas);
	109	void adg_canvas_set_paddings (AdgCanvas *canvas,
	110	gdouble top,
	111	gdouble right,
	112	gdouble bottom,
	113	gdouble left);
	114	@ADG_CANVAS_H_ADDITIONAL@
	115
	116	G_END_DECLS
	117
	118
	119	#endif /* __ADG_CANVAS_H__ */

src/adg/adg-entity.c
71	71
72	72
73	73	#include "adg-internal.h"
	74	#if GTK2_ENABLED
	75	#include <gtk/gtk.h>
	76	#endif
	77
74	78	#include "adg-container.h"
75	79	#include "adg-table.h"
76	80	#include "adg-title-block.h"

Download the corresponding diff file