From: Andrea Zagli Date: Sun, 26 Jul 2009 10:12:57 +0000 (+0200) Subject: Changed project's name from libform to libgtkform. X-Git-Tag: 0.1.0~42 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=fcf23cf61b67691efe136267e911dd42c1d3545f;p=libgtkform Changed project's name from libform to libgtkform. Removed dependency on libgtkdateentry (it'll be pluggable). Updated to libgdaex 0.1 (and libgda 4). --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9e29562 --- /dev/null +++ b/.gitignore @@ -0,0 +1,38 @@ +INSTALL +Makefile.in +aclocal.m4 +autom4te.cache/ +config.guess +config.h.in~ +config.log +config.sub +configure +depcomp +docs/Makefile.in +docs/reference/Makefile.in +gtk-doc.make +install-sh +ltmain.sh +m4/ +missing +src/Makefile.in +test/Makefile.in +Makefile +config.h +config.status +docs/Makefile +docs/reference/Makefile +docs/reference/version.xml +libgtkform.pc +libtool +src/.deps/ +src/Makefile +stamp-h1 +test/.deps/ +test/Makefile +*.o +*.lo +src/.libs/ +src/libgtkform.la +test/.libs/ +test/test diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..602bfc9 --- /dev/null +++ b/COPYING @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/Makefile.am b/Makefile.am index a6e25de..668a94e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,9 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc SUBDIRS = src test docs -EXTRA_DIST = libform.pc.in +ACLOCAL_AMFLAGS = -I m4 + +EXTRA_DIST = libgtkform.pc.in pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libform.pc +pkgconfig_DATA = libgtkform.pc diff --git a/autogen.sh b/autogen.sh index dcc1ee3..20a3601 100755 --- a/autogen.sh +++ b/autogen.sh @@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` cd $srcdir -PROJECT=libform +PROJECT=libgtkform TEST_TYPE=-f FILE=configure.ac @@ -16,14 +16,14 @@ have_libtool=false if libtoolize --version < /dev/null > /dev/null 2>&1 ; then libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` case $libtool_version in - 1.4*|1.5*) + 2.*) have_libtool=true ;; esac fi if $have_libtool ; then : ; else echo - echo "You must have libtool 1.4 installed to compile $PROJECT." + echo "You must have libtool >= 2 installed to compile $PROJECT." echo "Install the appropriate package for your distribution," echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/" DIE=1 diff --git a/config.h.in b/config.h.in index 6928c1b..6816f30 100644 --- a/config.h.in +++ b/config.h.in @@ -12,21 +12,34 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#undef HAVE_MALLOC + /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the `setlocale' function. */ +#undef HAVE_SETLOCALE + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the `strtol' function. */ +#undef HAVE_STRTOL + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H @@ -36,6 +49,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #undef PACKAGE @@ -62,3 +79,6 @@ /* Define to empty if `const' does not conform to ANSI C. */ #undef const + +/* Define to rpl_malloc if the replacement function should be used. */ +#undef malloc diff --git a/configure.ac b/configure.ac index 822ac9f..f1c343e 100644 --- a/configure.ac +++ b/configure.ac @@ -2,15 +2,19 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([libform], [0.0.2], [azagli@inwind.it]) +AC_INIT([libgtkform], [0.1.0], [azagli@libero.it]) AC_CONFIG_SRCDIR([src/form.c]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE AM_MAINTAINER_MODE +AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_SYSTEM +LT_INIT + AC_LIBTOOL_WIN32_DLL # Checks for programs. @@ -25,13 +29,12 @@ AC_PROG_LIBTOOL GTK_DOC_CHECK # Checks for libraries. -PKG_CHECK_MODULES(FORM, [gtk+-2.0 >= 2.6.0 - libglade-2.0 >= 2.0.0 - libgdaobj >= 0.0.2 - libgtkdateentry >= 0.0.2]) +PKG_CHECK_MODULES(GTKFORM, [gtk+-2.0 >= 2.6.0 + libgdaex >= 0.1.0 + libglade-2.0 >= 2.0.0]) -AC_SUBST(FORM_CFLAGS) -AC_SUBST(FORM_LIBS) +AC_SUBST(GTKFORM_CFLAGS) +AC_SUBST(GTKFORM_LIBS) # Checks for header files. AC_HEADER_STDC @@ -41,12 +44,13 @@ AC_CHECK_HEADERS([locale.h string.h stdlib.h]) AC_C_CONST # Checks for library functions. -AC_CHECK_FUNCS([localeconv]) +AC_CHECK_FUNCS([localeconv setlocale strcasecmp strtol]) AC_FUNC_STRTOD +AC_FUNC_MALLOC # Checks for library functions. AC_CONFIG_FILES([ - libform.pc + libgtkform.pc Makefile src/Makefile test/Makefile diff --git a/libform.pc.in b/libform.pc.in deleted file mode 100644 index a001c56..0000000 --- a/libform.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: @PACKAGE_NAME@ -Description: Class for forms -Version: @PACKAGE_VERSION@ -Requires: gtk+-2.0, libglade-2.0, libgdaobj -Libs: -L${libdir} -lform -Cflags: -I${includedir}/libform diff --git a/libgtkform.pc.in b/libgtkform.pc.in new file mode 100644 index 0000000..96e0df9 --- /dev/null +++ b/libgtkform.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: @PACKAGE_NAME@ +Description: Class for forms +Version: @PACKAGE_VERSION@ +Requires: gtk+-2.0, libglade-2.0, libgdaex +Libs: -L${libdir} -lform +Cflags: -I${includedir}/libform diff --git a/src/Makefile.am b/src/Makefile.am index 74c52fd..2d70b3c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,43 +1,41 @@ -LIBS = $(FORM_LIBS) +LIBS = $(GTKFORM_LIBS) -AM_CPPFLAGS = $(FORM_CFLAGS) +AM_CPPFLAGS = $(GTKFORM_CFLAGS) -lib_LTLIBRARIES = libform.la +lib_LTLIBRARIES = libgtkform.la -libform_la_SOURCES = form.c \ +libgtkform_la_SOURCES = form.c \ formkey.c \ field.c \ - fieldtext.c \ - fieldinteger.c \ - fieldfloat.c \ fieldboolean.c \ fielddatetime.c \ + fieldfloat.c \ + fieldinteger.c \ + fieldtext.c \ widget.c \ widgetcheck.c \ widgetcombobox.c \ - widgetdateentry.c \ widgetentry.c \ widgetlabel.c \ widgetspin.c \ widgettextview.c -libform_la_LDFLAGS = -no-undefined +libgtkform_la_LDFLAGS = -no-undefined -libform_include_HEADERS = libform.h \ +libgtkform_include_HEADERS = libform.h \ libformkey.h \ libformfield.h \ - libformfieldtext.h \ - libformfieldinteger.h \ - libformfieldfloat.h \ libformfieldboolean.h \ libformfielddatetime.h \ + libformfieldfloat.h \ + libformfieldinteger.h \ + libformfieldtext.h \ libformwidget.h \ libformwidgetcheck.h \ libformwidgetcombobox.h \ - libformwidgetdateentry.h \ libformwidgetentry.h \ libformwidgetlabel.h \ libformwidgetspin.h \ libformwidgettextview.h -libform_includedir = $(includedir)/libform +libgtkform_includedir = $(includedir)/libgtkform diff --git a/src/fieldboolean.c b/src/fieldboolean.c index 2f23d82..ffa68e9 100644 --- a/src/fieldboolean.c +++ b/src/fieldboolean.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -240,7 +240,7 @@ form_field_boolean_set_from_datamodel (FormField *field, GdaDataModel *dm, gint { gchar *value; - value = g_strdup_printf ("%d", gdao_data_model_get_field_value_boolean_at (dm, row, field_name)); + value = g_strdup_printf ("%d", gdaex_data_model_get_field_value_boolean_at (dm, row, field_name)); ret = form_field_boolean_set_value_stringify (field, value); } diff --git a/src/fielddatetime.c b/src/fielddatetime.c index 1e89ee7..4a20580 100644 --- a/src/fielddatetime.c +++ b/src/fielddatetime.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -272,7 +272,7 @@ form_field_datetime_set_from_datamodel (FormField *field, GdaDataModel *dm, gint if (dm != NULL) { ret = form_field_datetime_set_value_stringify (field, - gdao_data_model_get_field_value_stringify_at (dm, row, field_name)); + gdaex_data_model_get_field_value_stringify_at (dm, row, field_name)); } return ret; diff --git a/src/fieldfloat.c b/src/fieldfloat.c index ed37547..5641edc 100644 --- a/src/fieldfloat.c +++ b/src/fieldfloat.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,8 +20,6 @@ #include -#include - #include "libformwidget.h" #include "libformfieldfloat.h" @@ -250,7 +248,7 @@ form_field_float_set_from_datamodel (FormField *field, GdaDataModel *dm, gint ro if (dm != NULL) { ret = form_field_float_set_value_stringify (field, - gdao_data_model_get_field_value_stringify_at (dm, row, field_name)); + gdaex_data_model_get_field_value_stringify_at (dm, row, field_name)); } return ret; diff --git a/src/fieldinteger.c b/src/fieldinteger.c index 32a479a..3e9d967 100644 --- a/src/fieldinteger.c +++ b/src/fieldinteger.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,8 +18,6 @@ #include -#include - #include "libformwidget.h" #include "libformfieldinteger.h" @@ -241,7 +239,7 @@ form_field_integer_set_from_datamodel (FormField *field, GdaDataModel *dm, gint if (dm != NULL) { ret = form_field_integer_set_value_stringify (field, - gdao_data_model_get_field_value_stringify_at (dm, row, field_name)); + gdaex_data_model_get_field_value_stringify_at (dm, row, field_name)); } return ret; diff --git a/src/fieldtext.c b/src/fieldtext.c index 29efa8a..ea4abcc 100644 --- a/src/fieldtext.c +++ b/src/fieldtext.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,8 +18,6 @@ #include -#include - #include "libformwidget.h" #include "libformfieldtext.h" @@ -181,7 +179,7 @@ const gchar if (value != NULL) { - ret = g_strconcat ("'", gdao_strescape (value, NULL), "'", NULL); + ret = g_strconcat ("'", gdaex_strescape (value, NULL), "'", NULL); } return ret; @@ -241,7 +239,7 @@ form_field_text_set_from_datamodel (FormField *field, GdaDataModel *dm, gint row if (dm != NULL) { ret = form_field_text_set_value_stringify (field, - gdao_data_model_get_field_value_stringify_at (dm, row, field_name)); + gdaex_data_model_get_field_value_stringify_at (dm, row, field_name)); } return ret; diff --git a/src/libform.h b/src/libform.h index 316db37..89d581e 100644 --- a/src/libform.h +++ b/src/libform.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,8 +22,6 @@ #include #include -#include - #include #include #include diff --git a/src/libformfield.h b/src/libformfield.h index 0b2c3b9..f9d2a76 100644 --- a/src/libformfield.h +++ b/src/libformfield.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ #include -#include +#include #include diff --git a/src/libformfieldboolean.h b/src/libformfieldboolean.h index a9371ed..31fefdc 100644 --- a/src/libformfieldboolean.h +++ b/src/libformfieldboolean.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #ifndef __LIBFORM_FIELD_BOOLEAN_H__ #define __LIBFORM_FIELD_BOOLEAN_H__ -#include +#include #include diff --git a/src/libformfielddatetime.h b/src/libformfielddatetime.h index 2ca5cea..84b2ecd 100644 --- a/src/libformfielddatetime.h +++ b/src/libformfielddatetime.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #ifndef __LIBFORM_FIELD_DATETIME_H__ #define __LIBFORM_FIELD_DATETIME_H__ -#include +#include #include diff --git a/src/libformfieldfloat.h b/src/libformfieldfloat.h index 1749ed7..33e81ed 100644 --- a/src/libformfieldfloat.h +++ b/src/libformfieldfloat.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #ifndef __LIBFORM_FIELD_FLOAT_H__ #define __LIBFORM_FIELD_FLOAT_H__ -#include +#include #include diff --git a/src/libformfieldinteger.h b/src/libformfieldinteger.h index c4ee43b..92ec2bf 100644 --- a/src/libformfieldinteger.h +++ b/src/libformfieldinteger.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #ifndef __LIBFORM_FIELD_INTEGER_H__ #define __LIBFORM_FIELD_INTEGER_H__ -#include +#include #include diff --git a/src/libformfieldtext.h b/src/libformfieldtext.h index 7f4c26c..fcce038 100644 --- a/src/libformfieldtext.h +++ b/src/libformfieldtext.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #ifndef __LIBFORM_FIELD_TEXT_H__ #define __LIBFORM_FIELD_TEXT_H__ -#include +#include #include diff --git a/src/libformwidgetdateentry.h b/src/libformwidgetdateentry.h deleted file mode 100644 index dd7ae84..0000000 --- a/src/libformwidgetdateentry.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2005-2006 Andrea Zagli - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef __LIBFORM_WIDGET_DATE_ENTRY_H__ -#define __LIBFORM_WIDGET_DATE_ENTRY_H__ - -#include - - -G_BEGIN_DECLS - - -#define TYPE_FORM_WIDGET_DATE_ENTRY (form_widget_date_entry_get_type ()) -#define FORM_WIDGET_DATE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FORM_WIDGET_DATE_ENTRY, FormWidgetDateEntry)) -#define FORM_WIDGET_DATE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_FORM_WIDGET_DATE_ENTRY, FormWidgetDateEntryClass)) -#define IS_FORM_WIDGET_DATE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_FORM_WIDGET_DATE_ENTRY)) -#define IS_FORM_WIDGET_DATE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_FORM_WIDGET_DATE_ENTRY)) -#define FORM_WIDGET_DATE_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_FORM_WIDGET_DATE_ENTRY, FormWidgetDateEntryClass)) - - -typedef struct _FormWidgetDateEntry FormWidgetDateEntry; -typedef struct _FormWidgetDateEntryClass FormWidgetDateEntryClass; - -struct _FormWidgetDateEntry - { - FormWidget parent; - }; - -struct _FormWidgetDateEntryClass - { - FormWidgetClass parent_class; - }; - -GType form_widget_date_entry_get_type (void) G_GNUC_CONST; - -FormWidget *form_widget_date_entry_new (void); - -const gchar *form_widget_date_entry_get_value_stringify (FormWidget *widget); - -gboolean form_widget_date_entry_set_value_stringify (FormWidget *fwidget, const gchar *value); - -void form_widget_date_entry_set_editable (FormWidget *fwidget, gboolean editable); - - -G_END_DECLS - - -#endif /* __LIBFORM_WIDGET_DATE_ENTRY_H__ */ diff --git a/src/widgetdateentry.c b/src/widgetdateentry.c deleted file mode 100644 index 27ce575..0000000 --- a/src/widgetdateentry.c +++ /dev/null @@ -1,237 +0,0 @@ -/* - * Copyright (C) 2005-2006 Andrea Zagli - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include -#include - -#include "libformwidgetdateentry.h" - -enum -{ - PROP_0, - PROP_DATE_FORMAT, - PROP_SEPARATOR -}; - -static void form_widget_date_entry_class_init (FormWidgetDateEntryClass *klass); -static void form_widget_date_entry_init (FormWidgetDateEntry *form_widget_date_entry); - -static void form_widget_date_entry_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec); -static void form_widget_date_entry_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec); - -#define FORM_WIDGET_DATE_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_FORM_WIDGET_DATE_ENTRY, FormWidgetDateEntryPrivate)) - -typedef struct _FormWidgetDateEntryPrivate FormWidgetDateEntryPrivate; -struct _FormWidgetDateEntryPrivate - { - gchar *date_format; - gchar separator; - }; - - -GType -form_widget_date_entry_get_type (void) -{ - static GType form_widget_date_entry_type = 0; - - if (!form_widget_date_entry_type) - { - static const GTypeInfo form_widget_date_entry_info = - { - sizeof (FormWidgetDateEntryClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) form_widget_date_entry_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (FormWidgetDateEntry), - 0, /* n_preallocs */ - (GInstanceInitFunc) form_widget_date_entry_init, - NULL - }; - - form_widget_date_entry_type = g_type_register_static (TYPE_FORM_WIDGET, "FormWidgetDateEntry", - &form_widget_date_entry_info, 0); - } - - return form_widget_date_entry_type; -} - -static void -form_widget_date_entry_class_init (FormWidgetDateEntryClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - FormWidgetClass *widget_class = FORM_WIDGET_CLASS (klass); - - object_class->set_property = form_widget_date_entry_set_property; - object_class->get_property = form_widget_date_entry_get_property; - - widget_class->get_value_stringify = form_widget_date_entry_get_value_stringify; - widget_class->set_value_stringify = form_widget_date_entry_set_value_stringify; - widget_class->set_editable = form_widget_date_entry_set_editable; - - g_object_class_install_property (object_class, PROP_DATE_FORMAT, - g_param_spec_string ("date-format", - "Date Format", - "Date Format", - "", - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_SEPARATOR, - g_param_spec_char ("separator", - "Separator", - "Separator", - G_MININT8, - G_MAXINT8, - '-', - G_PARAM_READWRITE)); - - g_type_class_add_private (object_class, sizeof (FormWidgetDateEntryPrivate)); -} - -static void -form_widget_date_entry_init (FormWidgetDateEntry *form_widget_date_entry) -{ -} - -/** - * form_widget_date_entry_new: - * - * Returns: the newly created #FormWidgetDateEntry. - */ -FormWidget -*form_widget_date_entry_new () -{ - return g_object_new (TYPE_FORM_WIDGET_DATE_ENTRY, NULL); -} - -/** - * form_widget_date_entry_get_value_stringify: - * @widget: - * - */ -const gchar -*form_widget_date_entry_get_value_stringify (FormWidget *fwidget) -{ - FormWidgetDateEntryPrivate *priv = FORM_WIDGET_DATE_ENTRY_GET_PRIVATE (fwidget); - GtkWidget *w = form_widget_get_widget (fwidget); - - return gtk_date_entry_get_strf (GTK_DATE_ENTRY (w), priv->date_format, priv->separator); -} - -/** - * form_widget_date_entry_set_value_stringify: - * @fwidget: - * @value: - * - */ -gboolean -form_widget_date_entry_set_value_stringify (FormWidget *fwidget, const gchar *value) -{ - gboolean ret = FALSE; - GtkWidget *w; - - FormWidgetDateEntryPrivate *priv = FORM_WIDGET_DATE_ENTRY_GET_PRIVATE (fwidget); - - g_object_get (G_OBJECT (fwidget), - "widget", &w, - NULL); - - gtk_date_entry_set_date_strf (GTK_DATE_ENTRY (w), value, priv->date_format, 0); - - ret = TRUE; - - return ret; -} - -/** - * form_widget_date_entry_set_editable: - * @fwidget: - * @editable: - * - */ -void -form_widget_date_entry_set_editable (FormWidget *fwidget, gboolean editable) -{ - GtkWidget *w; - - g_object_get (G_OBJECT (fwidget), - "widget", &w, - NULL); - - gtk_date_entry_set_editable (GTK_DATE_ENTRY (w), editable); -} - -/* PRIVATE */ -static void -form_widget_date_entry_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) -{ - FormWidgetDateEntry *widget_date_entry = (FormWidgetDateEntry *)object; - - FormWidgetDateEntryPrivate *priv = FORM_WIDGET_DATE_ENTRY_GET_PRIVATE (widget_date_entry); - - switch (property_id) - { - case PROP_DATE_FORMAT: - priv->date_format = g_strstrip (g_strdup (g_value_get_string (value))); - break; - - case PROP_SEPARATOR: - priv->separator = g_value_get_char (value); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - -static void -form_widget_date_entry_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) -{ - FormWidgetDateEntry *widget_date_entry = (FormWidgetDateEntry *)object; - - FormWidgetDateEntryPrivate *priv = FORM_WIDGET_DATE_ENTRY_GET_PRIVATE (widget_date_entry); - - switch (property_id) - { - case PROP_DATE_FORMAT: - g_value_set_string (value, priv->date_format); - break; - - case PROP_SEPARATOR: - g_value_set_char (value, priv->separator); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} diff --git a/test/Makefile.am b/test/Makefile.am index 80a6cc5..20c7776 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,7 @@ -LIBS = $(FORM_LIBS) \ +LIBS = $(GTKFORM_LIBS) \ -export-dynamic -AM_CPPFLAGS = $(FORM_CFLAGS) \ +AM_CPPFLAGS = $(GTKFORM_CFLAGS) \ -I$(top_srcdir)/src \ -DGLADEDIR="\"@abs_builddir@\"" @@ -9,4 +9,4 @@ noinst_PROGRAMS = test test_SOURCES = main.c -test_LDADD = $(top_builddir)/src/libform.la +test_LDADD = $(top_builddir)/src/libgtkform.la diff --git a/test/main.c b/test/main.c index bdb519a..97f09ce 100644 --- a/test/main.c +++ b/test/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2009 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -33,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -52,7 +50,6 @@ FormWidget *wentry; FormWidget *wtxtv; FormWidget *wspin; FormWidget *wcheck; -FormWidget *wdate; FormWidget *wcombobox; GtkWidget *w; @@ -155,16 +152,6 @@ on_btnSqlDelete_clicked (GtkButton *button, gtk_text_buffer_set_text (buf, sql, strlen (sql)); } -GtkWidget -*create_gtkdateentry (gchar *widget_name, gchar *string1, gchar *string2, - gint int1, gint int2) -{ - GtkWidget *w = gtk_date_entry_new ("dmY", '/', TRUE); - gtk_widget_show (w); - - return w; -} - void create_cb_nation (GtkWidget *w) { @@ -177,9 +164,9 @@ create_cb_nation (GtkWidget *w) G_TYPE_INT, G_TYPE_STRING); gtk_combo_box_set_model (GTK_COMBO_BOX (w), GTK_TREE_MODEL (store)); - renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (w), renderer, FALSE); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (w), renderer, + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (w), renderer, FALSE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (w), renderer, "text", 1); id++; @@ -357,23 +344,6 @@ main (int argc, char **argv) NULL); form_add_field (form, fdatetime); - /* DATE_ENTRY - DATETIME */ - wdate = form_widget_date_entry_new (); - form_widget_set_from_glade (wdate, glade, "date_entry"); - g_object_set (wdate, - "date-format", "Ymd", - "separator", '-', - NULL); - - fdatetime = form_field_datetime_new (); - g_object_set (fdatetime, - "field", "birthday", - "form-widget", wdate, - "default", now, - "type", FORM_FIELD_DATETIME_TYPE_DATE, - NULL); - form_add_field (form, fdatetime); - txtvSql = glade_xml_get_widget (glade, "txtvSql"); glade_xml_signal_autoconnect (glade); diff --git a/test/test.glade b/test/test.glade index d01c748..f250867 100644 --- a/test/test.glade +++ b/test/test.glade @@ -1,805 +1,468 @@ - - - + - - - True - test libform - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 600 - 440 - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - - 3 - True - False - 0 - - - - 3 - True - 10 - 2 - False - 3 - 3 - - - - True - Label (id) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - GtkEntry (name) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - - True - GtkSpinButton (Integer) (age) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 1 - 2 - 2 - 3 - - - - - - - True - GtkSpinButton (Float) (amount) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - True - 1 - 2 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 1 - 2 - 3 - 4 - - - - - - - True - GtkComboBox (integer) (id_nation) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - - True - Label (?) (text) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 5 - 6 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 5 - 6 - fill - - - - - - - True - GtkCheckButton (married) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 6 - 7 - fill - - - - - - - True - True - - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 6 - 7 - fill - - - - - - - True - GtkTextView (description) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 7 - 8 - fill - - - - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 1 - 2 - 7 - 8 - fill - fill - - - - - - True - Label (DateTime) (now) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 8 - 9 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 8 - 9 - fill - - - - - - - True - GtkDateEntry (DateTime) (birthday) - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 9 - 10 - fill - - - - - - - True - create_gtkdateentry - 0 - 0 - Wed, 20 Dec 2006 09:51:37 GMT - - - 1 - 2 - 9 - 10 - fill - fill - - - - - - True - False - True - - - 1 - 2 - 4 - 5 - fill - fill - - - - - 0 - False - True - - - - - - True - False - 4 - - - - True - True - gtk-clear - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - True - Check - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - True - Editable - True - GTK_RELIEF_NORMAL - True - False - False - - - - 0 - False - False - - - - - - True - True - Sensitive - True - GTK_RELIEF_NORMAL - True - False - False - - - - 0 - False - False - - - - - 0 - False - True - - - - - - True - GTK_BUTTONBOX_START - 0 - - - - True - True - True - Sql _UPDATE - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - Sql _INSERT INTO - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - Sql _DELETE - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - Sql _SELECT - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - False - True - - - - - - True - 1 - 2 - False - 0 - 0 - - - - True - SQL - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 1 - 2 - 0 - 1 - - - - - 0 - True - True - - - - - - + + + + True + test libform + 600 + 440 + + + + True + 3 + + + True + 3 + 10 + 2 + 3 + 3 + + + True + 0 + Label (id) + + + GTK_FILL + + + + + + True + 0 + GtkEntry (name) + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + + + 1 + 2 + GTK_FILL + + + + + + True + True + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + GtkSpinButton (Integer) (age) + + + 2 + 3 + GTK_FILL + + + + + + True + True + 1 0 100 1 10 10 + 1 + + + 1 + 2 + 2 + 3 + + + + + + True + 0 + GtkSpinButton (Float) (amount) + + + 3 + 4 + GTK_FILL + + + + + + True + True + 1 0 100 1 10 10 + 1 + 2 + + + 1 + 2 + 3 + 4 + + + + + + True + 0 + GtkComboBox (integer) (id_nation) + + + 4 + 5 + GTK_FILL + + + + + + True + 0 + Label (?) (text) + + + 5 + 6 + GTK_FILL + + + + + + True + 0 + + + 1 + 2 + 5 + 6 + GTK_FILL + + + + + + True + 0 + GtkCheckButton (married) + + + 6 + 7 + GTK_FILL + + + + + + True + True + False + True + True + + + 1 + 2 + 6 + 7 + GTK_FILL + + + + + + True + 0 + GtkTextView (description) + + + 7 + 8 + GTK_FILL + + + + + + True + True + + + True + True + + + + + 1 + 2 + 7 + 8 + GTK_FILL + GTK_FILL + + + + + True + 0 + Label (DateTime) (now) + + + 8 + 9 + GTK_FILL + + + + + + True + 0 + + + 1 + 2 + 8 + 9 + GTK_FILL + + + + + + True + + + 1 + 2 + 4 + 5 + GTK_FILL + GTK_FILL + + + + + + + + + + + False + 0 + + + + + True + 4 + + + gtk-clear + True + True + False + True + + + + False + False + 0 + + + + + Check + True + True + False + True + + + + False + False + 1 + + + + + Editable + True + True + False + True + + + + False + False + 2 + + + + + Sensitive + True + True + False + True + + + + False + False + 3 + + + + + False + 1 + + + + + True + start + + + Sql _UPDATE + True + True + True + False + True + + + + False + False + 0 + + + + + Sql _INSERT INTO + True + True + True + False + True + + + + False + False + 1 + + + + + Sql _DELETE + True + True + True + False + True + + + + False + False + 2 + + + + + Sql _SELECT + True + True + True + False + True + + + + False + False + 3 + + + + + False + 2 + + + + + True + 2 + + + True + 0 + SQL + + + GTK_FILL + + + + + + True + True + in + + + True + True + + + + + 1 + 2 + + + + + 3 + + + + +