Ahora las plantillas de los modulos están portadas a GMenu también

This commit is contained in:
Alejandro T. Colombini Gómez 2014-06-12 15:40:36 +02:00
parent 0703b8b81d
commit 5d1b1af0e8
13 changed files with 17 additions and 46 deletions

View File

@ -22,8 +22,8 @@ anjuta_src_DATA = \
anjuta_datadir = $(templatedir)/data anjuta_datadir = $(templatedir)/data
anjuta_data_DATA = \ anjuta_data_DATA = \
hedera/data/Makefile.am.tpl \ hedera/data/Makefile.am.tpl \
hedera/data/mod.glade \ hedera/data/form.glade \
hedera/data/mod.ui.tpl \ hedera/data/mod-menu.glade.tpl \
hedera/data/mod.xml.tpl hedera/data/mod.xml.tpl
anjuta_sqldir = $(templatedir)/sql/mod anjuta_sqldir = $(templatedir)/sql/mod

View File

@ -74,9 +74,9 @@
<file source="Makefile.am.tpl" destination="Makefile.am"/> <file source="Makefile.am.tpl" destination="Makefile.am"/>
</directory> </directory>
<directory source="data"> <directory source="data">
<file source="mod.glade" destination="[+FormName+].glade"/> <file source="form.glade" destination="[+FormName+].glade"/>
<file source="mod.xml.tpl" destination="[+Name+].xml"/> <file source="mod.xml.tpl" destination="[+Name+].xml"/>
<file source="mod.ui.tpl" destination="[+Name+].ui"/> <file source="mod-menu.glade.tpl" destination="[+Name+]-menu.glade"/>
<file source="Makefile.am.tpl" destination="Makefile.am"/> <file source="Makefile.am.tpl" destination="Makefile.am"/>
</directory> </directory>
<directory source="sql"> <directory source="sql">

View File

@ -16,7 +16,7 @@ AC_PROG_CC
dnl Check for vala. dnl Check for vala.
dnl You should change the version manually to match with yours. dnl You should change the version manually to match with yours.
AM_PROG_VALAC([0.22.0]) AM_PROG_VALAC([0.24.0])
[+IF (=(get "HaveI18n") "1")+] [+IF (=(get "HaveI18n") "1")+]
dnl Internationalization dnl Internationalization
IT_PROG_INTLTOOL([0.35.0]) IT_PROG_INTLTOOL([0.35.0])
@ -71,16 +71,14 @@ if test $UNINSTALLED_DIR; then
VALA_CHECK_MODULES([+NameCUpper+], [gtk+-3.0 [+PackageModule2+]]) VALA_CHECK_MODULES([+NameCUpper+], [gtk+-3.0 [+PackageModule2+]])
[+NameCUpper+]_CFLAGS+=-I$UNINSTALLED_DIR [+NameCUpper+]_CFLAGS+=-I$UNINSTALLED_DIR
[+NameCUpper+]_LIBS+=$UNINSTALLED_DIR/build/main/libhedera.la [+NameCUpper+]_LIBS+=$UNINSTALLED_DIR/build/main/libhedera.la
VALAFLAGS+=$[+NameCUpper+]_VALAFLAGS '--pkg gtk+-3.0 \ VALAFLAGS+="$[+NameCUpper+]_VALAFLAGS --pkg gvn --pkg sql --pkg db --pkg vn --vapidir $UNINSTALLED_DIR/build/vapi "
--pkg gvn --pkg sql --pkg db --pkg vn \
--vapidir $(UNINSTALLED_DIR)/build/vapi '
AC_SUBST([+NameCLower+]_libdir, $libdir/hedera/module) AC_SUBST([+NameCLower+]_libdir, $libdir/hedera/module)
AC_SUBST([+NameCLower+]_datadir, $datadir/hedera/module) AC_SUBST([+NameCLower+]_datadir, $datadir/hedera/module)
AC_SUBST(querydir, $account_datadir/sql) AC_SUBST(querydir, $[+NameCLower+]_datadir/sql)
else else
VALA_CHECK_MODULES([+NameCUpper+], [hedera [+PackageModule2+]]) VALA_CHECK_MODULES([+NameCUpper+], [hedera [+PackageModule2+]])
VALAFLAGS+=$[+NameCUpper+]_VALAFLAGS '--pkg hedera ' VALAFLAGS+=$[+NameCUpper+]_VALAFLAGS
PKG_CHECK_VAR([[+NameCLower+]_libdir], [hedera], [modulelibdir]) PKG_CHECK_VAR([[+NameCLower+]_libdir], [hedera], [modulelibdir])
PKG_CHECK_VAR([[+NameCLower+]_datadir], [hedera], [moduledatadir]) PKG_CHECK_VAR([[+NameCLower+]_datadir], [hedera], [moduledatadir])

View File

@ -4,8 +4,7 @@
[+NameCLower+]_data_DATA = \ [+NameCLower+]_data_DATA = \
[+Name+].xml \ [+Name+].xml \
[+Name+].ui \ [+Name+]-menu.glade \
[+FormName+].glade [+FormName+].glade
EXTRA_DIST = $([+NameCLower+]_data_DATA) EXTRA_DIST = $([+NameCLower+]_data_DATA)

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkBox" id="main">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
</interface>

View File

@ -1,10 +0,0 @@
[+ autogen5 template +]
<ui>
<menubar name="MenuBar">
<placeholder name="ModuleMenu">
<menu name="[+ClassName+]Menu" action="action-menu-[+Name+]">
<menuitem name="[+FormClassName+]" action="open-[+FormName+]"/>
</menu>
</placeholder>
</menubar>
</ui>

View File

@ -1,18 +1,12 @@
[+ autogen5 template +] [+ autogen5 template +]
<module> <module>
<library translatable="yes" name="[+Name+]">[+ClassName+]</library> <library translatable="yes" name="[+Name+]">[+ClassName+]</library>
<action-group>
<action translatable="yes" name="action-menu-[+Name+]">
[+ClassName+]
</action>
</action-group>
<form-group> <form-group>
<form <form
translatable="yes" translatable="yes"
name="[+FormName+]" name="[+FormName+]"
icon="gtk-find-and-replace" icon="gtk-find-and-replace"
action-name="open-[+FormName+]" action-name="open-[+FormName+]">
accel="">
[+FormClassName+] [+FormClassName+]
</form> </form>
</form-group> </form-group>

View File

@ -5,3 +5,5 @@ src/[+Name+].vala
src/[+FormName+].vala src/[+FormName+].vala
data/[+FormName+].glade data/[+FormName+].glade
[type: gettext/glade]data/[+Name+].xml [type: gettext/glade]data/[+Name+].xml
data/[+Name+]-menu.glade

View File

@ -57,7 +57,7 @@ if test x"$ENABLE_VALA" = x"yes" ; then
GOBJECT_INTROSPECTION_CHECK([1.30.0]) GOBJECT_INTROSPECTION_CHECK([1.30.0])
AC_SUBST([GIR_SCANNER_ARGS], [--warn-all]) AC_SUBST([GIR_SCANNER_ARGS], [--warn-all])
if $HAVE_INTROSPECTION; then if $HAVE_INTROSPECTION; then
AC_SUBST([VALA_VERSION], [0.22]) AC_SUBST([VALA_VERSION], [0.24])
AM_PROG_VALAC([$VALA_VERSION]) AM_PROG_VALAC([$VALA_VERSION])
AC_PATH_PROG(VAPIGEN, [vapigen], ["no"]) AC_PATH_PROG(VAPIGEN, [vapigen], ["no"])
fi fi

2
debian/changelog vendored
View File

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

2
debian/control vendored
View File

@ -46,7 +46,7 @@ Section: libdevel
Architecture: amd64 Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, libhedera1 (= ${binary:Version}), Depends: ${shlibs:Depends}, ${misc:Depends}, libhedera1 (= ${binary:Version}),
libgtk-3-dev libgtk-3-dev
Suggests: libgtk-3-doc, libgtk-3-0-dbg, devhelp, valac (>= 0.16) Suggests: libgtk-3-doc, libgtk-3-0-dbg, devhelp, valac (>= 0.24)
Recommends: glade (>= 3.4), anjuta (>= 3.4), libgtksourceview-3.0-1 Recommends: glade (>= 3.4), anjuta (>= 3.4), libgtksourceview-3.0-1
Description: Database access and widget provider library (development) Description: Database access and widget provider library (development)
The hedera library provides and lets you create widgets bound to SQL queries The hedera library provides and lets you create widgets bound to SQL queries

View File

@ -12,7 +12,7 @@ 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/vala-0.22/vapi usr/share/vala-0.24/vapi
usr/share/gtk-doc/html/hedera usr/share/gtk-doc/html/hedera
usr/share/anjuta/templates usr/share/anjuta/templates

View File

@ -24,7 +24,7 @@ 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/vala-0.22/vapi/* usr/share/vala-0.24/vapi/*
usr/share/gtk-doc/html/hedera/* usr/share/gtk-doc/html/hedera/*
usr/share/anjuta/templates/* usr/share/anjuta/templates/*