[Xfce4-commits] r22609 - in libfrap/trunk: . libfrap libfrap/icon-entry libfrap/menu
Benedikt Meurer
benny at xfce.org
Tue Aug 1 13:27:25 UTC 2006
Author: benny
Date: 2006-08-01 13:27:16 +0000 (Tue, 01 Aug 2006)
New Revision: 22609
Added:
libfrap/trunk/COPYING
libfrap/trunk/INSTALL
libfrap/trunk/configure.in.in
libfrap/trunk/libfrap/icon-entry/
libfrap/trunk/libfrap/icon-entry/Makefile.am
libfrap/trunk/libfrap/icon-entry/README
libfrap/trunk/libfrap/icon-entry/frap-icon-entry.c
libfrap/trunk/libfrap/icon-entry/frap-icon-entry.h
libfrap/trunk/libfrap/icon-entry/testiconentry.c
libfrap/trunk/libfrap/menu/README
Removed:
libfrap/trunk/configure.ac
Modified:
libfrap/trunk/
libfrap/trunk/AUTHORS
libfrap/trunk/ChangeLog
libfrap/trunk/Makefile.am
libfrap/trunk/autogen.sh
libfrap/trunk/libfrap/
libfrap/trunk/libfrap/Makefile.am
libfrap/trunk/libfrap/menu/
libfrap/trunk/libfrap/menu/Makefile.am
libfrap/trunk/libfrap/menu/frap-menu-directory.c
libfrap/trunk/libfrap/menu/frap-menu-directory.h
libfrap/trunk/libfrap/menu/frap-menu.c
libfrap/trunk/libfrap/menu/frap-menu.h
libfrap/trunk/libfrap/menu/libfrapmenu.h
Log:
2006-08-01 Benedikt Meurer <benny at xfce.org>
* AUTHORS, COPYING, INSTALL, Makefile.am, autogen.sh, configure.in.in:
Update the build framework.
* libfrap/menu/Makefile.am, libfrap/menu/README: Add missing README
file.
* configure.in.in, libfrap/Makefile.am, libfrap/icon-entry/: Import
FrapIconEntry widget, which is based on the ThunarPathEntry class
and displays a text entry with an associated icon.
Property changes on: libfrap/trunk
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.guess
compile
config.h
config.h.in
config.log
config.status
config.sub
configure
configure.in
depcomp
install-sh
libtool
ltmain.sh
missing
stamp-h1
.*.swp
Modified: libfrap/trunk/AUTHORS
===================================================================
--- libfrap/trunk/AUTHORS 2006-08-01 13:26:08 UTC (rev 22608)
+++ libfrap/trunk/AUTHORS 2006-08-01 13:27:16 UTC (rev 22609)
@@ -1,2 +1,2 @@
-libfrap/menu:
- - Jannis Pohlmann <jannis at xfce.org>
+Benedikt Meurer <benny at xfce.org>
+Jannis Pohlmann <jannis at xfce.org>
Added: libfrap/trunk/COPYING
===================================================================
--- libfrap/trunk/COPYING (rev 0)
+++ libfrap/trunk/COPYING 2006-08-01 13:27:16 UTC (rev 22609)
@@ -0,0 +1,437 @@
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 library GPL. It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+ 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 Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it. You can use it for
+your libraries, too.
+
+ When we speak of free software, we are referring to freedom, 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 or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the 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 a program 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.
+
+ Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library. If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software. To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+ Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs. This
+license, the GNU Library General Public License, applies to certain
+designated libraries. This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+ The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it. Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program. However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+ Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries. We
+concluded that weaker conditions might promote sharing better.
+
+ However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves. This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them. (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.) The hope is that this
+will lead to faster development of free libraries.
+
+ 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, while the latter only
+works together with the library.
+
+ Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+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 compile 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) 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.
+
+ c) 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.
+
+ d) 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 source code 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 to
+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 Library 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
Modified: libfrap/trunk/ChangeLog
===================================================================
--- libfrap/trunk/ChangeLog 2006-08-01 13:26:08 UTC (rev 22608)
+++ libfrap/trunk/ChangeLog 2006-08-01 13:27:16 UTC (rev 22609)
@@ -0,0 +1,11 @@
+2006-08-01 Benedikt Meurer <benny at xfce.org>
+
+ * AUTHORS, COPYING, INSTALL, Makefile.am, autogen.sh, configure.in.in:
+ Update the build framework.
+ * libfrap/menu/Makefile.am, libfrap/menu/README: Add missing README
+ file.
+ * configure.in.in, libfrap/Makefile.am, libfrap/icon-entry/: Import
+ FrapIconEntry widget, which is based on the ThunarPathEntry class
+ and displays a text entry with an associated icon.
+
+# vi:set ts=8 sw=8 noet ai nocindent:
Added: libfrap/trunk/INSTALL
===================================================================
--- libfrap/trunk/INSTALL (rev 0)
+++ libfrap/trunk/INSTALL 2006-08-01 13:27:16 UTC (rev 22609)
@@ -0,0 +1,231 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc. You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+give `configure' the option `--exec-prefix=PREFIX', the package will
+use PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
Modified: libfrap/trunk/Makefile.am
===================================================================
--- libfrap/trunk/Makefile.am 2006-08-01 13:26:08 UTC (rev 22608)
+++ libfrap/trunk/Makefile.am 2006-08-01 13:27:16 UTC (rev 22609)
@@ -1,7 +1,13 @@
- at SET_MAKE@
+# $Id$
-SUBDIRS = \
+SUBDIRS = \
libfrap
+AUTOMAKE_OPTIONS = \
+ 1.8 \
+ dist-bzip2
+
distclean-local:
-rm -rf *.cache *~
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: libfrap/trunk/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Rev
Modified: libfrap/trunk/autogen.sh
===================================================================
--- libfrap/trunk/autogen.sh 2006-08-01 13:26:08 UTC (rev 22608)
+++ libfrap/trunk/autogen.sh 2006-08-01 13:27:16 UTC (rev 22609)
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $Id: autogen.sh 21844 2006-05-25 20:33:38Z kelnos $
+# $Id$
#
-# Copyright (c) 2002-2005
-# The Xfce development team. All rights reserved.
+# Copyright (c) 2002-2006
+# The Thunar development team. All rights reserved.
#
-# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
+# Written for Thunar by Benedikt Meurer <benny at xfce.org>.
#
(type xdt-autogen) >/dev/null 2>&1 || {
@@ -18,6 +18,11 @@
exit 1
}
+# substitute revision
+revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
+sed -e "s/@REVISION@/${revision}/g" \
+ < "configure.in.in" > "configure.in"
+
exec xdt-autogen $@
# vi:set ts=2 sw=2 et ai:
Property changes on: libfrap/trunk/autogen.sh
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Rev
Deleted: libfrap/trunk/configure.ac
Copied: libfrap/trunk/configure.in.in (from rev 22603, libfrap/trunk/configure.ac)
===================================================================
--- libfrap/trunk/configure.in.in (rev 0)
+++ libfrap/trunk/configure.in.in 2006-08-01 13:27:16 UTC (rev 22609)
@@ -0,0 +1,122 @@
+dnl $Id$
+dnl
+dnl Copyright (c) 2004-2006
+dnl The Xfce development team. All rights reserved.
+dnl
+dnl Written for Xfce by Benedikt Meurer <benny at xfce.org>.
+dnl
+
+dnl ***************************
+dnl *** Version information ***
+dnl ***************************
+m4_define([frap_version_major], [0])
+m4_define([frap_version_minor], [0])
+m4_define([frap_version_micro], [1])
+m4_define([frap_version_build], [@REVISION@])
+m4_define([frap_version_tag], [svn])
+m4_define([frap_version], [frap_version_major().frap_version_minor().frap_version_micro()ifelse(frap_version_tag(), [svn], [frap_version_tag()-frap_version_build()], [frap_version_tag()])])
+
+dnl *******************************************
+dnl *** Debugging support for SVN snapshots ***
+dnl *******************************************
+m4_define([frap_debug_default], [ifelse(frap_version_tag(), [svn], [yes], [minimum])])
+
+dnl ***************************
+dnl *** Initialize autoconf ***
+dnl ***************************
+AC_COPYRIGHT([Copyright (c) 2004-2006
+ The Xfce development team. All rights reserved.
+
+Written for Xfce by Benedikt Meurer <benny at xfce.org>.])
+AC_INIT([libfrap], [frap_version()], [http://bugzilla.xfce.org/])
+AC_PREREQ([2.50])
+AC_CANONICAL_TARGET()
+AC_REVISION([$Id$])
+
+dnl ***************************
+dnl *** Initialize automake ***
+dnl ***************************
+AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
+AM_CONFIG_HEADER([config.h])
+AM_MAINTAINER_MODE()
+
+dnl *******************************
+dnl *** Check for UNIX variants ***
+dnl *******************************
+AC_AIX()
+AC_ISC_POSIX()
+AC_MINIX()
+
+dnl ********************************
+dnl *** Check for basic programs ***
+dnl ********************************
+AC_PROG_CC()
+AC_PROG_LD()
+AC_PROG_INSTALL()
+
+dnl **************************
+dnl *** Initialize libtool ***
+dnl **************************
+AC_DISABLE_STATIC()
+AC_PROG_LIBTOOL()
+
+dnl **********************************
+dnl *** Check for standard headers ***
+dnl **********************************
+AC_HEADER_STDC
+
+dnl ***********************************
+dnl *** Check for required packages ***
+dnl ***********************************
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
+
+dnl ***********************************
+dnl *** Check for debugging support ***
+dnl ***********************************
+AC_ARG_ENABLE([debug],
+AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@], [Turn on debugging @<:@default=frap_debug_default@:>@]),
+ [], [enable_debug=frap_debug_default])
+AC_MSG_CHECKING([whether to enable debugging support])
+if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
+ dnl Check whether the compiler accepts the -fno-strict-aliasing
+ dnl switch, as certain packages - like Glib - still don't work
+ dnl properly with newer compilers.
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -fno-strict-aliasing"
+ AC_MSG_CHECKING([whether $CC accepts -fno-strict-aliasing])
+ AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
+ AC_MSG_RESULT([yes])
+ PLATFORM_CFLAGS="$PLATFORM_CFLAGS -fno-strict-aliasing"
+ ], [
+ AC_MSG_RESULT([no])
+ ])
+ CFLAGS="$save_CFLAGS"
+
+ dnl Make sure we detect possible errors
+ PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Werror -Wall"
+
+ dnl Paranoia for --enable-debug=full
+ if test x"$enable_debug" = x"full"; then
+ PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3"
+ PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG"
+ fi
+else
+ dnl Disable object cast checks
+ PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS"
+
+ dnl Disable all checks for --enable-debug=no
+ if test x"$enable_debug" = x"no"; then
+ PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
+ fi
+fi
+AC_MSG_RESULT([$enable_debug])
+
+AC_OUTPUT([
+Makefile
+libfrap/Makefile
+libfrap/icon-entry/Makefile
+libfrap/menu/Makefile
+])
Property changes on: libfrap/trunk/configure.in.in
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Rev
Property changes on: libfrap/trunk/libfrap
___________________________________________________________________
Name: svn:ignore
+ .deps
.libs
Makefile
Makefile.in
.*.swp
Modified: libfrap/trunk/libfrap/Makefile.am
===================================================================
--- libfrap/trunk/libfrap/Makefile.am 2006-08-01 13:26:08 UTC (rev 22608)
+++ libfrap/trunk/libfrap/Makefile.am 2006-08-01 13:27:16 UTC (rev 22609)
@@ -1,4 +1,7 @@
- at SET_MAKE@
+# $Id$
-SUBDIRS = \
+SUBDIRS = \
+ icon-entry \
menu
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: libfrap/trunk/libfrap/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Rev
Property changes on: libfrap/trunk/libfrap/icon-entry
___________________________________________________________________
Name: svn:ignore
+ .deps
.libs
Makefile
Makefile.in
.*.swp
testiconentry
Copied: libfrap/trunk/libfrap/icon-entry/Makefile.am (from rev 22603, libfrap/trunk/libfrap/menu/Makefile.am)
===================================================================
--- libfrap/trunk/libfrap/icon-entry/Makefile.am (rev 0)
+++ libfrap/trunk/libfrap/icon-entry/Makefile.am 2006-08-01 13:27:16 UTC (rev 22609)
@@ -0,0 +1,41 @@
+# $Id$
+
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"FrapIconEntry\"
+
+
+noinst_LTLIBRARIES = \
+ libfrapiconentry.la
+
+libfrapiconentry_la_CFLAGS = \
+ $(GTK_CFLAGS)
+
+libfrapiconentry_la_SOURCES = \
+ frap-icon-entry.c \
+ frap-icon-entry.h
+
+libfrapiconentry_la_LIBADD = \
+ $(GTK_LIBS)
+
+
+noinst_PROGRAMS = \
+ testiconentry
+
+testiconentry_CFLAGS = \
+ $(GTK_CFLAGS)
+
+testiconentry_SOURCES = \
+ testiconentry.c
+
+testiconentry_LDFLAGS = \
+ $(top_builddir)/libfrap/icon-entry/libfrapiconentry.la \
+ $(GTK_LIBS)
+
+testiconentry_DEPENDENCIES = \
+ $(top_builddir)/libfrap/icon-entry/libfrapiconentry.la
+
+
+EXTRA_DIST = \
+ README
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: libfrap/trunk/libfrap/icon-entry/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Rev
Added: libfrap/trunk/libfrap/icon-entry/README
===================================================================
--- libfrap/trunk/libfrap/icon-entry/README (rev 0)
+++ libfrap/trunk/libfrap/icon-entry/README 2006-08-01 13:27:16 UTC (rev 22609)
@@ -0,0 +1,14 @@
+FrapIconEntry
+=============
+
+This is a convenience widget that displays a GtkEntry with an optional
+icon.
+
+To use this widgt in your project, copy the frap-icon-entry.c and
+frap-icon-entry.h files to your project source folder, and include
+frap-icon-entry.h in the source files where you want to use this
+widget.
+
+Written by Benedikt Meurer <benny at xfce.org>.
+
+$Id$
Property changes on: libfrap/trunk/libfrap/icon-entry/README
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Rev
Added: libfrap/trunk/libfrap/icon-entry/frap-icon-entry.c
===================================================================
--- libfrap/trunk/libfrap/icon-entry/frap-icon-entry.c (rev 0)
+++ libfrap/trunk/libfrap/icon-entry/frap-icon-entry.c 2006-08-01 13:27:16 UTC (rev 22609)
@@ -0,0 +1,592 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny at xfce.org>
+ *
+ * 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
+ *
+ * Based on the ThunarPathEntry class, which is part of the Thunar file manager,
+ * Copyright (c) 2004-2006 Benedikt Meurer <benny at xfce.org>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "frap-icon-entry.h"
+
+
+
+/* the margin around the icon */
+#define FRAP_ICON_ENTRY_ICON_MARGIN (2)
+
+
+
+#define FRAP_ICON_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), FRAP_TYPE_ICON_ENTRY, FrapIconEntryPrivate))
+
+
+
+/* Property identifiers */
+enum
+{
+ PROP_0,
+ PROP_SIZE,
+ PROP_STOCK_ID,
+};
+
+
+
+static void frap_icon_entry_class_init (FrapIconEntryClass *klass);
+static void frap_icon_entry_init (FrapIconEntry *icon_entry);
+static void frap_icon_entry_finalize (GObject *object);
+static void frap_icon_entry_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void frap_icon_entry_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void frap_icon_entry_size_request (GtkWidget *widget,
+ GtkRequisition *requisition);
+static void frap_icon_entry_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
+static void frap_icon_entry_realize (GtkWidget *widget);
+static void frap_icon_entry_unrealize (GtkWidget *widget);
+static gboolean frap_icon_entry_expose_event (GtkWidget *widget,
+ GdkEventExpose *event);
+static void frap_icon_entry_get_borders (FrapIconEntry *icon_entry,
+ gint *xborder_return,
+ gint *yborder_return);
+static void frap_icon_entry_get_text_area_size (FrapIconEntry *icon_entry,
+ gint *x_return,
+ gint *y_return,
+ gint *width_return,
+ gint *height_return);
+
+
+
+struct _FrapIconEntryPrivate
+{
+ GtkIconSize size;
+ gchar *stock_id;
+};
+
+
+
+G_DEFINE_TYPE (FrapIconEntry,
+ frap_icon_entry,
+ GTK_TYPE_ENTRY);
+
+
+
+static void
+frap_icon_entry_class_init (FrapIconEntryClass *klass)
+{
+ GtkWidgetClass *gtkwidget_class;
+ GObjectClass *gobject_class;
+
+ /* add the private instance data */
+ g_type_class_add_private (klass, sizeof (FrapIconEntryPrivate));
+
+ gobject_class = G_OBJECT_CLASS (klass);
+ gobject_class->finalize = frap_icon_entry_finalize;
+ gobject_class->get_property = frap_icon_entry_get_property;
+ gobject_class->set_property = frap_icon_entry_set_property;
+
+ gtkwidget_class = GTK_WIDGET_CLASS (klass);
+ gtkwidget_class->size_request = frap_icon_entry_size_request;
+ gtkwidget_class->size_allocate = frap_icon_entry_size_allocate;
+ gtkwidget_class->realize = frap_icon_entry_realize;
+ gtkwidget_class->unrealize = frap_icon_entry_unrealize;
+ gtkwidget_class->expose_event = frap_icon_entry_expose_event;
+
+ /**
+ * FrapIconEntry:size:
+ *
+ * The #GtkIconSize for the icon in this entry.
+ **/
+ g_object_class_install_property (gobject_class,
+ PROP_SIZE,
+ g_param_spec_enum ("size",
+ "Size",
+ "The size of the icon in the entry",
+ GTK_TYPE_ICON_SIZE,
+ GTK_ICON_SIZE_MENU,
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
+
+ /**
+ * FrapIconEntry:stock-id:
+ *
+ * The stock-id of the icon to render, or %NULL if no
+ * icon should be rendered.
+ **/
+ g_object_class_install_property (gobject_class,
+ PROP_STOCK_ID,
+ g_param_spec_string ("stock-id",
+ "Stock Id",
+ "The stock-id of the icon in the entry",
+ NULL,
+ G_PARAM_READWRITE));
+}
+
+
+
+static void
+frap_icon_entry_init (FrapIconEntry *icon_entry)
+{
+ icon_entry->priv = FRAP_ICON_ENTRY_GET_PRIVATE (icon_entry);
+}
+
+
+
+static void
+frap_icon_entry_finalize (GObject *object)
+{
+ FrapIconEntry *icon_entry = FRAP_ICON_ENTRY (object);
+
+ /* release the stock-id if any */
+ g_free (icon_entry->priv->stock_id);
+
+ (*G_OBJECT_CLASS (frap_icon_entry_parent_class)->finalize) (object);
+}
+
+
+
+static void
+frap_icon_entry_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ FrapIconEntry *icon_entry = FRAP_ICON_ENTRY (object);
+
+ switch (prop_id)
+ {
+ case PROP_SIZE:
+ g_value_set_enum (value, frap_icon_entry_get_size (icon_entry));
+ break;
+
+ case PROP_STOCK_ID:
+ g_value_set_string (value, frap_icon_entry_get_stock_id (icon_entry));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+
+
+static void
+frap_icon_entry_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ FrapIconEntry *icon_entry = FRAP_ICON_ENTRY (object);
+
+ switch (prop_id)
+ {
+ case PROP_SIZE:
+ frap_icon_entry_set_size (icon_entry, g_value_get_enum (value));
+ break;
+
+ case PROP_STOCK_ID:
+ frap_icon_entry_set_stock_id (icon_entry, g_value_get_string (value));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+
+
+static void
+frap_icon_entry_size_request (GtkWidget *widget,
+ GtkRequisition *requisition)
+{
+ FrapIconEntry *icon_entry = FRAP_ICON_ENTRY (widget);
+ gint text_height;
+ gint icon_height;
+ gint icon_width;
+ gint xborder;
+ gint yborder;
+
+ /* determine the size request of the text entry */
+ (*GTK_WIDGET_CLASS (frap_icon_entry_parent_class)->size_request) (widget, requisition);
+
+ /* lookup the icon dimensions */
+ gtk_icon_size_lookup (icon_entry->priv->size, &icon_width, &icon_height);
+
+ /* determine the text area size */
+ frap_icon_entry_get_text_area_size (icon_entry, &xborder, &yborder, NULL, &text_height);
+
+ /* adjust the requisition */
+ requisition->width += icon_width + xborder + 2 * FRAP_ICON_ENTRY_ICON_MARGIN;
+ requisition->height = 2 * yborder + MAX (icon_height + 2 * FRAP_ICON_ENTRY_ICON_MARGIN, text_height);
+}
+
+
+
+static void
+frap_icon_entry_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ FrapIconEntry *icon_entry = FRAP_ICON_ENTRY (widget);
+ GtkAllocation text_allocation;
+ GtkAllocation icon_allocation;
+ gint text_height;
+ gint icon_height;
+ gint icon_width;
+ gint xborder;
+ gint yborder;
+
+ /* lookup the icon dimensions */
+ gtk_icon_size_lookup (icon_entry->priv->size, &icon_width, &icon_height);
+
+ /* determine the text area size */
+ frap_icon_entry_get_text_area_size (icon_entry, &xborder, &yborder, NULL, &text_height);
+
+ /* calculate the base text allocation */
+ text_allocation.y = yborder;
+ text_allocation.width = allocation->width - icon_width - 2 * (xborder + FRAP_ICON_ENTRY_ICON_MARGIN);
+ text_allocation.height = text_height;
+
+ /* calculate the base icon allocation */
+ icon_allocation.y = yborder;
+ icon_allocation.width = icon_width + 2 * FRAP_ICON_ENTRY_ICON_MARGIN;
+ icon_allocation.height = MAX (icon_height + 2 * FRAP_ICON_ENTRY_ICON_MARGIN, text_height);
+
+ /* the x offset depends on the text direction */
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ {
+ text_allocation.x = xborder;
+ icon_allocation.x = allocation->width - icon_allocation.width - xborder - 2 * FRAP_ICON_ENTRY_ICON_MARGIN;
+ }
+ else
+ {
+ icon_allocation.x = xborder;
+ text_allocation.x = allocation->width - text_allocation.width - xborder;
+ }
+
+ /* setup the text area */
+ (*GTK_WIDGET_CLASS (frap_icon_entry_parent_class)->size_allocate) (widget, allocation);
+
+ /* adjust the dimensions/positions of the areas */
+ if (GTK_WIDGET_REALIZED (widget))
+ {
+ gdk_window_move_resize (GTK_ENTRY (icon_entry)->text_area,
+ text_allocation.x,
+ text_allocation.y,
+ text_allocation.width,
+ text_allocation.height);
+
+ gdk_window_move_resize (icon_entry->icon_area,
+ icon_allocation.x,
+ icon_allocation.y,
+ icon_allocation.width,
+ icon_allocation.height);
+ }
+}
+
+
+
+static void
+frap_icon_entry_realize (GtkWidget *widget)
+{
+ FrapIconEntry *icon_entry = FRAP_ICON_ENTRY (widget);
+ GdkWindowAttr attributes;
+ gint attributes_mask;
+ gint text_height;
+ gint icon_height;
+ gint icon_width;
+ gint spacing;
+
+ /* let GtkEntry handle the realization of the text area */
+ (*GTK_WIDGET_CLASS (frap_icon_entry_parent_class)->realize) (widget);
+
+ /* lookup the icon dimensions */
+ gtk_icon_size_lookup (icon_entry->priv->size, &icon_width, &icon_height);
+
+ /* determine the spacing for the icon area */
+ frap_icon_entry_get_text_area_size (icon_entry, NULL, NULL, NULL, &text_height);
+ spacing = widget->requisition.height - text_height;
+
+ /* setup the icon_area attributes */
+ attributes.window_type = GDK_WINDOW_CHILD;
+ attributes.wclass = GDK_INPUT_OUTPUT;
+ attributes.visual = gtk_widget_get_visual (widget);
+ attributes.colormap = gtk_widget_get_colormap (widget);
+ attributes.event_mask = gtk_widget_get_events (widget)
+ | GDK_EXPOSURE_MASK;
+ attributes.x = widget->allocation.x + widget->allocation.width - icon_width - spacing;
+ attributes.y = widget->allocation.y + (widget->allocation.height - widget->requisition.height) / 2;
+ attributes.width = icon_width + spacing;
+ attributes.height = widget->requisition.height;
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+
+ /* setup the window for the icon area */
+ icon_entry->icon_area = gdk_window_new (widget->window, &attributes, attributes_mask);
+ gdk_window_set_user_data (icon_entry->icon_area, widget);
+ gdk_window_set_background (icon_entry->icon_area, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+ gdk_window_show (icon_entry->icon_area);
+
+ /* need to resize the text_area afterwards */
+ gtk_widget_queue_resize (widget);
+}
+
+
+
+static void
+frap_icon_entry_unrealize (GtkWidget *widget)
+{
+ FrapIconEntry *icon_entry = FRAP_ICON_ENTRY (widget);
+
+ /* destroy the icon_area */
+ gdk_window_set_user_data (icon_entry->icon_area, NULL);
+ gdk_window_destroy (icon_entry->icon_area);
+ icon_entry->icon_area = NULL;
+
+ (*GTK_WIDGET_CLASS (frap_icon_entry_parent_class)->unrealize) (widget);
+}
+
+
+
+static gboolean
+frap_icon_entry_expose_event (GtkWidget *widget,
+ GdkEventExpose *event)
+{
+ FrapIconEntry *icon_entry = FRAP_ICON_ENTRY (widget);
+ GdkPixbuf *icon;
+ gint icon_height;
+ gint icon_width;
+ gint height;
+ gint width;
+
+ /* check if the expose is on the icon_area */
+ if (event->window == icon_entry->icon_area)
+ {
+ /* determine the size of the icon_area */
+ gdk_drawable_get_size (GDK_DRAWABLE (icon_entry->icon_area), &width, &height);
+
+ /* clear the icon area */
+ gtk_paint_flat_box (widget->style, icon_entry->icon_area,
+ GTK_WIDGET_STATE (widget), GTK_SHADOW_NONE,
+ NULL, widget, "entry_bg", 0, 0, width, height);
+
+ /* check if a stock-id is set */
+ if (G_LIKELY (icon_entry->priv->stock_id != NULL))
+ {
+ /* try to render the icon for the stock-id */
+ icon = gtk_widget_render_icon (widget, icon_entry->priv->stock_id, icon_entry->priv->size, "icon_entry");
+ if (G_LIKELY (icon != NULL))
+ {
+ /* determine the dimensions of the icon */
+ icon_width = gdk_pixbuf_get_width (icon);
+ icon_height = gdk_pixbuf_get_height (icon);
+
+ /* draw the icon */
+ gdk_draw_pixbuf (icon_entry->icon_area,
+ widget->style->black_gc,
+ icon, 0, 0,
+ (width - icon_width) / 2,
+ (height - icon_height) / 2,
+ icon_width, icon_height,
+ GDK_RGB_DITHER_NORMAL, 0, 0);
+
+ /* release the icon */
+ g_object_unref (G_OBJECT (icon));
+ }
+ }
+ }
+ else
+ {
+ /* the expose is probably for the text_area */
+ return (*GTK_WIDGET_CLASS (frap_icon_entry_parent_class)->expose_event) (widget, event);
+ }
+
+ return TRUE;
+}
+
+
+
+static void
+frap_icon_entry_get_borders (FrapIconEntry *icon_entry,
+ gint *xborder_return,
+ gint *yborder_return)
+{
+ gboolean interior_focus;
+ gint focus_width;
+
+ gtk_widget_style_get (GTK_WIDGET (icon_entry),
+ "focus-line-width", &focus_width,
+ "interior-focus", &interior_focus,
+ NULL);
+
+ if (gtk_entry_get_has_frame (GTK_ENTRY (icon_entry)))
+ {
+ *xborder_return = GTK_WIDGET (icon_entry)->style->xthickness;
+ *yborder_return = GTK_WIDGET (icon_entry)->style->ythickness;
+ }
+ else
+ {
+ *xborder_return = 0;
+ *yborder_return = 0;
+ }
+
+ if (!interior_focus)
+ {
+ *xborder_return += focus_width;
+ *yborder_return += focus_width;
+ }
+}
+
+
+
+static void
+frap_icon_entry_get_text_area_size (FrapIconEntry *icon_entry,
+ gint *x_return,
+ gint *y_return,
+ gint *width_return,
+ gint *height_return)
+{
+ GtkRequisition requisition;
+ gint xborder;
+ gint yborder;
+
+ gtk_widget_get_child_requisition (GTK_WIDGET (icon_entry), &requisition);
+
+ frap_icon_entry_get_borders (icon_entry, &xborder, &yborder);
+
+ if (x_return != NULL) *x_return = xborder;
+ if (y_return != NULL) *y_return = yborder;
+ if (width_return != NULL) *width_return = GTK_WIDGET (icon_entry)->allocation.width - xborder * 2;
+ if (height_return != NULL) *height_return = requisition.height - yborder * 2;
+}
+
+
+
+/**
+ * frap_icon_entry_new:
+ *
+ * Allocates a new #FrapIconEntry instance.
+ *
+ * Return value: the newly allocated #FrapIconEntry.
+ **/
+GtkWidget*
+frap_icon_entry_new (void)
+{
+ return g_object_new (FRAP_TYPE_ICON_ENTRY, NULL);
+}
+
+
+
+/**
+ * frap_icon_entry_get_size:
+ * @icon_entry : a #FrapIconEntry.
+ *
+ * Returns the #GtkIconSize that is currently set for the
+ * @icon_entry.
+ *
+ * Return value: the icon size for the @icon_entry.
+ **/
+GtkIconSize
+frap_icon_entry_get_size (FrapIconEntry *icon_entry)
+{
+ g_return_val_if_fail (FRAP_IS_ICON_ENTRY (icon_entry), GTK_ICON_SIZE_INVALID);
+ return icon_entry->priv->size;
+}
+
+
+
+/**
+ * frap_icon_entry_set_size:
+ * @icon_entry : a #FrapIconEntry.
+ * @size : the new icon size for the @icon_entry.
+ *
+ * Sets the size at which the icon of the @icon_entry is drawn
+ * to @size.
+ **/
+void
+frap_icon_entry_set_size (FrapIconEntry *icon_entry,
+ GtkIconSize size)
+{
+ g_return_if_fail (FRAP_IS_ICON_ENTRY (icon_entry));
+
+ /* check if we have a new setting */
+ if (G_LIKELY (icon_entry->priv->size != size))
+ {
+ /* apply the new setting */
+ icon_entry->priv->size = size;
+
+ /* notify listeners */
+ g_object_notify (G_OBJECT (icon_entry), "size");
+
+ /* schedule a resize */
+ gtk_widget_queue_resize (GTK_WIDGET (icon_entry));
+ }
+}
+
+
+
+/**
+ * frap_icon_entry_get_stock_id:
+ * @icon_entry : a #FrapIconEntry.
+ *
+ * Returns the stock-id that is currently set for the @icon_entry
+ * or %NULL if no stock-id is set.
+ *
+ * Return value: the stock-id for the @icon_entry.
+ **/
+const gchar*
+frap_icon_entry_get_stock_id (FrapIconEntry *icon_entry)
+{
+ g_return_val_if_fail (FRAP_IS_ICON_ENTRY (icon_entry), NULL);
+ return icon_entry->priv->stock_id;
+}
+
+
+
+/**
+ * frap_icon_entry_set_stock_id:
+ * @icon_entry : a #FrapIconEntry.
+ * @stock_id : the new stock-id or %NULL to reset.
+ *
+ * Sets the stock-id of the icon to be drawn in the @icon_entry to
+ * @stock_id.
+ **/
+void
+frap_icon_entry_set_stock_id (FrapIconEntry *icon_entry,
+ const gchar *stock_id)
+{
+ g_return_if_fail (FRAP_IS_ICON_ENTRY (icon_entry));
+
+ /* release the previous stock-id */
+ g_free (icon_entry->priv->stock_id);
+
+ /* apply the new stock-id */
+ icon_entry->priv->stock_id = g_strdup (stock_id);
+
+ /* notify listeners */
+ g_object_notify (G_OBJECT (icon_entry), "stock-id");
+
+ /* schedule a resize */
+ gtk_widget_queue_resize (GTK_WIDGET (icon_entry));
+}
+
+
Property changes on: libfrap/trunk/libfrap/icon-entry/frap-icon-entry.c
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Rev
Added: libfrap/trunk/libfrap/icon-entry/frap-icon-entry.h
===================================================================
--- libfrap/trunk/libfrap/icon-entry/frap-icon-entry.h (rev 0)
+++ libfrap/trunk/libfrap/icon-entry/frap-icon-entry.h 2006-08-01 13:27:16 UTC (rev 22609)
@@ -0,0 +1,64 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny at xfce.org>
+ *
+ * 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 __FRAP_ICON_ENTRY_H__
+#define __FRAP_ICON_ENTRY_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _FrapIconEntryPrivate FrapIconEntryPrivate;
+typedef struct _FrapIconEntryClass FrapIconEntryClass;
+typedef struct _FrapIconEntry FrapIconEntry;
+
+#define FRAP_TYPE_ICON_ENTRY (frap_icon_entry_get_type ())
+#define FRAP_ICON_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FRAP_TYPE_ICON_ENTRY, FrapIconEntry))
+#define FRAP_ICON_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FRAP_TYPE_ICON_ENTRY, FrapIconEntryClass))
+#define FRAP_IS_ICON_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FRAP_TYPE_ICON_ENTRY))
+#define FRAP_IS_ICON_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FRAP_TYPE_ICON_ENTRY))
+#define FRAP_ICON_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FRAP_TYPE_ICON_ENTRY, FrapIconEntryClass))
+
+struct _FrapIconEntryClass
+{
+ GtkEntryClass __parent__;
+};
+
+struct _FrapIconEntry
+{
+ GtkEntry __parent__;
+ GdkWindow *icon_area;
+ FrapIconEntryPrivate *priv;
+};
+
+GType frap_icon_entry_get_type (void) G_GNUC_CONST;
+
+GtkWidget *frap_icon_entry_new (void) G_GNUC_MALLOC;
+
+GtkIconSize frap_icon_entry_get_size (FrapIconEntry *icon_entry);
+void frap_icon_entry_set_size (FrapIconEntry *icon_entry,
+ GtkIconSize size);
+
+const gchar *frap_icon_entry_get_stock_id (FrapIconEntry *icon_entry);
+void frap_icon_entry_set_stock_id (FrapIconEntry *icon_entry,
+ const gchar *stock_id);
+
+G_END_DECLS;
+
+#endif /* !__FRAP_ICON_ENTRY_H__ */
Property changes on: libfrap/trunk/libfrap/icon-entry/frap-icon-entry.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Rev
Added: libfrap/trunk/libfrap/icon-entry/testiconentry.c
===================================================================
--- libfrap/trunk/libfrap/icon-entry/testiconentry.c (rev 0)
+++ libfrap/trunk/libfrap/icon-entry/testiconentry.c 2006-08-01 13:27:16 UTC (rev 22609)
@@ -0,0 +1,98 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>
+ *
+ * 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
+ *
+ * Based on the ThunarPathEntry class, which is part of the Thunar file manager,
+ * Copyright (c) 2004-2006 Benedikt Meurer <benny at xfce.org>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include "frap-icon-entry.h"
+
+
+
+static void
+text_changed (GtkEntry *entry)
+{
+ const gchar *text;
+
+ text = gtk_entry_get_text (entry);
+ frap_icon_entry_set_stock_id (FRAP_ICON_ENTRY (entry), (*text != '\0') ? GTK_STOCK_FIND_AND_REPLACE : GTK_STOCK_FIND);
+}
+
+
+
+int
+main (int argc, char **argv)
+{
+ GtkWidget *button;
+ GtkWidget *dialog;
+ GtkWidget *entry;
+ GtkWidget *label;
+ GtkWidget *vbox;
+
+#ifdef G_ENABLE_DEBUG
+ /* Do NOT remove this line for now, If something doesn't work,
+ * fix your code instead!
+ */
+ g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+#endif
+
+ /* initialize GTK+ */
+ gtk_init (&argc, &argv);
+
+ /* setup the test dialog */
+ dialog = gtk_dialog_new_with_buttons ("Icon Entry Test", NULL,
+ GTK_DIALOG_NO_SEPARATOR,
+ GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
+ NULL);
+
+ /* setup the vertical box */
+ vbox = gtk_vbox_new (FALSE, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
+ gtk_widget_show (vbox);
+
+ /* setup the label */
+ label = gtk_label_new ("Test case for the icon entry widget:");
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_widget_show (label);
+
+ /* setup the icon entry */
+ entry = frap_icon_entry_new ();
+ frap_icon_entry_set_stock_id (FRAP_ICON_ENTRY (entry), GTK_STOCK_FIND);
+ g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (text_changed), NULL);
+ gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+ gtk_widget_show (entry);
+
+ /* run the dialog */
+ gtk_dialog_run (GTK_DIALOG (dialog));
+
+ /* destroy the dialog */
+ gtk_widget_destroy (dialog);
+
+ return EXIT_SUCCESS;
+}
+
Property changes on: libfrap/trunk/libfrap/icon-entry/testiconentry.c
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Rev
Property changes on: libfrap/trunk/libfrap/menu
___________________________________________________________________
Name: svn:ignore
+ .deps
.libs
Makefile
Makefile.in
.*.swp
Modified: libfrap/trunk/libfrap/menu/Makefile.am
===================================================================
--- libfrap/trunk/libfrap/menu/Makefile.am 2006-08-01 13:26:08 UTC (rev 22608)
+++ libfrap/trunk/libfrap/menu/Makefile.am 2006-08-01 13:27:16 UTC (rev 22609)
@@ -22,4 +22,7 @@
$(GTHREAD_LIBS) \
$(LIBXFCE4UTIL_LIBS)
+EXTRA_DIST = \
+ README
+
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: libfrap/trunk/libfrap/menu/Makefile.am
___________________________________________________________________
Name: svn:keywords
- Id Author Date Revision
+ Author Date Id Rev
Added: libfrap/trunk/libfrap/menu/README
===================================================================
--- libfrap/trunk/libfrap/menu/README (rev 0)
+++ libfrap/trunk/libfrap/menu/README 2006-08-01 13:27:16 UTC (rev 22609)
@@ -0,0 +1,8 @@
+FrapMenu
+========
+
+TODO Add documentation here.
+
+Written by Jannis Pohlmann <jannis at xfce.org>.
+
+$Id$
Property changes on: libfrap/trunk/libfrap/menu/README
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Rev
Property changes on: libfrap/trunk/libfrap/menu/frap-menu-directory.c
___________________________________________________________________
Name: svn:keywords
- Id Author Date Revision
+ Author Date Id Rev
Property changes on: libfrap/trunk/libfrap/menu/frap-menu-directory.h
___________________________________________________________________
Name: svn:keywords
- Id Author Date Revision
+ Author Date Id Rev
Property changes on: libfrap/trunk/libfrap/menu/frap-menu.c
___________________________________________________________________
Name: svn:keywords
- Id Author Date Revision
+ Author Date Id Rev
Property changes on: libfrap/trunk/libfrap/menu/frap-menu.h
___________________________________________________________________
Name: svn:keywords
- Id Author Date Revision
+ Author Date Id Rev
Property changes on: libfrap/trunk/libfrap/menu/libfrapmenu.h
___________________________________________________________________
Name: svn:keywords
- Id Author Date Revision
+ Author Date Id Rev
More information about the Xfce4-commits
mailing list