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

Vala, Documentación, VnForm, debian 

- Arreglados algunos bugs del binding de Vala
	- Añadidos DbRow y DbResult a la documentación
	- Cambios en la configuración del paquete de Debian para añadir el plugin de SQLite a la instalación correctamente
	- Ahora VnForm comprueba que la interfaz gráfica sea la esperada (y avisa en caso contrario)
	- Aumentado el número de versión
This commit is contained in:
Alejandro T. Colombini Gómez 2014-10-28 13:15:20 +01:00
parent 77f182fa03
commit ae12703ae9
13 changed files with 27 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/db-conn.c
View File

@ -612,6 +612,7 @@ DbRequest * db_conn_query_with_stmt (DbConn * obj, SqlStmt * stmt, SqlBatch * ba
* db_conn_query_async:
* @obj: the #DbConn
* @sql: the SQL statement
* @batch: (allow-none):
* @callback:
* @user_data:
* @notify:

2
db/db-result.c
View File

@ -22,6 +22,8 @@
* @Short_description:
* @Title: DbResult
* @See_also: #DbResultSet
*
* #DbResult contains the result of a query.
**/
G_DEFINE_BOXED_TYPE (DbResult, db_result, db_result_copy, db_result_free);

2
db/db-row.c
View File

@ -23,7 +23,7 @@
* @Title: DbRow
* @See_also: #DbModel
*
* #DbRow represents a row in a #DbModel.
* #DbRow represents a row in a #DbModel. It holds an array of #GValue<!-- -->s
**/
G_DEFINE_BOXED_TYPE (DbRow, db_row, db_row_copy, db_row_free);

2
db/db-row.h
View File

@ -26,7 +26,7 @@ typedef struct _DbRow DbRow;
/**
* DbRow:
* @value: a #GValue
* @value:(array): a #GValue array
* @position: the position of the row in the DbModel
* @len: the number of fields
*

2
debian/changelog vendored
View File

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

4
debian/control vendored
View File

@ -3,11 +3,11 @@ Priority: extra
Maintainer: Alejandro T. Colombini Gómez <atcolombini@verdnatura.es>
Build-Depends: debhelper (>= 8.0.0), autotools-dev, libgtk-3-dev, gtk-doc-tools,
valac, libgirepository1.0-dev, libgladeui-dev, libgdome2-dev,
libpq-dev, libmysqlclient-dev, ragel
libpq-dev, libmysqlclient-dev, libsqlite3-dev, ragel
Standards-Version: 3.9.3
Section: libs
Homepage: http://www.verdnatura.es
Vcs-Svn: svn://www.verdnatura.es/hedera/trunk
Vcs-Git: git://www.verdnatura.es/var/git/hedera
Package: libhedera1
Section: libs

1
debian/libhedera1.install vendored
View File

@ -4,6 +4,7 @@ usr/lib/x86_64-linux-gnu/hedera/libsql.so.*
usr/lib/x86_64-linux-gnu/hedera/libdb.so.*
usr/lib/x86_64-linux-gnu/hedera/plugin/pg/libdbpg.so
usr/lib/x86_64-linux-gnu/hedera/plugin/mysql/libdbmysql.so
usr/lib/x86_64-linux-gnu/hedera/plugin/sqlite/libdbsqlite.so
usr/lib/x86_64-linux-gnu/hedera/libvn.so.*
usr/lib/x86_64-linux-gnu/hedera/libvnfield.so.*
usr/lib/x86_64-linux-gnu/hedera/libvncolumn.so.*

7
docs/reference/hedera/hedera-docs.sgml
View File

@ -99,10 +99,11 @@
<xi:include href="xml/db-model.xml"/>
<xi:include href="xml/db-model-holder.xml"/>
<xi:include href="xml/db-iterator.xml"/>
<xi:include href="xml/db-iter.xml"/>
<xi:include href="xml/db-row.xml"/>
<xi:include href="xml/db-param.xml"/>
<xi:include href="xml/db-request.xml"/>
<xi:include href="xml/db-result.xml"/>
<xi:include href="xml/db-row.xml"/>
<xi:include href="xml/db-iter.xml"/>
<xi:include href="xml/db-param.xml"/>
<xi:include href="xml/db-calc.xml"/>
<xi:include href="xml/db-file-loader.xml"/>
<xi:include href="xml/db-plugin.xml"/>

35
module/data/consulter.glade
View File

@ -4,33 +4,6 @@
<requires lib="gtk+" version="3.12"/>
<requires lib="vn" version="0.0"/>
<!-- interface-local-resource-path ../image -->
<object class="GtkActionGroup" id="actions">
<child>
<object class="GtkAction" id="send">
<property name="label" translatable="yes">Send</property>
<property name="short_label" translatable="yes">Send</property>
<property name="tooltip" translatable="yes">Send the current query</property>
<property name="icon_name">system-run</property>
<signal name="activate" handler="vn_consulter_send" swapped="no"/>
</object>
<accelerator key="s" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
<object class="GtkAction" id="clean">
<property name="label" translatable="yes">Clean</property>
<property name="short_label" translatable="yes">Clean</property>
<property name="tooltip" translatable="yes">Clean the messages</property>
<property name="icon_name">edit-clear</property>
<signal name="activate" handler="vn_consulter_clean_clicked" swapped="no"/>
</object>
<accelerator key="f" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
<object class="GtkAction" id="menu">
<property name="label" translatable="yes">_Consulter</property>
</object>
</child>
</object>
<object class="GtkListStore" id="model">
<columns>
<!-- column-name col -->
@ -71,7 +44,7 @@
<property name="can_focus">True</property>
<property name="activates_default">True</property>
<property name="placeholder_text" translatable="yes">Type or select a query</property>
<signal name="activate" handler="gtk_action_activate" object="send" swapped="yes"/>
<signal name="activate" handler="vn_consulter_send" swapped="no"/>
</object>
</child>
</object>
@ -90,12 +63,11 @@
<child>
<object class="GtkButton" id="button-send">
<property name="label" translatable="yes">Send</property>
<property name="use_action_appearance">True</property>
<property name="related_action">send</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="vn_consulter_on_send_activated" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
@ -106,12 +78,11 @@
<child>
<object class="GtkButton" id="button-clean">
<property name="label" translatable="yes">Clean</property>
<property name="use_action_appearance">True</property>
<property name="related_action">clean</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="vn_consulter_on_clean_activated" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>

2
module/src/vn-shelves.c
View File

@ -316,7 +316,7 @@ vn_shelves_show_message (VnShelves * self, const gchar * message)
,GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT
,GTK_MESSAGE_INFO
,GTK_BUTTONS_CLOSE
,message
,"%s", message
);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (GTK_WIDGET (dialog));

2
vapi/Db-1.0.metadata
View File

@ -14,5 +14,3 @@ Plugin.render.object#parameter type="GLib.Object"
Iter struct
Iter.*#method skip
Row struct

10
vn/vn-form.c
View File

@ -42,6 +42,7 @@ void vn_form_open (VnForm * obj)
if (gtk_builder_add_from_file (obj->builder, file, &err))
{
gpointer main_widget = NULL;
const GList * m;
VnSet * models = VN_SET (gtk_builder_get_object (obj->builder, "models"));
@ -52,7 +53,14 @@ void vn_form_open (VnForm * obj)
gtk_builder_connect_signals (obj->builder, obj);
VN_FORM_GET_CLASS (obj)->open (obj);
gtk_container_add (GTK_CONTAINER (obj), vn_form_get (obj, "main"));
main_widget = vn_form_get (obj, "main");
if (main_widget && GTK_IS_WIDGET (main_widget))
gtk_container_add (GTK_CONTAINER (obj), main_widget);
else
g_warning ("VnForm: form UI files must have a toplevel widget "
"with id 'main', but %s does not.", file);
gtk_widget_show_all (GTK_WIDGET (obj));
// Loading menu

3
vn/vn-grid.c
View File

@ -582,8 +582,7 @@ static void vn_grid_finalize (VnGrid * self)
GList * n;
for (n = self->params; n; n = n->next)
g_object_weak_unref (n->data,
(GWeakNotify) vn_grid_unref_param, self);
g_object_weak_unref (n->data, (GWeakNotify) vn_grid_unref_param, self);
g_list_free (self->params);