verdnatura
/
hedera
Archived
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modificaciones en la instalación 

Ahora es más fácil compilar y usar proyectos que necesiten la librería o alguna de sus partes.
This commit is contained in:
Alejandro T. Colombini Gómez 2013-11-21 16:35:55 +01:00
parent 35399e6a2f
commit 65d9412b43
35 changed files with 472 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.decl
View File

@ -39,17 +39,17 @@ vn_includedir = $(hedera_includedir)/vn
field_includedir = $(vn_includedir)/field field_includedir = $(vn_includedir)/field
column_includedir = $(vn_includedir)/column column_includedir = $(vn_includedir)/column
pkgconfigdir = $(datadir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
if ENABLE_VALA if ENABLE_VALA
girdir = $(datadir)/gir-1.0 girdir = $(datadir)/gir-1.0
typelibdir = $(libdir)/girepository-1.0 typelibdir = $(prefix)/lib/girepository-1.0
vapidata = $(top_srcdir)/vapi vapidata = $(top_srcdir)/vapi
vapis = $(top_builddir)/vapi vapis = $(top_builddir)/vapi
vapidir = $(datadir)/vala-$(VALA_VERSION)/vapi vapidir = $(datadir)/vala-$(VALA_VERSION)/vapi
endif endif
gladevn_libdir = $(libdir)/glade/modules gladevn_libdir = $(prefix)/lib/glade/modules
gladevn_datadir = $(datadir)/glade/catalogs gladevn_datadir = $(datadir)/glade/catalogs
# Data # Data

1
configure.ac
View File

@ -105,5 +105,6 @@ AC_CONFIG_FILES([
]) ])
AC_SUBST([uVERSION], [${VERSION//./_}]) AC_SUBST([uVERSION], [${VERSION//./_}])
AC_SUBST([VERSION_INFO], [${VERSION//./:}])
AC_OUTPUT AC_OUTPUT

6
db/db-conn.c
View File

@ -893,10 +893,13 @@ SqlString * db_conn_create_stmt_from_file (DbConn * obj, const gchar * query_fil
g_return_val_if_fail (DB_IS_CONN (obj), NULL); g_return_val_if_fail (DB_IS_CONN (obj), NULL);
g_return_val_if_fail (query_file, NULL); g_return_val_if_fail (query_file, NULL);
if (g_str_has_suffix (query_file, ".sql"))
file = g_strdup (query_file);
else
file = g_strconcat (query_file, ".sql", NULL); file = g_strconcat (query_file, ".sql", NULL);
if (obj->query_dirs) if (obj->query_dirs)
for (i = 0; obj->query_dirs[i] != NULL && !stmt; i++) for (i = 0; obj->query_dirs[i] != NULL/* && !stmt*/; i++)
{ {
gchar * buffer; gchar * buffer;
gchar * path = g_build_filename (obj->query_dirs[i], file, NULL); gchar * path = g_build_filename (obj->query_dirs[i], file, NULL);
@ -914,6 +917,7 @@ SqlString * db_conn_create_stmt_from_file (DbConn * obj, const gchar * query_fil
g_warning ("DbConn: Can't create statement from file: %s", file); g_warning ("DbConn: Can't create statement from file: %s", file);
g_free (file); g_free (file);
return stmt; return stmt;
} }

19
db/db-model.c
View File

@ -548,8 +548,6 @@ static void db_model_on_operations_done (DbRequest * request, DbModelRequest * d
{ {
u = n->data; u = n->data;
/* if (r->next && r->next->data
&& ((DbResult *) r->next->data)->column)*/
if (priv->column_default if (priv->column_default
&& gvn_value_is_null (u->value) && gvn_value_is_null (u->value)
&& g_strcmp0 (priv->column[u->column].table, priv->main_table) && g_strcmp0 (priv->column[u->column].table, priv->main_table)
@ -575,14 +573,6 @@ static void db_model_on_operations_done (DbRequest * request, DbModelRequest * d
db_result_free (result); db_result_free (result);
} }
} }
/*
if (n->next && (u = ((DbUpdatedField *) n->next->data))
&& priv->column_default
&& gvn_value_is_null (u->value)
&& g_strcmp0 (priv->column[u->column].table, priv->main_table)
&& db_model_table_row_all_null (obj, row, u->column))
r = r->next;
*/
} }
} }
@ -693,12 +683,7 @@ static gboolean db_model_set_row_operation (DbModel * obj,
if (type & DB_MODEL_ROW_OP_UPDATE) if (type & DB_MODEL_ROW_OP_UPDATE)
db_operation_add_updated (new_op, col); db_operation_add_updated (new_op, col);
/* if (!db_operation_add_updated (new_op, col))
{
g_free (new_op);
return FALSE;
}
*/
g_hash_table_insert (obj->priv->row_ops, row, new_op); g_hash_table_insert (obj->priv->row_ops, row, new_op);
g_queue_push_tail (obj->priv->operation, new_op); g_queue_push_tail (obj->priv->operation, new_op);
} }
@ -709,8 +694,6 @@ static gboolean db_model_set_row_operation (DbModel * obj,
if (type & DB_MODEL_ROW_OP_UPDATE) if (type & DB_MODEL_ROW_OP_UPDATE)
db_operation_add_updated (op, col); db_operation_add_updated (op, col);
// if (!db_operation_add_updated (op, col))
// return FALSE;
} }
else else
return FALSE; return FALSE;

5
db/db.pc.in
View File

@ -6,6 +6,5 @@ includedir=@includedir@/@PACKAGE@
Name: Db Name: Db
Description: Database Access Module for Hedera Library Description: Database Access Module for Hedera Library
Version: @VERSION@ Version: @VERSION@
Requires: sql gvn glib-2.0 gobject-2.0 Requires: sql
Libs: -L${libdir} -ldb Libs: -ldb
Cflags: -I${includedir}/db

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
libhedera (1.0-6) stable; urgency=low libhedera (1.0-7) stable; urgency=low
* Initial Release. * Initial Release.

2
debian/compat vendored
View File

@ -1 +1 @@
8 9

32
debian/control vendored
View File

@ -9,6 +9,22 @@ Section: libs
Homepage: http://www.verdnatura.es Homepage: http://www.verdnatura.es
Vcs-Svn: svn://www.verdnatura.es/hedera/trunk Vcs-Svn: svn://www.verdnatura.es/hedera/trunk
Package: libhedera1
Section: libs
Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk-3-0
Description: Database access and widget provider library (core)
The hedera library provides and lets you create widgets bound to SQL queries
and manages the different operations made over the data retrieved from these
queries.
.
The library also has a modular system to add and remove the different widgets
in run time. And includes Glade integration, to design the programs in an
easiest, graphical way.
.
This package contains the core of the library. It also provides the plugins to
connect a PostgreSQL or MySQL database.
Package: hedera Package: hedera
Section: gnome Section: gnome
Architecture: amd64 Architecture: amd64
@ -45,22 +61,6 @@ Description: Database access and widget provider library (development)
use the hedera library. It also contains the documentation and introspection use the hedera library. It also contains the documentation and introspection
files. files.
Package: libhedera1
Section: libs
Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk-3-0
Description: Database access and widget provider library (core)
The hedera library provides and lets you create widgets bound to SQL queries
and manages the different operations made over the data retrieved from these
queries.
.
The library also has a modular system to add and remove the different widgets
in run time. And includes Glade integration, to design the programs in an
easiest, graphical way.
.
This package contains the core of the library. It also provides the plugins to
connect a PostgreSQL or MySQL database.
Package: libhedera-dbg Package: libhedera-dbg
Section: debug Section: debug
Architecture: amd64 Architecture: amd64

2
debian/hedera.dirs vendored
View File

@ -1,5 +1,5 @@
usr/bin usr/bin
usr/lib/hedera/module usr/lib/x86_64-linux-gnu/hedera/module
usr/share/hedera/vn usr/share/hedera/vn
usr/share/hedera/vn/image usr/share/hedera/vn/image
usr/share/hedera/module usr/share/hedera/module

2
debian/hedera.install vendored
View File

@ -1,5 +1,5 @@
usr/bin/* usr/bin/*
usr/lib/hedera/module/*.so usr/lib/x86_64-linux-gnu/hedera/module/*.so
usr/share/hedera/vn/* usr/share/hedera/vn/*
usr/share/hedera/vn/image/* usr/share/hedera/vn/image/*
usr/share/hedera/module/* usr/share/hedera/module/*

1
debian/hedera.links vendored Normal file
View File

@ -0,0 +1 @@
usr/share/man/man1/hedera.1.gz usr/share/man/man1/hedera-bin.1.gz

5
debian/libhedera-dev.dirs vendored
View File

@ -5,11 +5,12 @@ usr/include/hedera/db
usr/include/hedera/vn usr/include/hedera/vn
usr/include/hedera/vn/field usr/include/hedera/vn/field
usr/include/hedera/vn/column usr/include/hedera/vn/column
usr/lib/hedera usr/lib/x86_64-linux-gnu
usr/lib/x86_64-linux-gnu/hedera
usr/lib/x86_64-linux-gnu/pkgconfig
usr/lib/glade/modules usr/lib/glade/modules
#usr/lib/girepository-1.0 #usr/lib/girepository-1.0
usr/share/gir-1.0 usr/share/gir-1.0
usr/share/glade/catalogs usr/share/glade/catalogs
usr/share/pkgconfig
usr/share/vala-0.20/vapi usr/share/vala-0.20/vapi
usr/share/gtk-doc/html/hedera usr/share/gtk-doc/html/hedera

29
debian/libhedera-dev.install vendored
View File

@ -1,25 +1,28 @@
usr/include/hedera/hedera.h
usr/include/hedera/gvn/* usr/include/hedera/gvn/*
usr/include/hedera/sql/* usr/include/hedera/sql/*
usr/include/hedera/db/* usr/include/hedera/db/*
usr/include/hedera/vn/* usr/include/hedera/vn/*
usr/include/hedera/vn/field/* usr/include/hedera/vn/field/*
usr/include/hedera/vn/column/* usr/include/hedera/vn/column/*
usr/lib/hedera/libgvn.a usr/lib/x86_64-linux-gnu/libhedera.a
usr/lib/hedera/libgvn.so usr/lib/x86_64-linux-gnu/libhedera.so
usr/lib/hedera/libsql.a usr/lib/x86_64-linux-gnu/hedera/libgvn.a
usr/lib/hedera/libsql.so usr/lib/x86_64-linux-gnu/hedera/libgvn.so
usr/lib/hedera/libdb.a usr/lib/x86_64-linux-gnu/hedera/libsql.a
usr/lib/hedera/libdb.so usr/lib/x86_64-linux-gnu/hedera/libsql.so
usr/lib/hedera/libvn.a usr/lib/x86_64-linux-gnu/hedera/libdb.a
usr/lib/hedera/libvn.so usr/lib/x86_64-linux-gnu/hedera/libdb.so
usr/lib/hedera/libvnfield.a usr/lib/x86_64-linux-gnu/hedera/libvn.a
usr/lib/hedera/libvnfield.so usr/lib/x86_64-linux-gnu/hedera/libvn.so
usr/lib/hedera/libvncolumn.a usr/lib/x86_64-linux-gnu/hedera/libvnfield.a
usr/lib/hedera/libvncolumn.so usr/lib/x86_64-linux-gnu/hedera/libvnfield.so
usr/lib/x86_64-linux-gnu/hedera/libvncolumn.a
usr/lib/x86_64-linux-gnu/hedera/libvncolumn.so
usr/lib/x86_64-linux-gnu/pkgconfig/*
usr/lib/glade/modules/libgladevn.so usr/lib/glade/modules/libgladevn.so
#usr/lib/girepository-1.0/* #usr/lib/girepository-1.0/*
usr/share/gir-1.0/* usr/share/gir-1.0/*
usr/share/glade/catalogs/* usr/share/glade/catalogs/*
usr/share/pkgconfig/*
usr/share/vala-0.20/vapi/* usr/share/vala-0.20/vapi/*
usr/share/gtk-doc/html/hedera/* usr/share/gtk-doc/html/hedera/*

3
debian/libhedera1.dirs vendored
View File

@ -1,4 +1,5 @@
usr/lib/hedera usr/lib/x86_64-linux-gnu/
usr/lib/x86_64-linux-gnu/hedera
usr/share/glib-2.0/schemas usr/share/glib-2.0/schemas
usr/share/locale/es/LC_MESSAGES usr/share/locale/es/LC_MESSAGES
usr/share/locale/ca/LC_MESSAGES usr/share/locale/ca/LC_MESSAGES

17
debian/libhedera1.install vendored
View File

@ -1,11 +1,12 @@
usr/lib/hedera/libgvn.so.* usr/lib/x86_64-linux-gnu/libhedera.so.*
usr/lib/hedera/libsql.so.* usr/lib/x86_64-linux-gnu/hedera/libgvn.so.*
usr/lib/hedera/libdb.so.* usr/lib/x86_64-linux-gnu/hedera/libsql.so.*
usr/lib/hedera/plugin/pg/libdbpg.so usr/lib/x86_64-linux-gnu/hedera/libdb.so.*
usr/lib/hedera/plugin/mysql/libdbmysql.so usr/lib/x86_64-linux-gnu/hedera/plugin/pg/libdbpg.so
usr/lib/hedera/libvn.so.* usr/lib/x86_64-linux-gnu/hedera/plugin/mysql/libdbmysql.so
usr/lib/hedera/libvnfield.so.* usr/lib/x86_64-linux-gnu/hedera/libvn.so.*
usr/lib/hedera/libvncolumn.so.* usr/lib/x86_64-linux-gnu/hedera/libvnfield.so.*
usr/lib/x86_64-linux-gnu/hedera/libvncolumn.so.*
usr/share/glib-2.0/schemas/* usr/share/glib-2.0/schemas/*
usr/share/locale/es/LC_MESSAGES/hedera.mo usr/share/locale/es/LC_MESSAGES/hedera.mo
usr/share/locale/ca/LC_MESSAGES/hedera.mo usr/share/locale/ca/LC_MESSAGES/hedera.mo

6
debian/libhedera1.postinst vendored Normal file
View File

@ -0,0 +1,6 @@
set -e
if [ "$1" = "configure" ]; then
ldconfig
fi

6
debian/libhedera1.postrm vendored Normal file
View File

@ -0,0 +1,6 @@
set -e
if [ "$1" = "remove" ]; then
ldconfig
fi

5
debian/menu vendored
View File

@ -1,5 +0,0 @@
?package(hedera):needs="X11" \
section="Applications/Office" \
title="Hedera" command="hedera" \
icon16x16="/usr/share/hedera/vn/image/hedera16x16.xpm" \
icon32x32="/usr/share/hedera/vn/image/hedera32x32.xpm"

3
debian/rules vendored
View File

@ -1,7 +1,6 @@
#!/usr/bin/make -f #!/usr/bin/make -f
#export DH_VERBOSE=1 #export DH_VERBOSE=1
#export CFLAGS=" -O3 "
%: %:
dh $@ --with autotools-dev --parallel --builddirectory=debian/build dh $@ --with autotools-dev --parallel --builddirectory=debian/build
@ -15,7 +14,7 @@ override_dh_auto_configure:
override_dh_strip: override_dh_strip:
dh_strip --dbg-package=libhedera-dbg dh_strip --dbg-package=libhedera-dbg
# Overriden to avoid lintian warnings about postinst/postrm # Overridden to avoid lintian warnings about postinst/postrm
.PHONY: override_dh_makeshlibs .PHONY: override_dh_makeshlibs
override_dh_makeshlibs: override_dh_makeshlibs:
dh_makeshlibs --noscripts dh_makeshlibs --noscripts

2
docs/reference/hedera/Makefile.am
View File

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = 1.6 AUTOMAKE_OPTIONS = 1.6
DOC_MODULE = hedera DOC_MODULE = $(PACKAGE)
# The top-level SGML file. You can change this if you want to. # The top-level SGML file. You can change this if you want to.
DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml

27
docs/reference/hedera/adding-modules.xml
View File

@ -34,11 +34,11 @@
At this point, you should have a compiled module, this consisting At this point, you should have a compiled module, this consisting
in a folder with the data (images, UI definitions, etc.) of the in a folder with the data (images, UI definitions, etc.) of the
module along with the dynamic library (a <filename>.so</filename> module along with the dynamic library (a <filename>.so</filename>
file) that the Hedera execution environment (or Hedera application) file) that Hedera will link in runtime to load the module.
will link in runtime to load the module. It can also be the single There can also be an optional query directory. It can also be the
<filename>.so</filename>, due to that may be the module developer single <filename>.so</filename>, due to that may be the module
has coded the UI creation or may be beacuse both the module and its developer has coded the UI creation or may be beacuse both the
data were compiled in a single file. module and its data were compiled in a single file.
</para> </para>
<para> <para>
To run the module in the hedera runtime you must set the environment To run the module in the hedera runtime you must set the environment
@ -53,13 +53,8 @@
values on the variables and load the module. Note that if you use values on the variables and load the module. Note that if you use
the Anjuta IDE with the project created by the wizzard, as you run the Anjuta IDE with the project created by the wizzard, as you run
in Anjuta the variables will be automatically set pointing to your in Anjuta the variables will be automatically set pointing to your
project files. project files (if the project folder is changed, you'll need to
</para> manually reset the variables in Anjuta).
<para>
If you want to install the module you have to install the <filename>
.so</filename> in <filename>/usr/lib/hedera/module</filename> and
the <filename>.xml</filename> and any other data to <filename>
/usr/share/hedera/module</filename>.
</para> </para>
</refsection> </refsection>
@ -67,14 +62,14 @@
<title>Expected form definition</title> <title>Expected form definition</title>
<para> <para>
Each module can have any number of forms, that will be compiled Each module can have any number of forms, that will be compiled
inside the same file. Independently from the form funtionality, each inside the same file. Independently from the form functionality,
form needs to offer some things necesary for Hedera to recognize and each form needs to offer some things necesary for Hedera to
load it as expected. recognize and load it as expected.
</para> </para>
<para> <para>
The main of these requirements is to list the form in the The main of these requirements is to list the form in the
<filename>.xml</filename> file of the module. Also, the interface <filename>.xml</filename> file of the module. Also, the interface
description file has to have the ".glade" extension and contain a description file must have the ".glade" extension and contain a
GtkContainer with the identifier "main" as the base widget, this GtkContainer with the identifier "main" as the base widget, this
widget will be loaded inside a GtkNotebook and will be the first widget will be loaded inside a GtkNotebook and will be the first
thing the user will see when the form gets loaded. This glade file thing the user will see when the form gets loaded. This glade file

9
docs/reference/hedera/configuring.xml
View File

@ -16,7 +16,7 @@
</refpurpose> </refpurpose>
</refnamediv> </refnamediv>
<refsection id="section-who"> <refsection id="section-how">
<para> <para>
This chapter covers how to configure the library from the tarball, This chapter covers how to configure the library from the tarball,
if you have received it packed in any other form, like a .deb if you have received it packed in any other form, like a .deb
@ -54,14 +54,13 @@
to go to the root folder of the library and run the autogen.sh to go to the root folder of the library and run the autogen.sh
script with the configure options of your choice (listed in the script with the configure options of your choice (listed in the
README file of the distribution) e.g. './autogen.sh --enable-vala README file of the distribution) e.g. './autogen.sh --enable-vala
--prefix=~/installdir' and then run 'make' to compile the library. --prefix=~/installdir' and then run 'make' to build the library.
</para> </para>
<para> <para>
As we do, we highly recommend developers using the Hedera As we do, we highly recommend developers using the Hedera
library and also GTK+ or GLib, to use the Anjuta IDE, a very library and also GTK+ or GLib, to use the Anjuta IDE, a very
useful and complete free developing environment with a great useful and complete free developing environment with a great
support and integration for the GObject system and the GNU support and integration for GObject and the GNU build system.
build system.
</para> </para>
</refsection> </refsection>
<refsection id="vala"> <refsection id="vala">
@ -70,7 +69,7 @@
The Hedera library supports Vala as programming language. If The Hedera library supports Vala as programming language. If
you will be programming in Vala, you must install the Vala you will be programming in Vala, you must install the Vala
compiler, valac. The only version of Vala supported right now is compiler, valac. The only version of Vala supported right now is
the 0.16, plans are to be also compatible with newer versions the 0.20, plans are to be also compatible with newer versions
too. Note that to build the Vala bindings you'll also need the too. Note that to build the Vala bindings you'll also need the
vapigen tool, which normally installs with the Vala compiler. vapigen tool, which normally installs with the Vala compiler.
</para> </para>

16
docs/reference/hedera/module-tutorial.xml
View File

@ -41,18 +41,16 @@
<para> <para>
As said before, the Hedera Library comes with an Anjuta project As said before, the Hedera Library comes with an Anjuta project
wizzard to help the easy creation of a new Hedera Module on Vala. wizzard to help the easy creation of a new Hedera Module on Vala.
To include this wizzard to Anjuta 2.31 or grater you can run To include this wizzard to Anjuta 2.31 or later you can run
Anjuta passing the path to the module file as an argument. Anjuta passing the path to the module file as an argument or drag it
For previous versions of Anjuta you'll need to unzip the over the window when the program is open. This will not only include
the module wizzard to Anjuta but will also start the creation of a
new module. For previous versions of Anjuta you'll need to unzip the
hedera-mod.wiz.tgz file to the corresponding data directory named hedera-mod.wiz.tgz file to the corresponding data directory named
anjuta/project, placed under ~/.local on most distributions. With anjuta/project, placed under ~/.local on most distributions. With
the former method Anjuta will do the same by itself. As the the former method, Anjuta will do the same by itself. As the
dependancies of the hedera library go beyond these versions, it's dependancies of the hedera library go beyond these versions, it's
most likely that you have a version greater than the 2.31. most likely that you have a version newer than the 2.31.
</para>
<para>
When Anjuta starts, it will show the wizzard dialog that will
guide you in the creation of the module.
</para> </para>
<para> <para>
After following the wizzard, you'll have a clean Hedera Module, After following the wizzard, you'll have a clean Hedera Module,

23
docs/reference/hedera/running.xml
View File

@ -20,11 +20,13 @@
<title>Custom modules</title> <title>Custom modules</title>
<para> <para>
To run your own modules you need to install them in the To run your own modules you need to install them in the
search directories of Hedera, these are ${libdir}/hedera/module search directories of Hedera. You can use pkg-config to know where
for the binary objects (.so files) and ${datadir}/hedera/module these directories actually are in your installation:
for additional data, thus the GUI files and the configuration file <programlisting>
and also, optionally any additional data you want to add to your $ pkg-config --variable=modulelibdir hedera
module should be here. $ pkg-config --variable=moduledatadir hedera
$ pkg-config --variable=modulequerydir hedera
</programlisting>
</para> </para>
<para> <para>
It is also possible to put your files in any other path and tell It is also possible to put your files in any other path and tell
@ -32,14 +34,19 @@
environment variables before executing Hedera: VN_MODULE_LIB_PATH, environment variables before executing Hedera: VN_MODULE_LIB_PATH,
the list of directories put in this variable will be used to look the list of directories put in this variable will be used to look
for the binary files of the module; VN_MODULE_DATA_PATH, this list for the binary files of the module; VN_MODULE_DATA_PATH, this list
of directories must hold the path to the data of the module. of directories must hold the path to the data of the module;
VN_MODULE_QUERY_PATH, this variable is not always needed, but if the
module has any form that uses a file to pass the SQL queries to the
database, this file has to be under a directory named after the
module, this directoy has to be inside one of the paths listed in
this variable.
</para> </para>
<title>Example modules</title> <title>Example modules</title>
<para> <para>
Once you've succesfully compiled the library you can try and Once you've succesfully compiled the library you can try and
run some of the provided modules (some of wich you can write run some of the provided modules (some of which you can write
by yourself following the tutorials included in this manual). by yourself following the tutorials included in this manual).
If the installation went as expected you'll just need to If the installation went as expected, you'll just need to
run the Hedera executable. The executable will be in the run the Hedera executable. The executable will be in the
"bin" directory of the installation tree. If you installed the "bin" directory of the installation tree. If you installed the
library in a folder that is included in the PATH environment library in a folder that is included in the PATH environment

2
gvn/gvn.pc.in
View File

@ -8,4 +8,4 @@ Description: Utility Module for Hedera Library
Version: @VERSION@ Version: @VERSION@
Requires: glib-2.0 gobject-2.0 Requires: glib-2.0 gobject-2.0
Libs: -L${libdir} -lgvn Libs: -L${libdir} -lgvn
Cflags: -I${includedir}/gvn Cflags: -I${includedir}

17
main/Makefile.am
View File

@ -6,7 +6,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(gtk_CFLAGS) \ $(gtk_CFLAGS) \
-D_HEDERA_LOCALE_DIR=\"$(datadir)/locale\" -D_HEDERA_LOCALE_DIR=\"$(datadir)/locale\"
hedera_bin_LDFLAGS = -Wl,--export-dynamic hedera_bin_LDFLAGS = -export-dynamic
hedera_bin_SOURCES = main.c hedera_bin_SOURCES = main.c
hedera_bin_LDADD = \ hedera_bin_LDADD = \
$(gtk_LIBS) \ $(gtk_LIBS) \
@ -14,6 +14,21 @@ hedera_bin_LDADD = \
$(top_builddir)/db/libdb.la \ $(top_builddir)/db/libdb.la \
$(top_builddir)/vn/libvn.la $(top_builddir)/vn/libvn.la
libhedera_lib_LTLIBRARIES = libhedera.la
if ENABLE_INSTALL
libhedera_libdir = $(libdir)
else
libhedera_libdir = $(abs_top_builddir)/main
endif
libhedera_includedir = $(hedera_includedir)
libhedera_include_HEADERS = hedera.h
libhedera_la_SOURCES = $(libhedera_includedir_HEADERS)
libhedera_la_LDFLAGS = -version-info $(VERSION_INFO)
libhedera_la_LIBADD = $(top_builddir)/vn/libvn.la
SCRIPT = $(top_srcdir)/main/hedera.sh.in SCRIPT = $(top_srcdir)/main/hedera.sh.in
hedera_bin_SCRIPTS = hedera hedera_bin_SCRIPTS = hedera
$(hedera_bin_SCRIPTS): $(SCRIPT) $(hedera_bin_SCRIPTS): $(SCRIPT)

8
main/hedera.pc.in
View File

@ -4,14 +4,16 @@ libdir=@libdir@/@PACKAGE@
includedir=@includedir@/@PACKAGE@ includedir=@includedir@/@PACKAGE@
datarootdir=@datarootdir@ datarootdir=@datarootdir@
datadir=@datadir@/@PACKAGE@ datadir=@datadir@/@PACKAGE@
plugindir=@libdir@/@PACKAGE@/plugin plugindir=@libdir@/@PACKAGE@/plugin
modulelibdir=${libdir}/module modulelibdir=${libdir}/module
moduledatadir=${datadir}/module moduledatadir=${datadir}/module
modulequerydir=${moduledatadir}/sql modulequerydir=${moduledatadir}/sql
Name: Hedera Name: Hedera
Description: Hedera database access Library Description: Hedera database access library
Version: @VERSION@ Version: @VERSION@
Requires: gtk+-3.0 gvn sql db vn Requires: gtk+-3.0
Libs: -Wl,-R${libdir} Libs: -l@PACKAGE@
Cflags: -I${includedir} Cflags: -I${includedir}

2
po/POTFILES.in
View File

@ -48,7 +48,7 @@ vn/gui/actions.glade
glade/glade-db-model.c glade/glade-db-model.c
glade/glade-db-sql.c glade/glade-db-sql.c
module/data/example.xml [type: gettext/glade]module/data/example.xml
module/data/users.glade module/data/users.glade
module/src/vn-users.c module/src/vn-users.c
module/data/consulter.glade module/data/consulter.glade

5
po/POTFILES.skip
View File

@ -1,9 +1,6 @@
module/data/consulter.glade
module/data/customer.glade module/data/customer.glade
module/data/signer.glade
module/src/vn-consulter.c
module/src/vn-customer.c module/src/vn-customer.c
module/src/vn-signer.c module/data/signer.glade
template/lib-object.c template/lib-object.c

148
po/ca.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: hedera 1.0\n" "Project-Id-Version: hedera 1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-05 10:03+0100\n" "POT-Creation-Date: 2013-11-18 16:11+0100\n"
"PO-Revision-Date: 2013-06-04 13:38+0200\n" "PO-Revision-Date: 2013-06-04 13:38+0200\n"
"Last-Translator: Alejandro T. Colombini Gómez <atcolombini@verdnatura.es>\n" "Last-Translator: Alejandro T. Colombini Gómez <atcolombini@verdnatura.es>\n"
"Language-Team: Catalan\n" "Language-Team: Catalan\n"
@ -164,7 +164,7 @@ msgstr ""
msgid "The type of the value" msgid "The type of the value"
msgstr "" msgstr ""
#: ../gvn/gvn-param.c:485 ../vn/vn-field.c:553 ../vn/vn-column.c:440 #: ../gvn/gvn-param.c:485 ../vn/vn-field.c:553 ../vn/vn-column.c:442
msgid "Editable" msgid "Editable"
msgstr "" msgstr ""
@ -172,7 +172,7 @@ msgstr ""
msgid "Whether the param value can be modified" msgid "Whether the param value can be modified"
msgstr "" msgstr ""
#: ../gvn/gvn-param.c:492 ../vn/vn-field.c:560 ../vn/vn-column.c:447 #: ../gvn/gvn-param.c:492 ../vn/vn-field.c:560 ../vn/vn-column.c:449
msgid "Null" msgid "Null"
msgstr "" msgstr ""
@ -213,7 +213,7 @@ msgstr ""
msgid "The value" msgid "The value"
msgstr "" msgstr ""
#: ../sql/sql-string.c:198 ../db/db-model.c:3472 ../db/db-request.c:461 #: ../sql/sql-string.c:198 ../db/db-model.c:3455 ../db/db-request.c:461
msgid "SQL" msgid "SQL"
msgstr "" msgstr ""
@ -239,70 +239,70 @@ msgstr "Recordar"
msgid "Wether to rememeber the selection when model is refreshed" msgid "Wether to rememeber the selection when model is refreshed"
msgstr "" msgstr ""
#: ../db/db-model.c:3446 ../db/db-request.c:454 ../vn/vn-gui.c:1531 #: ../db/db-model.c:3429 ../db/db-request.c:454 ../vn/vn-gui.c:1554
#: ../vn/vn-form.c:244 #: ../vn/vn-form.c:244
msgid "Connection" msgid "Connection"
msgstr "" msgstr ""
#: ../db/db-model.c:3447 #: ../db/db-model.c:3430
msgid "The DbConn that manages the connection to the database" msgid "The DbConn that manages the connection to the database"
msgstr "" msgstr ""
#: ../db/db-model.c:3454 ../db/db-request.c:468 #: ../db/db-model.c:3437 ../db/db-request.c:468
msgid "Statement" msgid "Statement"
msgstr "" msgstr ""
#: ../db/db-model.c:3455 #: ../db/db-model.c:3438
msgid "The statement which retrieves the data" msgid "The statement which retrieves the data"
msgstr "" msgstr ""
#: ../db/db-model.c:3462 #: ../db/db-model.c:3445
msgid "Use file" msgid "Use file"
msgstr "" msgstr ""
#: ../db/db-model.c:3463 #: ../db/db-model.c:3446
msgid "" msgid ""
"If this is set to TRUE, the \"sql\" property will hold the name of a file " "If this is set to TRUE, the \"sql\" property will hold the name of a file "
"containing a query, if set to FALSE, \"sql\" is used as an SQL string" "containing a query, if set to FALSE, \"sql\" is used as an SQL string"
msgstr "" msgstr ""
#: ../db/db-model.c:3473 #: ../db/db-model.c:3456
msgid "" msgid ""
"Depending on the \"use-file\" property this will be the path to a file with " "Depending on the \"use-file\" property this will be the path to a file with "
"queries for the model or a SQL string" "queries for the model or a SQL string"
msgstr "" msgstr ""
#: ../db/db-model.c:3482 #: ../db/db-model.c:3465
msgid "Main Table" msgid "Main Table"
msgstr "" msgstr ""
#: ../db/db-model.c:3483 #: ../db/db-model.c:3466
msgid "The main table of the model" msgid "The main table of the model"
msgstr "" msgstr ""
#: ../db/db-model.c:3490 #: ../db/db-model.c:3473
msgid "Update flags" msgid "Update flags"
msgstr "" msgstr ""
#: ../db/db-model.c:3491 #: ../db/db-model.c:3474
msgid "The flags that indicate how a model can be modified" msgid "The flags that indicate how a model can be modified"
msgstr "" msgstr ""
#: ../db/db-model.c:3499 #: ../db/db-model.c:3482
msgid "Result position" msgid "Result position"
msgstr "" msgstr ""
#: ../db/db-model.c:3500 #: ../db/db-model.c:3483
msgid "" msgid ""
"The position where the query that will fill the model will be placed in a " "The position where the query that will fill the model will be placed in a "
"multi-query" "multi-query"
msgstr "" msgstr ""
#: ../db/db-model-holder.c:70 ../db/db-calc.c:329 #: ../db/db-model-holder.c:71 ../db/db-calc.c:329
msgid "Model" msgid "Model"
msgstr "" msgstr ""
#: ../db/db-model-holder.c:71 #: ../db/db-model-holder.c:72
msgid "The model used by the holder" msgid "The model used by the holder"
msgstr "" msgstr ""
@ -350,7 +350,7 @@ msgstr ""
msgid "The iterator owner of param" msgid "The iterator owner of param"
msgstr "" msgstr ""
#: ../db/db-param.c:258 ../vn/vn-column.c:426 #: ../db/db-param.c:258 ../vn/vn-column.c:428
msgid "Column index" msgid "Column index"
msgstr "" msgstr ""
@ -358,11 +358,11 @@ msgstr ""
msgid "The referenced column index" msgid "The referenced column index"
msgstr "" msgstr ""
#: ../db/db-param.c:265 ../vn/vn-field.c:539 ../vn/vn-column.c:433 #: ../db/db-param.c:265 ../vn/vn-field.c:539 ../vn/vn-column.c:435
msgid "Column name" msgid "Column name"
msgstr "Nom de la columna" msgstr "Nom de la columna"
#: ../db/db-param.c:266 ../vn/vn-column.c:434 #: ../db/db-param.c:266 ../vn/vn-column.c:436
msgid "The referenced column name" msgid "The referenced column name"
msgstr "Nom de la columna referenciada" msgstr "Nom de la columna referenciada"
@ -403,7 +403,7 @@ msgid "The path where query files are located"
msgstr "" msgstr ""
#: ../db/db-conn.c:1051 ../db/db-file-loader.c:715 #: ../db/db-conn.c:1051 ../db/db-file-loader.c:715
#: ../vn/column/vn-column-image.c:489 #: ../vn/column/vn-column-image.c:493
msgid "Host" msgid "Host"
msgstr "" msgstr ""
@ -470,11 +470,11 @@ msgstr ""
msgid "Unknown content length of file %s" msgid "Unknown content length of file %s"
msgstr "" msgstr ""
#: ../db/db-file-loader.c:716 ../vn/column/vn-column-image.c:490 #: ../db/db-file-loader.c:716 ../vn/column/vn-column-image.c:494
msgid "The host web server name to get the images" msgid "The host web server name to get the images"
msgstr "" msgstr ""
#: ../db/db-file-loader.c:723 ../vn/column/vn-column-image.c:497 #: ../db/db-file-loader.c:723 ../vn/column/vn-column-image.c:501
msgid "Path" msgid "Path"
msgstr "" msgstr ""
@ -500,59 +500,59 @@ msgstr ""
msgid "The maximal size for the contents of the cache directory" msgid "The maximal size for the contents of the cache directory"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:620 #: ../vn/vn-gui.c:643
msgid "Connection has been lost. Do you want to reconnect?" msgid "Connection has been lost. Do you want to reconnect?"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:627 #: ../vn/vn-gui.c:650
msgid "An error occurred in the connection." msgid "An error occurred in the connection."
msgstr "" msgstr ""
#: ../vn/vn-gui.c:630 #: ../vn/vn-gui.c:653
msgid "Database error" msgid "Database error"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:637 #: ../vn/vn-gui.c:660
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:977 #: ../vn/vn-gui.c:1000
msgid "Closing connection" msgid "Closing connection"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:979 #: ../vn/vn-gui.c:1002
msgid "Transaction started" msgid "Transaction started"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:981 #: ../vn/vn-gui.c:1004
msgid "Connecting" msgid "Connecting"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:983 #: ../vn/vn-gui.c:1006
msgid "Connection lost" msgid "Connection lost"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:985 #: ../vn/vn-gui.c:1008
msgid "Connection closed" msgid "Connection closed"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:987 ../vn/field/vn-http-image.c:116 #: ../vn/vn-gui.c:1010 ../vn/field/vn-http-image.c:116
msgid "Loading" msgid "Loading"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:989 ../vn/gui/main.glade.h:19 #: ../vn/vn-gui.c:1012 ../vn/gui/main.glade.h:19
msgid "Ready" msgid "Ready"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:1532 #: ../vn/vn-gui.c:1555
msgid "The connection used by Gui" msgid "The connection used by Gui"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:1538 #: ../vn/vn-gui.c:1561
msgid "Application" msgid "Application"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:1539 #: ../vn/vn-gui.c:1562
msgid "The application handler for the entire program" msgid "The application handler for the entire program"
msgstr "" msgstr ""
@ -699,7 +699,7 @@ msgstr ""
msgid "Whether the field value is user editable" msgid "Whether the field value is user editable"
msgstr "" msgstr ""
#: ../vn/vn-field.c:561 ../vn/vn-column.c:448 #: ../vn/vn-field.c:561 ../vn/vn-column.c:450
msgid "Whether the field value can be of type GVN_TYPE_NULL" msgid "Whether the field value can be of type GVN_TYPE_NULL"
msgstr "" msgstr ""
@ -713,19 +713,19 @@ msgstr ""
msgid "The number of decimal places to display." msgid "The number of decimal places to display."
msgstr "" msgstr ""
#: ../vn/field/vn-combo.c:286 ../vn/column/vn-column-combo.c:313 #: ../vn/field/vn-combo.c:286 ../vn/column/vn-column-combo.c:326
msgid "Index column" msgid "Index column"
msgstr "" msgstr ""
#: ../vn/field/vn-combo.c:287 ../vn/column/vn-column-combo.c:314 #: ../vn/field/vn-combo.c:287 ../vn/column/vn-column-combo.c:327
msgid "The column index of the model" msgid "The column index of the model"
msgstr "" msgstr ""
#: ../vn/field/vn-combo.c:293 ../vn/column/vn-column-combo.c:320 #: ../vn/field/vn-combo.c:293 ../vn/column/vn-column-combo.c:333
msgid "Show column" msgid "Show column"
msgstr "" msgstr ""
#: ../vn/field/vn-combo.c:294 ../vn/column/vn-column-combo.c:321 #: ../vn/field/vn-combo.c:294 ../vn/column/vn-column-combo.c:334
msgid "The column of the model shown by combo" msgid "The column of the model shown by combo"
msgstr "" msgstr ""
@ -764,7 +764,7 @@ msgstr ""
msgid "No image set" msgid "No image set"
msgstr "" msgstr ""
#: ../vn/field/vn-http-image.c:207 #: ../vn/field/vn-http-image.c:207 ../vn/column/vn-column-image.c:531
msgid "File loader" msgid "File loader"
msgstr "" msgstr ""
@ -788,19 +788,19 @@ msgstr ""
msgid "A GBytes structure with the image data" msgid "A GBytes structure with the image data"
msgstr "" msgstr ""
#: ../vn/vn-column.c:427 #: ../vn/vn-column.c:429
msgid "The column index in the model" msgid "The column index in the model"
msgstr "" msgstr ""
#: ../vn/vn-column.c:441 #: ../vn/vn-column.c:443
msgid "Whether the column values are editable" msgid "Whether the column values are editable"
msgstr "" msgstr ""
#: ../vn/vn-column.c:454 #: ../vn/vn-column.c:456
msgid "Tab index" msgid "Tab index"
msgstr "" msgstr ""
#: ../vn/vn-column.c:455 #: ../vn/vn-column.c:457
msgid "Order in which the tab selects the columns for edition" msgid "Order in which the tab selects the columns for edition"
msgstr "" msgstr ""
@ -812,38 +812,42 @@ msgstr ""
msgid "The acceleration rate when you hold down a button." msgid "The acceleration rate when you hold down a button."
msgstr "" msgstr ""
#: ../vn/column/vn-column-combo.c:327 #: ../vn/column/vn-column-combo.c:340
msgid "Sort column" msgid "Sort column"
msgstr "" msgstr ""
#: ../vn/column/vn-column-combo.c:328 #: ../vn/column/vn-column-combo.c:341
msgid "The field number of the Grid model used to sort the column" msgid "The field number of the Grid model used to sort the column"
msgstr "" msgstr ""
#: ../vn/column/vn-column-image.c:498 #: ../vn/column/vn-column-image.c:502
msgid "Base path from the host where the images will be downloaded" msgid "Base path from the host where the images will be downloaded"
msgstr "" msgstr ""
#: ../vn/column/vn-column-image.c:505 #: ../vn/column/vn-column-image.c:509
msgid "Tooltip path" msgid "Tooltip path"
msgstr "" msgstr ""
#: ../vn/column/vn-column-image.c:506 #: ../vn/column/vn-column-image.c:510
msgid "" msgid ""
"Prefix for the path of the images to be shown in the tooltip. Starting after " "Prefix for the path of the images to be shown in the tooltip. Starting after "
"the path of the column and appending the name on each cell" "the path of the column and appending the name on each cell"
msgstr "" msgstr ""
#: ../vn/column/vn-column-image.c:515 #: ../vn/column/vn-column-image.c:519
msgid "Tooltip size" msgid "Tooltip size"
msgstr "" msgstr ""
#: ../vn/column/vn-column-image.c:516 #: ../vn/column/vn-column-image.c:520
msgid "" msgid ""
"Size of the bigger side of the tooltip images, the another side will be " "Size of the bigger side of the tooltip images, the another side will be "
"scaled accordingly and smaller images won't be scaled" "scaled accordingly and smaller images won't be scaled"
msgstr "" msgstr ""
#: ../vn/column/vn-column-image.c:532
msgid "An optional file loader, if it's NULL the column will create one"
msgstr ""
#: ../vn/gui/login.glade.h:1 #: ../vn/gui/login.glade.h:1
msgid "Configuration" msgid "Configuration"
msgstr "" msgstr ""
@ -1015,6 +1019,38 @@ msgstr ""
msgid "Open the SQL Editor" msgid "Open the SQL Editor"
msgstr "" msgstr ""
#: ../module/data/example.xml.h:1
msgid "Example"
msgstr ""
#: ../module/data/example.xml.h:2
msgid ""
"\n"
"\t\t\tExample\n"
"\t\t"
msgstr ""
#: ../module/data/example.xml.h:5
msgid ""
"\n"
"\t\t\tConsulter\n"
"\t\t"
msgstr ""
#: ../module/data/example.xml.h:8
msgid ""
"\n"
"\t\t\tUsers\n"
"\t\t"
msgstr ""
#: ../module/data/example.xml.h:11
msgid ""
"\n"
"\t\t\tCustomer\n"
"\t\t"
msgstr ""
#: ../module/data/users.glade.h:1 #: ../module/data/users.glade.h:1
msgid "Identifier" msgid "Identifier"
msgstr "" msgstr ""

162
po/es.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: hedera 1.0\n" "Project-Id-Version: hedera 1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-05 10:03+0100\n" "POT-Creation-Date: 2013-11-18 16:11+0100\n"
"PO-Revision-Date: 2013-06-04 13:36+0200\n" "PO-Revision-Date: 2013-06-04 13:36+0200\n"
"Last-Translator: Alejandro T. Colombini Gómez <atcolombini@verdnatura.es>\n" "Last-Translator: Alejandro T. Colombini Gómez <atcolombini@verdnatura.es>\n"
"Language-Team: Spanish\n" "Language-Team: Spanish\n"
@ -166,7 +166,7 @@ msgstr "Tipo Glib"
msgid "The type of the value" msgid "The type of the value"
msgstr "El tipo del valor" msgstr "El tipo del valor"
#: ../gvn/gvn-param.c:485 ../vn/vn-field.c:553 ../vn/vn-column.c:440 #: ../gvn/gvn-param.c:485 ../vn/vn-field.c:553 ../vn/vn-column.c:442
msgid "Editable" msgid "Editable"
msgstr "Editable" msgstr "Editable"
@ -174,7 +174,7 @@ msgstr "Editable"
msgid "Whether the param value can be modified" msgid "Whether the param value can be modified"
msgstr "Indica si el parámetro puede modificarse" msgstr "Indica si el parámetro puede modificarse"
#: ../gvn/gvn-param.c:492 ../vn/vn-field.c:560 ../vn/vn-column.c:447 #: ../gvn/gvn-param.c:492 ../vn/vn-field.c:560 ../vn/vn-column.c:449
msgid "Null" msgid "Null"
msgstr "Nulo" msgstr "Nulo"
@ -215,7 +215,7 @@ msgstr "El parametro al cual está vinculado"
msgid "The value" msgid "The value"
msgstr "Valor" msgstr "Valor"
#: ../sql/sql-string.c:198 ../db/db-model.c:3472 ../db/db-request.c:461 #: ../sql/sql-string.c:198 ../db/db-model.c:3455 ../db/db-request.c:461
msgid "SQL" msgid "SQL"
msgstr "SQL" msgstr "SQL"
@ -241,28 +241,28 @@ msgid "Wether to rememeber the selection when model is refreshed"
msgstr "" msgstr ""
"Si se recordará o no la fila seleccionado cuando se refresque el modelo" "Si se recordará o no la fila seleccionado cuando se refresque el modelo"
#: ../db/db-model.c:3446 ../db/db-request.c:454 ../vn/vn-gui.c:1531 #: ../db/db-model.c:3429 ../db/db-request.c:454 ../vn/vn-gui.c:1554
#: ../vn/vn-form.c:244 #: ../vn/vn-form.c:244
msgid "Connection" msgid "Connection"
msgstr "Conexión" msgstr "Conexión"
#: ../db/db-model.c:3447 #: ../db/db-model.c:3430
msgid "The DbConn that manages the connection to the database" msgid "The DbConn that manages the connection to the database"
msgstr "La DbConn que controla la conexión a la base de datos" msgstr "La DbConn que controla la conexión a la base de datos"
#: ../db/db-model.c:3454 ../db/db-request.c:468 #: ../db/db-model.c:3437 ../db/db-request.c:468
msgid "Statement" msgid "Statement"
msgstr "Consulta" msgstr "Consulta"
#: ../db/db-model.c:3455 #: ../db/db-model.c:3438
msgid "The statement which retrieves the data" msgid "The statement which retrieves the data"
msgstr "La consulta que recupera los datos" msgstr "La consulta que recupera los datos"
#: ../db/db-model.c:3462 #: ../db/db-model.c:3445
msgid "Use file" msgid "Use file"
msgstr "Usa fichero" msgstr "Usa fichero"
#: ../db/db-model.c:3463 #: ../db/db-model.c:3446
msgid "" msgid ""
"If this is set to TRUE, the \"sql\" property will hold the name of a file " "If this is set to TRUE, the \"sql\" property will hold the name of a file "
"containing a query, if set to FALSE, \"sql\" is used as an SQL string" "containing a query, if set to FALSE, \"sql\" is used as an SQL string"
@ -270,7 +270,7 @@ msgstr ""
"Si es TRUE, la propiedad \"sql\" contiene el nombre de un archivo, si es " "Si es TRUE, la propiedad \"sql\" contiene el nombre de un archivo, si es "
"falso, \"sql\" se usa como una cadena SQL" "falso, \"sql\" se usa como una cadena SQL"
#: ../db/db-model.c:3473 #: ../db/db-model.c:3456
msgid "" msgid ""
"Depending on the \"use-file\" property this will be the path to a file with " "Depending on the \"use-file\" property this will be the path to a file with "
"queries for the model or a SQL string" "queries for the model or a SQL string"
@ -278,27 +278,27 @@ msgstr ""
"Dependiendo de la propiedad \"use-file\", esta propiedad será la ruta a un " "Dependiendo de la propiedad \"use-file\", esta propiedad será la ruta a un "
"fichero con consultas para el modelo o una cadena SQL" "fichero con consultas para el modelo o una cadena SQL"
#: ../db/db-model.c:3482 #: ../db/db-model.c:3465
msgid "Main Table" msgid "Main Table"
msgstr "Tabla principal" msgstr "Tabla principal"
#: ../db/db-model.c:3483 #: ../db/db-model.c:3466
msgid "The main table of the model" msgid "The main table of the model"
msgstr "La tabla principal del modelo" msgstr "La tabla principal del modelo"
#: ../db/db-model.c:3490 #: ../db/db-model.c:3473
msgid "Update flags" msgid "Update flags"
msgstr "Flags de actualización" msgstr "Flags de actualización"
#: ../db/db-model.c:3491 #: ../db/db-model.c:3474
msgid "The flags that indicate how a model can be modified" msgid "The flags that indicate how a model can be modified"
msgstr "Indican como se puede modificar el modelo" msgstr "Indican como se puede modificar el modelo"
#: ../db/db-model.c:3499 #: ../db/db-model.c:3482
msgid "Result position" msgid "Result position"
msgstr "Posición del resultado" msgstr "Posición del resultado"
#: ../db/db-model.c:3500 #: ../db/db-model.c:3483
msgid "" msgid ""
"The position where the query that will fill the model will be placed in a " "The position where the query that will fill the model will be placed in a "
"multi-query" "multi-query"
@ -306,11 +306,11 @@ msgstr ""
"La posición en la que se situa la consulta que pone datos en el modelo en " "La posición en la que se situa la consulta que pone datos en el modelo en "
"una consulta múltiple" "una consulta múltiple"
#: ../db/db-model-holder.c:70 ../db/db-calc.c:329 #: ../db/db-model-holder.c:71 ../db/db-calc.c:329
msgid "Model" msgid "Model"
msgstr "Modelo" msgstr "Modelo"
#: ../db/db-model-holder.c:71 #: ../db/db-model-holder.c:72
msgid "The model used by the holder" msgid "The model used by the holder"
msgstr "La conexión empleada por el objeto" msgstr "La conexión empleada por el objeto"
@ -358,7 +358,7 @@ msgstr "Iterator"
msgid "The iterator owner of param" msgid "The iterator owner of param"
msgstr "El Iterator dueño del parámetro" msgstr "El Iterator dueño del parámetro"
#: ../db/db-param.c:258 ../vn/vn-column.c:426 #: ../db/db-param.c:258 ../vn/vn-column.c:428
msgid "Column index" msgid "Column index"
msgstr "Posición" msgstr "Posición"
@ -366,11 +366,11 @@ msgstr "Posición"
msgid "The referenced column index" msgid "The referenced column index"
msgstr "La posición de la columna en el Grid" msgstr "La posición de la columna en el Grid"
#: ../db/db-param.c:265 ../vn/vn-field.c:539 ../vn/vn-column.c:433 #: ../db/db-param.c:265 ../vn/vn-field.c:539 ../vn/vn-column.c:435
msgid "Column name" msgid "Column name"
msgstr "Nombre de la columna" msgstr "Nombre de la columna"
#: ../db/db-param.c:266 ../vn/vn-column.c:434 #: ../db/db-param.c:266 ../vn/vn-column.c:436
msgid "The referenced column name" msgid "The referenced column name"
msgstr "" msgstr ""
"El nombre del campo en el Iterator vinculado al Grid al que pretenece la " "El nombre del campo en el Iterator vinculado al Grid al que pretenece la "
@ -413,7 +413,7 @@ msgid "The path where query files are located"
msgstr "La ruta donde se encuentran los archivos de consultas" msgstr "La ruta donde se encuentran los archivos de consultas"
#: ../db/db-conn.c:1051 ../db/db-file-loader.c:715 #: ../db/db-conn.c:1051 ../db/db-file-loader.c:715
#: ../vn/column/vn-column-image.c:489 #: ../vn/column/vn-column-image.c:493
msgid "Host" msgid "Host"
msgstr "Host" msgstr "Host"
@ -480,11 +480,11 @@ msgstr "No se ha guardado %s en la cache"
msgid "Unknown content length of file %s" msgid "Unknown content length of file %s"
msgstr "Longitud del contenido del archivo %s desconocida" msgstr "Longitud del contenido del archivo %s desconocida"
#: ../db/db-file-loader.c:716 ../vn/column/vn-column-image.c:490 #: ../db/db-file-loader.c:716 ../vn/column/vn-column-image.c:494
msgid "The host web server name to get the images" msgid "The host web server name to get the images"
msgstr "El nombre del servidor web al que se conectará" msgstr "El nombre del servidor web al que se conectará"
#: ../db/db-file-loader.c:723 ../vn/column/vn-column-image.c:497 #: ../db/db-file-loader.c:723 ../vn/column/vn-column-image.c:501
msgid "Path" msgid "Path"
msgstr "Ruta" msgstr "Ruta"
@ -512,59 +512,59 @@ msgstr "Tamaño máximo de la caché"
msgid "The maximal size for the contents of the cache directory" msgid "The maximal size for the contents of the cache directory"
msgstr "El tamaño máximo para los contenidos del directorio de caché" msgstr "El tamaño máximo para los contenidos del directorio de caché"
#: ../vn/vn-gui.c:620 #: ../vn/vn-gui.c:643
msgid "Connection has been lost. Do you want to reconnect?" msgid "Connection has been lost. Do you want to reconnect?"
msgstr "Se ha perdido la conexión. ¿Quieres reconectar?" msgstr "Se ha perdido la conexión. ¿Quieres reconectar?"
#: ../vn/vn-gui.c:627 #: ../vn/vn-gui.c:650
msgid "An error occurred in the connection." msgid "An error occurred in the connection."
msgstr "Ha habido un error en la conexión." msgstr "Ha habido un error en la conexión."
#: ../vn/vn-gui.c:630 #: ../vn/vn-gui.c:653
msgid "Database error" msgid "Database error"
msgstr "Error en la base de datos" msgstr "Error en la base de datos"
#: ../vn/vn-gui.c:637 #: ../vn/vn-gui.c:660
msgid "Unknown error" msgid "Unknown error"
msgstr "Error desconocido" msgstr "Error desconocido"
#: ../vn/vn-gui.c:977 #: ../vn/vn-gui.c:1000
msgid "Closing connection" msgid "Closing connection"
msgstr "Cerrando conexión" msgstr "Cerrando conexión"
#: ../vn/vn-gui.c:979 #: ../vn/vn-gui.c:1002
msgid "Transaction started" msgid "Transaction started"
msgstr "Transacción iniciada" msgstr "Transacción iniciada"
#: ../vn/vn-gui.c:981 #: ../vn/vn-gui.c:1004
msgid "Connecting" msgid "Connecting"
msgstr "Conectando" msgstr "Conectando"
#: ../vn/vn-gui.c:983 #: ../vn/vn-gui.c:1006
msgid "Connection lost" msgid "Connection lost"
msgstr "Conexión perdida" msgstr "Conexión perdida"
#: ../vn/vn-gui.c:985 #: ../vn/vn-gui.c:1008
msgid "Connection closed" msgid "Connection closed"
msgstr "Conexión cerrada" msgstr "Conexión cerrada"
#: ../vn/vn-gui.c:987 ../vn/field/vn-http-image.c:116 #: ../vn/vn-gui.c:1010 ../vn/field/vn-http-image.c:116
msgid "Loading" msgid "Loading"
msgstr "Cargando" msgstr "Cargando"
#: ../vn/vn-gui.c:989 ../vn/gui/main.glade.h:19 #: ../vn/vn-gui.c:1012 ../vn/gui/main.glade.h:19
msgid "Ready" msgid "Ready"
msgstr "Listo" msgstr "Listo"
#: ../vn/vn-gui.c:1532 #: ../vn/vn-gui.c:1555
msgid "The connection used by Gui" msgid "The connection used by Gui"
msgstr "La conexión empleada por Gui" msgstr "La conexión empleada por Gui"
#: ../vn/vn-gui.c:1538 #: ../vn/vn-gui.c:1561
msgid "Application" msgid "Application"
msgstr "Aplicación" msgstr "Aplicación"
#: ../vn/vn-gui.c:1539 #: ../vn/vn-gui.c:1562
msgid "The application handler for the entire program" msgid "The application handler for the entire program"
msgstr "El manejador de la aplicación para todo el programa" msgstr "El manejador de la aplicación para todo el programa"
@ -711,7 +711,7 @@ msgstr "El nombre de la columna en el Iterator"
msgid "Whether the field value is user editable" msgid "Whether the field value is user editable"
msgstr "Si el valor de campo puede ser editado por el usuario" msgstr "Si el valor de campo puede ser editado por el usuario"
#: ../vn/vn-field.c:561 ../vn/vn-column.c:448 #: ../vn/vn-field.c:561 ../vn/vn-column.c:450
msgid "Whether the field value can be of type GVN_TYPE_NULL" msgid "Whether the field value can be of type GVN_TYPE_NULL"
msgstr "Si el campo puede ser del tipo GVN_TYPE_NULL" msgstr "Si el campo puede ser del tipo GVN_TYPE_NULL"
@ -725,19 +725,19 @@ msgstr "Dígitos"
msgid "The number of decimal places to display." msgid "The number of decimal places to display."
msgstr "El número de posiciones decimales que se muestran" msgstr "El número de posiciones decimales que se muestran"
#: ../vn/field/vn-combo.c:286 ../vn/column/vn-column-combo.c:313 #: ../vn/field/vn-combo.c:286 ../vn/column/vn-column-combo.c:326
msgid "Index column" msgid "Index column"
msgstr "Columna índice" msgstr "Columna índice"
#: ../vn/field/vn-combo.c:287 ../vn/column/vn-column-combo.c:314 #: ../vn/field/vn-combo.c:287 ../vn/column/vn-column-combo.c:327
msgid "The column index of the model" msgid "The column index of the model"
msgstr "La columna índice del modelo" msgstr "La columna índice del modelo"
#: ../vn/field/vn-combo.c:293 ../vn/column/vn-column-combo.c:320 #: ../vn/field/vn-combo.c:293 ../vn/column/vn-column-combo.c:333
msgid "Show column" msgid "Show column"
msgstr "Columna visible" msgstr "Columna visible"
#: ../vn/field/vn-combo.c:294 ../vn/column/vn-column-combo.c:321 #: ../vn/field/vn-combo.c:294 ../vn/column/vn-column-combo.c:334
msgid "The column of the model shown by combo" msgid "The column of the model shown by combo"
msgstr "La columna del modelo que se mostrará en el combo" msgstr "La columna del modelo que se mostrará en el combo"
@ -776,7 +776,7 @@ msgstr "Ya se ha especificado un cargador de archivos"
msgid "No image set" msgid "No image set"
msgstr "Sin imagen" msgstr "Sin imagen"
#: ../vn/field/vn-http-image.c:207 #: ../vn/field/vn-http-image.c:207 ../vn/column/vn-column-image.c:531
msgid "File loader" msgid "File loader"
msgstr "Cargador de archivos" msgstr "Cargador de archivos"
@ -800,19 +800,19 @@ msgstr "Bytes"
msgid "A GBytes structure with the image data" msgid "A GBytes structure with the image data"
msgstr "Una estructura GBytes con los datos de la imágen" msgstr "Una estructura GBytes con los datos de la imágen"
#: ../vn/vn-column.c:427 #: ../vn/vn-column.c:429
msgid "The column index in the model" msgid "The column index in the model"
msgstr "El índice de la columna en el modelo" msgstr "El índice de la columna en el modelo"
#: ../vn/vn-column.c:441 #: ../vn/vn-column.c:443
msgid "Whether the column values are editable" msgid "Whether the column values are editable"
msgstr "Si el valor de campo puede ser editado por el usuario" msgstr "Si el valor de campo puede ser editado por el usuario"
#: ../vn/vn-column.c:454 #: ../vn/vn-column.c:456
msgid "Tab index" msgid "Tab index"
msgstr "Tab index" msgstr "Tab index"
#: ../vn/vn-column.c:455 #: ../vn/vn-column.c:457
msgid "Order in which the tab selects the columns for edition" msgid "Order in which the tab selects the columns for edition"
msgstr "Orden en el cual el tabulador selecciona las columnas para editar" msgstr "Orden en el cual el tabulador selecciona las columnas para editar"
@ -824,24 +824,24 @@ msgstr "Tasa de subida"
msgid "The acceleration rate when you hold down a button." msgid "The acceleration rate when you hold down a button."
msgstr "La tasa de aceleración cuando se mantiene apretado el botón." msgstr "La tasa de aceleración cuando se mantiene apretado el botón."
#: ../vn/column/vn-column-combo.c:327 #: ../vn/column/vn-column-combo.c:340
msgid "Sort column" msgid "Sort column"
msgstr "Columna de ordenación" msgstr "Columna de ordenación"
#: ../vn/column/vn-column-combo.c:328 #: ../vn/column/vn-column-combo.c:341
msgid "The field number of the Grid model used to sort the column" msgid "The field number of the Grid model used to sort the column"
msgstr "" msgstr ""
"El número de campo del modelo del Grid que se usa para ordenar la columna" "El número de campo del modelo del Grid que se usa para ordenar la columna"
#: ../vn/column/vn-column-image.c:498 #: ../vn/column/vn-column-image.c:502
msgid "Base path from the host where the images will be downloaded" msgid "Base path from the host where the images will be downloaded"
msgstr "La ruta base del servidor desde donde se descargarán las imágenes." msgstr "La ruta base del servidor desde donde se descargarán las imágenes."
#: ../vn/column/vn-column-image.c:505 #: ../vn/column/vn-column-image.c:509
msgid "Tooltip path" msgid "Tooltip path"
msgstr "Ruta del tooltip" msgstr "Ruta del tooltip"
#: ../vn/column/vn-column-image.c:506 #: ../vn/column/vn-column-image.c:510
msgid "" msgid ""
"Prefix for the path of the images to be shown in the tooltip. Starting after " "Prefix for the path of the images to be shown in the tooltip. Starting after "
"the path of the column and appending the name on each cell" "the path of the column and appending the name on each cell"
@ -850,11 +850,11 @@ msgstr ""
"Empezando desde la ruta de la columna y añadiendo después el nombre de cada " "Empezando desde la ruta de la columna y añadiendo después el nombre de cada "
"celda" "celda"
#: ../vn/column/vn-column-image.c:515 #: ../vn/column/vn-column-image.c:519
msgid "Tooltip size" msgid "Tooltip size"
msgstr "Tamaño del tooltip" msgstr "Tamaño del tooltip"
#: ../vn/column/vn-column-image.c:516 #: ../vn/column/vn-column-image.c:520
msgid "" msgid ""
"Size of the bigger side of the tooltip images, the another side will be " "Size of the bigger side of the tooltip images, the another side will be "
"scaled accordingly and smaller images won't be scaled" "scaled accordingly and smaller images won't be scaled"
@ -862,6 +862,10 @@ msgstr ""
"Tamaño del lado más grande de las imágenes de tooltip, el otro lado se " "Tamaño del lado más grande de las imágenes de tooltip, el otro lado se "
"escalará de acuerdo a este y las imágenes más pequeñas no se escalarán" "escalará de acuerdo a este y las imágenes más pequeñas no se escalarán"
#: ../vn/column/vn-column-image.c:532
msgid "An optional file loader, if it's NULL the column will create one"
msgstr "Un cargador de archivos opcional, si es nulo la columna creará uno"
#: ../vn/gui/login.glade.h:1 #: ../vn/gui/login.glade.h:1
msgid "Configuration" msgid "Configuration"
msgstr "Configuración" msgstr "Configuración"
@ -880,7 +884,7 @@ msgstr "Esquema:"
#: ../vn/gui/login.glade.h:5 #: ../vn/gui/login.glade.h:5
msgid "SSL CA:" msgid "SSL CA:"
msgstr "SSL CA" msgstr "SSL CA:"
#: ../vn/gui/login.glade.h:6 #: ../vn/gui/login.glade.h:6
msgid "" msgid ""
@ -1047,6 +1051,50 @@ msgstr "Editor SQL"
msgid "Open the SQL Editor" msgid "Open the SQL Editor"
msgstr "Abrir el Editor SQL" msgstr "Abrir el Editor SQL"
#: ../module/data/example.xml.h:1
msgid "Example"
msgstr "Ejemplo"
#: ../module/data/example.xml.h:2
msgid ""
"\n"
"\t\t\tExample\n"
"\t\t"
msgstr ""
"\n"
"\t\t\tEjemplo\n"
"\t\t"
#: ../module/data/example.xml.h:5
msgid ""
"\n"
"\t\t\tConsulter\n"
"\t\t"
msgstr ""
"\n"
"\t\t\tConsultor\n"
"\t\t"
#: ../module/data/example.xml.h:8
msgid ""
"\n"
"\t\t\tUsers\n"
"\t\t"
msgstr ""
"\n"
"\t\t\tUsuarios\n"
"\t\t"
#: ../module/data/example.xml.h:11
msgid ""
"\n"
"\t\t\tCustomer\n"
"\t\t"
msgstr ""
"\n"
"\t\t\tCliente\n"
"\t\t"
#: ../module/data/users.glade.h:1 #: ../module/data/users.glade.h:1
msgid "Identifier" msgid "Identifier"
msgstr "Identificador" msgstr "Identificador"

148
po/nl.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: hedera 1.0\n" "Project-Id-Version: hedera 1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-05 10:03+0100\n" "POT-Creation-Date: 2013-11-18 16:11+0100\n"
"PO-Revision-Date: 2012-10-09 11:38+0200\n" "PO-Revision-Date: 2012-10-09 11:38+0200\n"
"Last-Translator: Alejandro T. Colombini Gómez <atcolombini@verdnatura.es>\n" "Last-Translator: Alejandro T. Colombini Gómez <atcolombini@verdnatura.es>\n"
"Language-Team: Dutch\n" "Language-Team: Dutch\n"
@ -166,7 +166,7 @@ msgstr ""
msgid "The type of the value" msgid "The type of the value"
msgstr "" msgstr ""
#: ../gvn/gvn-param.c:485 ../vn/vn-field.c:553 ../vn/vn-column.c:440 #: ../gvn/gvn-param.c:485 ../vn/vn-field.c:553 ../vn/vn-column.c:442
msgid "Editable" msgid "Editable"
msgstr "" msgstr ""
@ -174,7 +174,7 @@ msgstr ""
msgid "Whether the param value can be modified" msgid "Whether the param value can be modified"
msgstr "" msgstr ""
#: ../gvn/gvn-param.c:492 ../vn/vn-field.c:560 ../vn/vn-column.c:447 #: ../gvn/gvn-param.c:492 ../vn/vn-field.c:560 ../vn/vn-column.c:449
msgid "Null" msgid "Null"
msgstr "" msgstr ""
@ -215,7 +215,7 @@ msgstr ""
msgid "The value" msgid "The value"
msgstr "" msgstr ""
#: ../sql/sql-string.c:198 ../db/db-model.c:3472 ../db/db-request.c:461 #: ../sql/sql-string.c:198 ../db/db-model.c:3455 ../db/db-request.c:461
msgid "SQL" msgid "SQL"
msgstr "" msgstr ""
@ -240,70 +240,70 @@ msgstr ""
msgid "Wether to rememeber the selection when model is refreshed" msgid "Wether to rememeber the selection when model is refreshed"
msgstr "" msgstr ""
#: ../db/db-model.c:3446 ../db/db-request.c:454 ../vn/vn-gui.c:1531 #: ../db/db-model.c:3429 ../db/db-request.c:454 ../vn/vn-gui.c:1554
#: ../vn/vn-form.c:244 #: ../vn/vn-form.c:244
msgid "Connection" msgid "Connection"
msgstr "" msgstr ""
#: ../db/db-model.c:3447 #: ../db/db-model.c:3430
msgid "The DbConn that manages the connection to the database" msgid "The DbConn that manages the connection to the database"
msgstr "" msgstr ""
#: ../db/db-model.c:3454 ../db/db-request.c:468 #: ../db/db-model.c:3437 ../db/db-request.c:468
msgid "Statement" msgid "Statement"
msgstr "" msgstr ""
#: ../db/db-model.c:3455 #: ../db/db-model.c:3438
msgid "The statement which retrieves the data" msgid "The statement which retrieves the data"
msgstr "" msgstr ""
#: ../db/db-model.c:3462 #: ../db/db-model.c:3445
msgid "Use file" msgid "Use file"
msgstr "" msgstr ""
#: ../db/db-model.c:3463 #: ../db/db-model.c:3446
msgid "" msgid ""
"If this is set to TRUE, the \"sql\" property will hold the name of a file " "If this is set to TRUE, the \"sql\" property will hold the name of a file "
"containing a query, if set to FALSE, \"sql\" is used as an SQL string" "containing a query, if set to FALSE, \"sql\" is used as an SQL string"
msgstr "" msgstr ""
#: ../db/db-model.c:3473 #: ../db/db-model.c:3456
msgid "" msgid ""
"Depending on the \"use-file\" property this will be the path to a file with " "Depending on the \"use-file\" property this will be the path to a file with "
"queries for the model or a SQL string" "queries for the model or a SQL string"
msgstr "" msgstr ""
#: ../db/db-model.c:3482 #: ../db/db-model.c:3465
msgid "Main Table" msgid "Main Table"
msgstr "" msgstr ""
#: ../db/db-model.c:3483 #: ../db/db-model.c:3466
msgid "The main table of the model" msgid "The main table of the model"
msgstr "" msgstr ""
#: ../db/db-model.c:3490 #: ../db/db-model.c:3473
msgid "Update flags" msgid "Update flags"
msgstr "" msgstr ""
#: ../db/db-model.c:3491 #: ../db/db-model.c:3474
msgid "The flags that indicate how a model can be modified" msgid "The flags that indicate how a model can be modified"
msgstr "" msgstr ""
#: ../db/db-model.c:3499 #: ../db/db-model.c:3482
msgid "Result position" msgid "Result position"
msgstr "" msgstr ""
#: ../db/db-model.c:3500 #: ../db/db-model.c:3483
msgid "" msgid ""
"The position where the query that will fill the model will be placed in a " "The position where the query that will fill the model will be placed in a "
"multi-query" "multi-query"
msgstr "" msgstr ""
#: ../db/db-model-holder.c:70 ../db/db-calc.c:329 #: ../db/db-model-holder.c:71 ../db/db-calc.c:329
msgid "Model" msgid "Model"
msgstr "" msgstr ""
#: ../db/db-model-holder.c:71 #: ../db/db-model-holder.c:72
msgid "The model used by the holder" msgid "The model used by the holder"
msgstr "" msgstr ""
@ -351,7 +351,7 @@ msgstr ""
msgid "The iterator owner of param" msgid "The iterator owner of param"
msgstr "" msgstr ""
#: ../db/db-param.c:258 ../vn/vn-column.c:426 #: ../db/db-param.c:258 ../vn/vn-column.c:428
msgid "Column index" msgid "Column index"
msgstr "" msgstr ""
@ -359,11 +359,11 @@ msgstr ""
msgid "The referenced column index" msgid "The referenced column index"
msgstr "" msgstr ""
#: ../db/db-param.c:265 ../vn/vn-field.c:539 ../vn/vn-column.c:433 #: ../db/db-param.c:265 ../vn/vn-field.c:539 ../vn/vn-column.c:435
msgid "Column name" msgid "Column name"
msgstr "" msgstr ""
#: ../db/db-param.c:266 ../vn/vn-column.c:434 #: ../db/db-param.c:266 ../vn/vn-column.c:436
msgid "The referenced column name" msgid "The referenced column name"
msgstr "" msgstr ""
@ -404,7 +404,7 @@ msgid "The path where query files are located"
msgstr "" msgstr ""
#: ../db/db-conn.c:1051 ../db/db-file-loader.c:715 #: ../db/db-conn.c:1051 ../db/db-file-loader.c:715
#: ../vn/column/vn-column-image.c:489 #: ../vn/column/vn-column-image.c:493
msgid "Host" msgid "Host"
msgstr "" msgstr ""
@ -471,11 +471,11 @@ msgstr ""
msgid "Unknown content length of file %s" msgid "Unknown content length of file %s"
msgstr "" msgstr ""
#: ../db/db-file-loader.c:716 ../vn/column/vn-column-image.c:490 #: ../db/db-file-loader.c:716 ../vn/column/vn-column-image.c:494
msgid "The host web server name to get the images" msgid "The host web server name to get the images"
msgstr "" msgstr ""
#: ../db/db-file-loader.c:723 ../vn/column/vn-column-image.c:497 #: ../db/db-file-loader.c:723 ../vn/column/vn-column-image.c:501
msgid "Path" msgid "Path"
msgstr "" msgstr ""
@ -501,59 +501,59 @@ msgstr ""
msgid "The maximal size for the contents of the cache directory" msgid "The maximal size for the contents of the cache directory"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:620 #: ../vn/vn-gui.c:643
msgid "Connection has been lost. Do you want to reconnect?" msgid "Connection has been lost. Do you want to reconnect?"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:627 #: ../vn/vn-gui.c:650
msgid "An error occurred in the connection." msgid "An error occurred in the connection."
msgstr "" msgstr ""
#: ../vn/vn-gui.c:630 #: ../vn/vn-gui.c:653
msgid "Database error" msgid "Database error"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:637 #: ../vn/vn-gui.c:660
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:977 #: ../vn/vn-gui.c:1000
msgid "Closing connection" msgid "Closing connection"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:979 #: ../vn/vn-gui.c:1002
msgid "Transaction started" msgid "Transaction started"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:981 #: ../vn/vn-gui.c:1004
msgid "Connecting" msgid "Connecting"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:983 #: ../vn/vn-gui.c:1006
msgid "Connection lost" msgid "Connection lost"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:985 #: ../vn/vn-gui.c:1008
msgid "Connection closed" msgid "Connection closed"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:987 ../vn/field/vn-http-image.c:116 #: ../vn/vn-gui.c:1010 ../vn/field/vn-http-image.c:116
msgid "Loading" msgid "Loading"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:989 ../vn/gui/main.glade.h:19 #: ../vn/vn-gui.c:1012 ../vn/gui/main.glade.h:19
msgid "Ready" msgid "Ready"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:1532 #: ../vn/vn-gui.c:1555
msgid "The connection used by Gui" msgid "The connection used by Gui"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:1538 #: ../vn/vn-gui.c:1561
msgid "Application" msgid "Application"
msgstr "" msgstr ""
#: ../vn/vn-gui.c:1539 #: ../vn/vn-gui.c:1562
msgid "The application handler for the entire program" msgid "The application handler for the entire program"
msgstr "" msgstr ""
@ -700,7 +700,7 @@ msgstr ""
msgid "Whether the field value is user editable" msgid "Whether the field value is user editable"
msgstr "" msgstr ""
#: ../vn/vn-field.c:561 ../vn/vn-column.c:448 #: ../vn/vn-field.c:561 ../vn/vn-column.c:450
msgid "Whether the field value can be of type GVN_TYPE_NULL" msgid "Whether the field value can be of type GVN_TYPE_NULL"
msgstr "" msgstr ""
@ -714,19 +714,19 @@ msgstr ""
msgid "The number of decimal places to display." msgid "The number of decimal places to display."
msgstr "" msgstr ""
#: ../vn/field/vn-combo.c:286 ../vn/column/vn-column-combo.c:313 #: ../vn/field/vn-combo.c:286 ../vn/column/vn-column-combo.c:326
msgid "Index column" msgid "Index column"
msgstr "" msgstr ""
#: ../vn/field/vn-combo.c:287 ../vn/column/vn-column-combo.c:314 #: ../vn/field/vn-combo.c:287 ../vn/column/vn-column-combo.c:327
msgid "The column index of the model" msgid "The column index of the model"
msgstr "" msgstr ""
#: ../vn/field/vn-combo.c:293 ../vn/column/vn-column-combo.c:320 #: ../vn/field/vn-combo.c:293 ../vn/column/vn-column-combo.c:333
msgid "Show column" msgid "Show column"
msgstr "" msgstr ""
#: ../vn/field/vn-combo.c:294 ../vn/column/vn-column-combo.c:321 #: ../vn/field/vn-combo.c:294 ../vn/column/vn-column-combo.c:334
msgid "The column of the model shown by combo" msgid "The column of the model shown by combo"
msgstr "" msgstr ""
@ -765,7 +765,7 @@ msgstr ""
msgid "No image set" msgid "No image set"
msgstr "" msgstr ""
#: ../vn/field/vn-http-image.c:207 #: ../vn/field/vn-http-image.c:207 ../vn/column/vn-column-image.c:531
msgid "File loader" msgid "File loader"
msgstr "" msgstr ""
@ -789,19 +789,19 @@ msgstr ""
msgid "A GBytes structure with the image data" msgid "A GBytes structure with the image data"
msgstr "" msgstr ""
#: ../vn/vn-column.c:427 #: ../vn/vn-column.c:429
msgid "The column index in the model" msgid "The column index in the model"
msgstr "" msgstr ""
#: ../vn/vn-column.c:441 #: ../vn/vn-column.c:443
msgid "Whether the column values are editable" msgid "Whether the column values are editable"
msgstr "" msgstr ""
#: ../vn/vn-column.c:454 #: ../vn/vn-column.c:456
msgid "Tab index" msgid "Tab index"
msgstr "" msgstr ""
#: ../vn/vn-column.c:455 #: ../vn/vn-column.c:457
msgid "Order in which the tab selects the columns for edition" msgid "Order in which the tab selects the columns for edition"
msgstr "" msgstr ""
@ -813,38 +813,42 @@ msgstr ""
msgid "The acceleration rate when you hold down a button." msgid "The acceleration rate when you hold down a button."
msgstr "" msgstr ""
#: ../vn/column/vn-column-combo.c:327 #: ../vn/column/vn-column-combo.c:340
msgid "Sort column" msgid "Sort column"
msgstr "" msgstr ""
#: ../vn/column/vn-column-combo.c:328 #: ../vn/column/vn-column-combo.c:341
msgid "The field number of the Grid model used to sort the column" msgid "The field number of the Grid model used to sort the column"
msgstr "" msgstr ""
#: ../vn/column/vn-column-image.c:498 #: ../vn/column/vn-column-image.c:502
msgid "Base path from the host where the images will be downloaded" msgid "Base path from the host where the images will be downloaded"
msgstr "" msgstr ""
#: ../vn/column/vn-column-image.c:505 #: ../vn/column/vn-column-image.c:509
msgid "Tooltip path" msgid "Tooltip path"
msgstr "" msgstr ""
#: ../vn/column/vn-column-image.c:506 #: ../vn/column/vn-column-image.c:510
msgid "" msgid ""
"Prefix for the path of the images to be shown in the tooltip. Starting after " "Prefix for the path of the images to be shown in the tooltip. Starting after "
"the path of the column and appending the name on each cell" "the path of the column and appending the name on each cell"
msgstr "" msgstr ""
#: ../vn/column/vn-column-image.c:515 #: ../vn/column/vn-column-image.c:519
msgid "Tooltip size" msgid "Tooltip size"
msgstr "" msgstr ""
#: ../vn/column/vn-column-image.c:516 #: ../vn/column/vn-column-image.c:520
msgid "" msgid ""
"Size of the bigger side of the tooltip images, the another side will be " "Size of the bigger side of the tooltip images, the another side will be "
"scaled accordingly and smaller images won't be scaled" "scaled accordingly and smaller images won't be scaled"
msgstr "" msgstr ""
#: ../vn/column/vn-column-image.c:532
msgid "An optional file loader, if it's NULL the column will create one"
msgstr ""
#: ../vn/gui/login.glade.h:1 #: ../vn/gui/login.glade.h:1
msgid "Configuration" msgid "Configuration"
msgstr "" msgstr ""
@ -1015,6 +1019,38 @@ msgstr ""
msgid "Open the SQL Editor" msgid "Open the SQL Editor"
msgstr "" msgstr ""
#: ../module/data/example.xml.h:1
msgid "Example"
msgstr ""
#: ../module/data/example.xml.h:2
msgid ""
"\n"
"\t\t\tExample\n"
"\t\t"
msgstr ""
#: ../module/data/example.xml.h:5
msgid ""
"\n"
"\t\t\tConsulter\n"
"\t\t"
msgstr ""
#: ../module/data/example.xml.h:8
msgid ""
"\n"
"\t\t\tUsers\n"
"\t\t"
msgstr ""
#: ../module/data/example.xml.h:11
msgid ""
"\n"
"\t\t\tCustomer\n"
"\t\t"
msgstr ""
#: ../module/data/users.glade.h:1 #: ../module/data/users.glade.h:1
msgid "Identifier" msgid "Identifier"
msgstr "" msgstr ""

1
vn/Makefile.am
View File

@ -52,7 +52,6 @@ vn_image_DATA = \
image/hedera16x16.xpm \ image/hedera16x16.xpm \
image/hedera32x32.xpm \ image/hedera32x32.xpm \
image/icon.svg \ image/icon.svg \
image/icon-debug.svg \
image/logo.svg \ image/logo.svg \
image/load.gif image/load.gif
vn_gui_DATA = \ vn_gui_DATA = \

70
vn/vn-gui.c
View File

@ -197,13 +197,42 @@ static VnWindow * vn_gui_get_active_window (VnGui * obj)
return obj->main_window; return obj->main_window;
} }
/*
* Validates a module definition file at @path against the DTD
*/
static gboolean vn_gui_validate_module_definition (VnGui * obj, const gchar * path)
{
gboolean valid = FALSE;
xmlValidCtxtPtr ctxt = xmlNewValidCtxt ();
if (ctxt)
{
xmlDocPtr doc = xmlParseFile (path);
if (doc)
{
xmlDtdPtr dtd = xmlParseDTD (NULL, (const xmlChar *) MODULE_DTD);
if (!dtd)
g_error ("The DTD is not well formed!");
valid = xmlValidateDtd (ctxt, doc, dtd);
xmlFreeDtd (dtd);
}
xmlFreeValidCtxt (ctxt);
xmlFreeDoc (doc);
}
return valid;
}
/* /*
* Loads a module and all of its forms. * Loads a module and all of its forms.
*/ */
static void vn_gui_load_module (VnGui * obj, const gchar * dir, const gchar * file) static void vn_gui_load_module (VnGui * obj, const gchar * dir, const gchar * file)
{ {
gint n; gint n;
gchar * path;
gchar * mod_title_strip, * mod_name; gchar * mod_title_strip, * mod_name;
GModule * module = NULL; GModule * module = NULL;
VnMod * mod = NULL; VnMod * mod = NULL;
@ -216,40 +245,14 @@ static void vn_gui_load_module (VnGui * obj, const gchar * dir, const gchar * fi
GdomeDOMString * mod_title; GdomeDOMString * mod_title;
GdomeDOMString * library; GdomeDOMString * library;
GdomeDOMString * name_str; GdomeDOMString * name_str;
gchar * path = g_strdup_printf ("%s/%s", dir, file);
// Validating the module definition against the DTD (using libxml2 directly) if (!vn_gui_validate_module_definition (obj, path))
xmlValidCtxtPtr ctxt = xmlNewValidCtxt ();
path = g_strdup_printf ("%s/%s", dir, file);
if (ctxt)
{
gboolean valid = FALSE;
xmlDocPtr doc = xmlParseFile (path);
if (doc)
{
xmlDtdPtr dtd = xmlParseDTD (NULL, (const xmlChar *) MODULE_DTD);
if (dtd)
valid = xmlValidateDtd (ctxt, doc, dtd);
else
g_warning ("The DTD is not well formed");
xmlFreeDtd (dtd);
}
xmlFreeValidCtxt (ctxt);
xmlFreeDoc (doc);
if (!valid)
{ {
g_warning ("The module definition at \"%s\" is not valid", path);
g_free (path); g_free (path);
g_warning ("The module definition at \"%s\" is not valid", file);
return; return;
} }
}
// Getting the module info from XML file // Getting the module info from XML file
@ -279,7 +282,6 @@ static void vn_gui_load_module (VnGui * obj, const gchar * dir, const gchar * fi
node = gdome_el_firstChild (el, &e); node = gdome_el_firstChild (el, &e);
mod_title = gdome_n_nodeValue (node, &e); mod_title = gdome_n_nodeValue (node, &e);
mod_title_strip = g_strstrip (g_strdup (mod_title->str)); mod_title_strip = g_strstrip (g_strdup (mod_title->str));
nl = gdome_doc_getElementsByTagName (doc, form_str, &e); nl = gdome_doc_getElementsByTagName (doc, form_str, &e);
action_nl = gdome_doc_getElementsByTagName (doc, action_str, &e); action_nl = gdome_doc_getElementsByTagName (doc, action_str, &e);
@ -293,6 +295,7 @@ static void vn_gui_load_module (VnGui * obj, const gchar * dir, const gchar * fi
else else
{ {
g_warning ("VnGui: Error loading module info file: %s", (gchar *) file); g_warning ("VnGui: Error loading module info file: %s", (gchar *) file);
gdome_str_unref (name_str);
return; return;
} }
@ -377,7 +380,7 @@ static void vn_gui_load_module (VnGui * obj, const gchar * dir, const gchar * fi
node = gdome_el_firstChild (el, &e); node = gdome_el_firstChild (el, &e);
title = gdome_n_nodeValue (node, &e); title = gdome_n_nodeValue (node, &e);
title_strip = g_strstrip (g_strdup (title->str)); title_strip = g_strstrip (g_strdup (g_dgettext (text_dom, title->str)));
gdome_n_unref (node, &e); gdome_n_unref (node, &e);
gdome_el_unref (el, &e); gdome_el_unref (el, &e);
@ -397,7 +400,7 @@ static void vn_gui_load_module (VnGui * obj, const gchar * dir, const gchar * fi
gtk_tree_store_set (obj->tree, iter gtk_tree_store_set (obj->tree, iter
,COL_NAME ,name->str ,COL_NAME ,name->str
,COL_ICON ,icon->str ,COL_ICON ,icon->str
,COL_TITLE ,g_dgettext (text_dom, title_strip) ,COL_TITLE ,title_strip
,COL_TYPE ,type ,COL_TYPE ,type
,COL_MODULE ,mod ,COL_MODULE ,mod
,-1 ,-1
@ -1417,7 +1420,6 @@ static void vn_gui_set_property (VnGui * obj, guint id,
g_free (config_dir); g_free (config_dir);
// Setting module search paths // Setting module search paths
lib_path = g_build_path (G_SEARCHPATH_SEPARATOR_S lib_path = g_build_path (G_SEARCHPATH_SEPARATOR_S
,_VN_MODULE_LIB_DIR ,_VN_MODULE_LIB_DIR
,g_getenv ("VN_MODULE_LIB_PATH") ,g_getenv ("VN_MODULE_LIB_PATH")

5
vn/vn.pc.in
View File

@ -6,6 +6,5 @@ includedir=@includedir@/@PACKAGE@
Name: Vn Name: Vn
Description: Graphical UI Module for Hedera Library Description: Graphical UI Module for Hedera Library
Version: @VERSION@ Version: @VERSION@
Requires: db sql gvn gtk+-3.0 Requires: gtk+-3.0 db
Libs: -L${libdir} -lvn -lvnfield -lvncolumn Libs: -lvn -lvnfield -lvncolumn
Cflags: -I${includedir}/vn