Revision: 1699
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1699&view=rev
Author: colombanw
Date: 2010-11-01 15:18:52 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
WebHelper: Fix config file name and location
Don't use PACKAGE_* since the plugin is now in the geany-plugin
package; and the the name is wrong.
Modified Paths:
--------------
trunk/geany-plugins/webhelper/src/gwh-plugin.c
Modified: trunk/geany-plugins/webhelper/src/gwh-plugin.c
===================================================================
--- trunk/geany-plugins/webhelper/src/gwh-plugin.c 2010-11-01 15:06:12 UTC (rev 1698)
+++ trunk/geany-plugins/webhelper/src/gwh-plugin.c 2010-11-01 15:18:52 UTC (rev 1699)
@@ -31,6 +31,10 @@
#include "gwh-settings.h"
+#define PLUGIN_NAME "Web Helper"
+#define PLUGIN_TARNAME "web-helper"
+
+
GeanyPlugin *geany_plugin;
GeanyData *geany_data;
GeanyFunctions *geany_functions;
@@ -104,7 +108,7 @@
get_config_filename (void)
{
return g_build_filename (geany_data->app->configdir, "plugins",
- PACKAGE_TARNAME, PACKAGE_TARNAME".conf", NULL);
+ PLUGIN_TARNAME, PLUGIN_TARNAME".conf", NULL);
}
static void
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1698
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1698&view=rev
Author: colombanw
Date: 2010-11-01 15:06:12 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
New plugin: WebHelper
This plugin provides web development facilities such as a web preview
and a web inspector.
Builds with Autotools, misses Waf integration for now.
Modified Paths:
--------------
trunk/geany-plugins/Makefile.am
trunk/geany-plugins/configure.ac
Added Paths:
-----------
trunk/geany-plugins/build/webhelper.m4
trunk/geany-plugins/webhelper/
trunk/geany-plugins/webhelper/AUTHORS
trunk/geany-plugins/webhelper/COPYING
trunk/geany-plugins/webhelper/ChangeLog
trunk/geany-plugins/webhelper/Makefile.am
trunk/geany-plugins/webhelper/NEWS
trunk/geany-plugins/webhelper/README
trunk/geany-plugins/webhelper/TODO
trunk/geany-plugins/webhelper/src/
trunk/geany-plugins/webhelper/src/Makefile.am
trunk/geany-plugins/webhelper/src/gwh-browser.c
trunk/geany-plugins/webhelper/src/gwh-browser.h
trunk/geany-plugins/webhelper/src/gwh-enum-types.c.tpl
trunk/geany-plugins/webhelper/src/gwh-enum-types.h.tpl
trunk/geany-plugins/webhelper/src/gwh-plugin.c
trunk/geany-plugins/webhelper/src/gwh-settings.c
trunk/geany-plugins/webhelper/src/gwh-settings.h
trunk/geany-plugins/webhelper/src/gwh-utils.c
trunk/geany-plugins/webhelper/src/gwh-utils.h
Modified: trunk/geany-plugins/Makefile.am
===================================================================
--- trunk/geany-plugins/Makefile.am 2010-11-01 15:05:26 UTC (rev 1697)
+++ trunk/geany-plugins/Makefile.am 2010-11-01 15:06:12 UTC (rev 1698)
@@ -15,7 +15,8 @@
pretty-printer \
shiftcolumn \
spellcheck \
- treebrowser
+ treebrowser \
+ webhelper
ACLOCAL_AMFLAGS = -I build/cache -I build --install
Added: trunk/geany-plugins/build/webhelper.m4
===================================================================
--- trunk/geany-plugins/build/webhelper.m4 (rev 0)
+++ trunk/geany-plugins/build/webhelper.m4 2010-11-01 15:06:12 UTC (rev 1698)
@@ -0,0 +1,70 @@
+AC_DEFUN([GP_CHECK_WEBHELPER],
+[
+ AC_ARG_ENABLE([webhelper],
+ AC_HELP_STRING([--enable-webhelper=ARG],
+ [Enable WebHelper plugin [[default=auto]]]),
+ [],
+ [enable_webhelper=auto])
+
+ GTK_VERSION=2.16
+ GLIB_VERSION=2.16
+ GIO_VERSION=2.18
+ GDK_PIXBUF_VERSION=2.0
+ WEBKIT_VERSION=1.1.18
+
+ webhelper_have_gtk=no
+ webhelper_have_glib=no
+ webhelper_have_gio=no
+ webhelper_have_gdk_pixbuf=no
+ webhelper_have_webkit=no
+ if [[ x"$enable_webhelper" = "xauto" ]]; then
+ PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= ${GTK_VERSION}],
+ [webhelper_have_gtk=yes],
+ [webhelper_have_gtk=no])
+ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= ${GLIB_VERSION}],
+ [webhelper_have_glib=yes],
+ [webhelper_have_glib=no])
+ PKG_CHECK_MODULES([GIO], [gio-2.0 >= ${GIO_VERSION}],
+ [webhelper_have_gio=yes],
+ [webhelper_have_gio=no])
+ PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION}],
+ [webhelper_have_gdk_pixbuf=yes],
+ [webhelper_have_gdk_pixbuf=no])
+ PKG_CHECK_MODULES([WEBKIT], [webkit-1.0 >= ${WEBKIT_VERSION}],
+ [webhelper_have_webkit=yes],
+ [webhelper_have_webkit=no])
+ if [[ $webhelper_have_gtk = yes ]] &&
+ [[ $webhelper_have_glib = yes ]] &&
+ [[ $webhelper_have_gio = yes ]] &&
+ [[ $webhelper_have_gdk_pixbuf = yes ]] &&
+ [[ $webhelper_have_webkit = yes ]]; then
+ enable_webhelper=yes
+ else
+ enable_webhelper=no
+ fi
+ elif [[ x"$enable_webhelper" = "xyes" ]]; then
+ PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= ${GTK_VERSION}])
+ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= ${GLIB_VERSION}])
+ PKG_CHECK_MODULES([GIO], [gio-2.0 >= ${GIO_VERSION}])
+ PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION}])
+ PKG_CHECK_MODULES([WEBKIT], [webkit-1.0 >= ${WEBKIT_VERSION}])
+ fi
+
+ AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums], [no])
+ AC_SUBST([GLIB_MKENUMS])
+ if [[ x"$GLIB_MKENUMS" = "xno" ]]; then
+ if [[ x"$enable_webhelper" = "xyes" ]]; then
+ AC_MSG_ERROR([glib-mkenums not found, are GLib dev tools installed?])
+ else
+ enable_webhelper=no
+ fi
+ fi
+
+ AM_CONDITIONAL(ENABLE_WEBHELPER, test $enable_webhelper = yes)
+ GP_STATUS_PLUGIN_ADD([WebHelper], [$enable_webhelper])
+
+ AC_CONFIG_FILES([
+ webhelper/Makefile
+ webhelper/src/Makefile
+ ])
+])
Modified: trunk/geany-plugins/configure.ac
===================================================================
--- trunk/geany-plugins/configure.ac 2010-11-01 15:05:26 UTC (rev 1697)
+++ trunk/geany-plugins/configure.ac 2010-11-01 15:06:12 UTC (rev 1698)
@@ -39,6 +39,7 @@
GP_CHECK_SHIFTCOLUMN
GP_CHECK_SPELLCHECK
GP_CHECK_TREEBROWSER
+GP_CHECK_WEBHELPER
AC_CONFIG_FILES([
Makefile
Added: trunk/geany-plugins/webhelper/AUTHORS
===================================================================
--- trunk/geany-plugins/webhelper/AUTHORS (rev 0)
+++ trunk/geany-plugins/webhelper/AUTHORS 2010-11-01 15:06:12 UTC (rev 1698)
@@ -0,0 +1 @@
+Colomban Wendling <ban(at)herbesfolles(dot)org>
Added: trunk/geany-plugins/webhelper/COPYING
===================================================================
--- trunk/geany-plugins/webhelper/COPYING (rev 0)
+++ trunk/geany-plugins/webhelper/COPYING 2010-11-01 15:06:12 UTC (rev 1698)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, 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
+them 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 prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU 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
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Added: trunk/geany-plugins/webhelper/ChangeLog
===================================================================
Added: trunk/geany-plugins/webhelper/Makefile.am
===================================================================
--- trunk/geany-plugins/webhelper/Makefile.am (rev 0)
+++ trunk/geany-plugins/webhelper/Makefile.am 2010-11-01 15:06:12 UTC (rev 1698)
@@ -0,0 +1,11 @@
+if ENABLE_WEBHELPER
+include $(top_srcdir)/build/vars.auxfiles.mk
+else
+include $(top_srcdir)/build/vars.docs.mk
+EXTRA_DIST = $(AUXFILES)
+endif
+
+AUXFILES += TODO
+
+SUBDIRS = src
+plugin = webhelper
Added: trunk/geany-plugins/webhelper/NEWS
===================================================================
--- trunk/geany-plugins/webhelper/NEWS (rev 0)
+++ trunk/geany-plugins/webhelper/NEWS 2010-11-01 15:06:12 UTC (rev 1698)
@@ -0,0 +1,3 @@
+Web Helper 0.1
+
+ * Initial release.
Added: trunk/geany-plugins/webhelper/README
===================================================================
--- trunk/geany-plugins/webhelper/README (rev 0)
+++ trunk/geany-plugins/webhelper/README 2010-11-01 15:06:12 UTC (rev 1698)
@@ -0,0 +1,60 @@
+=========
+WebHelper
+=========
+
+.. contents::
+
+
+About
+=====
+
+WebHelper is a plugin for Geany that provides some web development facilities,
+such as a web page preview and some debugging tools (web inspector).
+
+
+Requirements
+============
+
+This plugin requires GTK+ (>= 2.16), GLib (>= 2.16), GIO (>= 2.18),
+GdkPixbuf (>= 2.0), WebKitGTK (>= 1.1.18), and obviously Geany (>= 0.20) to
+work. If you indent to build it yourself, you will need to get the development
+files of these libraries. You can find these packages at http://www.geany.org/,
+http://www.gtk.org/ and http://www.webkitgtk.org/.
+
+
+Installation
+============
+
+For detailed instructions, see the INSTALL file of the Geany-Plugins package
+this plugin is part of.
+
+
+Usage
+=====
+
+When loaded into Geany, this plugins adds a web view in one of the panels --
+bottom (the default) or left. You can find most of the features from this view.
+
+
+License
+=======
+
+WebHelper is distributed under the terms of the GNU General Public License
+as published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version. You should have received a copy
+of the GNU General Public License along with WebHelper. If not, see
+<http://www.gnu.org/licenses/>.
+
+
+Contact
+=======
+
+You can email me at <ban(at)herbesfolles(dot)org>, and I may also be on the
+#geany channel on FreeNode, under the `b4n` nickname.
+
+
+Bug reports and feature requests
+--------------------------------
+
+To report a bug or ask for a new feature, please use the Geany-Plugins tracker
+on SourceForge: http://sourceforge.net/tracker/?group_id=222729
Added: trunk/geany-plugins/webhelper/TODO
===================================================================
--- trunk/geany-plugins/webhelper/TODO (rev 0)
+++ trunk/geany-plugins/webhelper/TODO 2010-11-01 15:06:12 UTC (rev 1698)
@@ -0,0 +1,8 @@
+TODO:
+ * Show setting browser-position to the user
+ * Integrate to Waf build system
+
+FIXME:
+ * Find why docking the inspector window don't work in the plugin.
+ Note that this DOES work when GwhBrowser is used by a test
+ application.
Added: trunk/geany-plugins/webhelper/src/Makefile.am
===================================================================
--- trunk/geany-plugins/webhelper/src/Makefile.am (rev 0)
+++ trunk/geany-plugins/webhelper/src/Makefile.am 2010-11-01 15:06:12 UTC (rev 1698)
@@ -0,0 +1,54 @@
+include $(top_srcdir)/build/vars.build.mk
+plugin = webhelper
+
+if ENABLE_WEBHELPER
+geanyplugins_LTLIBRARIES = webhelper.la
+else
+EXTRA_LTLIBRARIES = webhelper.la
+endif
+
+
+GLIB_MKENUMS = @GLIB_MKENUMS@
+
+
+sources = gwh-browser.c \
+ gwh-plugin.c \
+ gwh-settings.c \
+ gwh-utils.c
+headers = gwh-browser.h \
+ gwh-settings.h \
+ gwh-utils.h
+autogen_sources = gwh-enum-types.c
+autogen_headers = gwh-enum-types.h
+
+CLEANFILES = $(autogen_sources) \
+ $(autogen_headers)
+
+EXTRA_DIST = gwh-enum-types.c.tpl \
+ gwh-enum-types.h.tpl
+
+
+webhelper_la_SOURCES = $(autogen_sources) \
+ $(autogen_headers) \
+ $(sources) \
+ $(headers)
+webhelper_la_CPPFLAGS = $(AM_CPPFLAGS) \
+ -I$(srcdir) -I$(builddir) \
+ -DG_LOG_DOMAIN=\"WebHelper\"
+webhelper_la_CFLAGS = $(AM_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(GDK_PIXBUF_CFLAGS) \
+ $(WEBKIT_CFLAGS)
+webhelper_la_LIBADD = $(COMMONLIBS) \
+ $(GLIB_LIBS) \
+ $(GIO_LIBS) \
+ $(GTK_LIBS) \
+ $(GDK_PIXBUF_LIBS) \
+ $(WEBKIT_LIBS)
+
+gwh-enum-types.c: $(srcdir)/gwh-enum-types.c.tpl gwh-enum-types.h $(headers) Makefile
+ $(AM_V_GEN)$(GLIB_MKENUMS) --template $< $(headers:%=$(srcdir)/%) > $@
+gwh-enum-types.h: $(srcdir)/gwh-enum-types.h.tpl $(headers) Makefile
+ $(AM_V_GEN)$(GLIB_MKENUMS) --template $< $(headers:%=$(srcdir)/%) > $@
Added: trunk/geany-plugins/webhelper/src/gwh-browser.c
===================================================================
--- trunk/geany-plugins/webhelper/src/gwh-browser.c (rev 0)
+++ trunk/geany-plugins/webhelper/src/gwh-browser.c 2010-11-01 15:06:12 UTC (rev 1698)
@@ -0,0 +1,964 @@
+/*
+ *
+ * Copyright (C) 2010 Colomban Wendling <ban(a)herbesfolles.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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "gwh-browser.h"
+
+#include <stdio.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <webkit/webkit.h>
+
+#include "gwh-utils.h"
+#include "gwh-settings.h"
+
+
+#if ! GTK_CHECK_VERSION (2, 18, 0)
+# ifndef gtk_widget_set_visible
+# define gtk_widget_set_visible(w, v) \
+ ((v) ? gtk_widget_show (w) : gtk_widget_hide (w))
+# endif /* defined (gtk_widget_set_visible) */
+# ifndef gtk_widget_get_visible
+# define gtk_widget_get_visible(w) \
+ (GTK_WIDGET_VISIBLE (w))
+# endif /* defined (gtk_widget_get_visible) */
+#endif
+
+
+struct _GwhBrowserPrivate
+{
+ GwhSettings *settings;
+
+ GIcon *default_icon;
+
+ GtkWidget *toolbar;
+ GtkWidget *paned;
+ GtkWidget *web_view;
+ WebKitWebInspector *inspector;
+ GtkWidget *inspector_view; /* the widget that should be shown to
+ * display the inspector, not necessarily
+ * a WebKitWebView */
+ GtkWidget *inspector_window;
+ gint inspector_window_x;
+ gint inspector_window_y;
+ GtkWidget *inspector_web_view;
+
+ GtkWidget *url_entry;
+ GtkToolItem *item_prev;
+ GtkToolItem *item_next;
+ GtkToolItem *item_cancel;
+ GtkToolItem *item_reload;
+ GtkToolItem *item_inspector;
+};
+
+enum {
+ PROP_0,
+ PROP_INSPECTOR_TRANSIENT_FOR,
+ PROP_ORIENTATION,
+ PROP_URI,
+ PROP_WEB_VIEW,
+ PROP_TOOLBAR
+};
+
+enum {
+ POPULATE_POPUP,
+ LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = {0};
+
+
+G_DEFINE_TYPE_WITH_CODE (GwhBrowser, gwh_browser, GTK_TYPE_VBOX,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL))
+
+
+
+static void
+set_location_icon (GwhBrowser *self,
+ const gchar *icon_uri)
+{
+ gboolean success = FALSE;
+
+ if (icon_uri) {
+ GdkPixbuf *icon;
+
+ icon = gwh_pixbuf_new_from_uri (icon_uri, NULL);
+ if (icon) {
+ gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (self->priv->url_entry),
+ GTK_ENTRY_ICON_PRIMARY, icon);
+ g_object_unref (icon);
+ success = TRUE;
+ }
+ }
+ if (! success) {
+ if (G_UNLIKELY (self->priv->default_icon == NULL)) {
+ gchar *ctype;
+
+ ctype = g_content_type_from_mime_type ("text/html");
+ self->priv->default_icon = g_content_type_get_icon (ctype);
+ g_free (ctype);
+ }
+ gtk_entry_set_icon_from_gicon (GTK_ENTRY (self->priv->url_entry),
+ GTK_ENTRY_ICON_PRIMARY,
+ self->priv->default_icon);
+ }
+}
+
+static gchar *
+get_web_inspector_window_geometry (GwhBrowser *self)
+{
+ gint width;
+ gint height;
+ gint x;
+ gint y;
+ GtkWindow *window;
+
+ window = GTK_WINDOW (self->priv->inspector_window);
+ gtk_window_get_size (window, &width, &height);
+ if (gtk_widget_get_visible (GTK_WIDGET (window))) {
+ gtk_window_get_position (window, &x, &y);
+ } else {
+ x = self->priv->inspector_window_x;
+ y = self->priv->inspector_window_y;
+ }
+
+ return g_strdup_printf ("%dx%d%+d%+d", width, height, x, y);
+}
+
+static void
+set_web_inspector_window_geometry (GwhBrowser *self,
+ const gchar *geometry)
+{
+ gint width;
+ gint height;
+ gint x;
+ gint y;
+ gchar dummy;
+ GtkWindow *window;
+
+ g_return_if_fail (geometry != NULL);
+
+ window = GTK_WINDOW (self->priv->inspector_window);
+ gtk_window_get_size (window, &width, &height);
+ gtk_window_get_position (window, &x, &y);
+ switch (sscanf (geometry, "%dx%d%d%d%c", &width, &height, &x, &y, &dummy)) {
+ case 4:
+ case 3:
+ self->priv->inspector_window_x = x;
+ self->priv->inspector_window_y = y;
+ gtk_window_move (window, x, y);
+ /* fallthrough */
+ case 2:
+ case 1:
+ gtk_window_resize (window, width, height);
+ break;
+
+ default:
+ g_warning ("Invalid window geometry \"%s\"", geometry);
+ }
+}
+
+/* settings change notifications */
+
+static void
+on_settings_browser_last_uri_notify (GObject *object,
+ GParamSpec *pspec,
+ GwhBrowser *self)
+{
+ gchar *uri;
+
+ g_object_get (object, pspec->name, &uri, NULL);
+ gwh_browser_set_uri (self, uri);
+ g_free (uri);
+}
+
+static void
+on_settings_browser_orientation_notify (GObject *object,
+ GParamSpec *pspec,
+ GwhBrowser *self)
+{
+ GtkOrientation orientation;
+
+ g_object_get (object, pspec->name, &orientation, NULL);
+ if (orientation != gtk_orientable_get_orientation (GTK_ORIENTABLE (self))) {
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (self), orientation);
+ }
+}
+
+static void
+on_settings_inspector_window_geometry_notify (GObject *object,
+ GParamSpec *pspec,
+ GwhBrowser *self)
+{
+ gchar *geometry;
+
+ g_object_get (object, pspec->name, &geometry, NULL);
+ set_web_inspector_window_geometry (self, geometry);
+ g_free (geometry);
+}
+
+/* web inspector events handling */
+
+#define INSPECTOR_DETACHED(self) \
+ (gtk_bin_get_child (GTK_BIN ((self)->priv->inspector_window)) != NULL)
+
+#define INSPECTOR_VISIBLE(self) \
+ (gtk_widget_get_visible ((self)->priv->inspector_view))
+
+static void
+inspector_hide_window (GwhBrowser *self)
+{
+ if (gtk_widget_get_visible (self->priv->inspector_window)) {
+ gtk_window_get_position (GTK_WINDOW (self->priv->inspector_window),
+ &self->priv->inspector_window_x,
+ &self->priv->inspector_window_y);
+ gtk_widget_hide (self->priv->inspector_window);
+ }
+}
+
+static void
+inspector_show_window (GwhBrowser *self)
+{
+ if (! gtk_widget_get_visible (self->priv->inspector_window)) {
+ gtk_widget_show (self->priv->inspector_window);
+ gtk_window_move (GTK_WINDOW (self->priv->inspector_window),
+ self->priv->inspector_window_x,
+ self->priv->inspector_window_y);
+ }
+}
+
+static WebKitWebView *
+on_inspector_inspect_web_view (WebKitWebInspector *inspector,
+ WebKitWebView *view,
+ GwhBrowser *self)
+{
+ return WEBKIT_WEB_VIEW (self->priv->inspector_web_view);
+}
+
+static gboolean
+on_inspector_show_window (WebKitWebInspector *inspector,
+ GwhBrowser *self)
+{
+ gtk_widget_show (self->priv->inspector_view);
+ if (INSPECTOR_DETACHED (self)) {
+ inspector_show_window (self);
+ }
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (self->priv->item_inspector),
+ TRUE);
+
+ return TRUE;
+}
+
+static gboolean
+on_inspector_close_window (WebKitWebInspector *inspector,
+ GwhBrowser *self)
+{
+ gtk_widget_hide (self->priv->inspector_view);
+ inspector_hide_window (self);
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (self->priv->item_inspector),
+ FALSE);
+
+ return TRUE;
+}
+
+static gboolean
+on_inspector_detach_window (WebKitWebInspector *inspector,
+ GwhBrowser *self)
+{
+ gtk_widget_reparent (self->priv->inspector_view,
+ self->priv->inspector_window);
+ inspector_show_window (self);
+
+ return TRUE;
+}
+
+static gboolean
+on_inspector_attach_window (WebKitWebInspector *inspector,
+ GwhBrowser *self)
+{
+ gtk_widget_reparent (self->priv->inspector_view, self->priv->paned);
+ inspector_hide_window (self);
+
+ return TRUE;
+}
+
+static gboolean
+on_inspector_window_delete_event (GtkWidget *window,
+ GdkEvent *event,
+ GwhBrowser *self)
+{
+ webkit_web_inspector_close (self->priv->inspector);
+
+ return TRUE;
+}
+
+/* web view events hanlding */
+
+static void
+on_item_inspector_toggled (GtkToggleToolButton *button,
+ GwhBrowser *self)
+{
+ if (gtk_toggle_tool_button_get_active (button)) {
+ webkit_web_inspector_show (self->priv->inspector);
+ } else {
+ webkit_web_inspector_close (self->priv->inspector);
+ }
+}
+
+static void
+on_url_entry_activate (GtkEntry *entry,
+ GwhBrowser *self)
+{
+ gwh_browser_set_uri (self, gtk_entry_get_text (entry));
+}
+
+static void
+update_load_status (GwhBrowser *self)
+{
+ gboolean loading = FALSE;
+ WebKitWebView *web_view = WEBKIT_WEB_VIEW (self->priv->web_view);
+
+ switch (webkit_web_view_get_load_status (web_view)) {
+ case WEBKIT_LOAD_PROVISIONAL:
+ case WEBKIT_LOAD_COMMITTED:
+ case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT:
+ loading = TRUE;
+ break;
+
+ case WEBKIT_LOAD_FINISHED:
+ case WEBKIT_LOAD_FAILED:
+ loading = FALSE;
+ break;
+ }
+
+ gtk_widget_set_sensitive (GTK_WIDGET (self->priv->item_reload), ! loading);
+ gtk_widget_set_visible (GTK_WIDGET (self->priv->item_reload), ! loading);
+ gtk_widget_set_sensitive (GTK_WIDGET (self->priv->item_cancel), loading);
+ gtk_widget_set_visible (GTK_WIDGET (self->priv->item_cancel), loading);
+
+ gtk_widget_set_sensitive (GTK_WIDGET (self->priv->item_prev),
+ webkit_web_view_can_go_back (web_view));
+ gtk_widget_set_sensitive (GTK_WIDGET (self->priv->item_next),
+ webkit_web_view_can_go_forward (web_view));
+}
+
+static void
+on_web_view_load_status_notify (GObject *object,
+ GParamSpec *pspec,
+ GwhBrowser *self)
+{
+ update_load_status (self);
+}
+
+static gboolean
+on_web_view_load_error (WebKitWebView *web_view,
+ WebKitWebFrame *web_frame,
+ gchar *uri,
+ gpointer web_error,
+ GwhBrowser *self)
+{
+ update_load_status (self);
+
+ return FALSE; /* we didn't really handled the error, so return %FALSE */
+}
+
+static void
+on_web_view_uri_notify (GObject *object,
+ GParamSpec *pspec,
+ GwhBrowser *self)
+{
+ const gchar *uri;
+
+ uri = webkit_web_view_get_uri (WEBKIT_WEB_VIEW (self->priv->web_view));
+ gtk_entry_set_text (GTK_ENTRY (self->priv->url_entry), uri);
+ g_object_set (self->priv->settings, "browser-last-uri", uri, NULL);
+}
+
+static void
+on_web_view_icon_uri_notify (GObject *object,
+ GParamSpec *pspec,
+ GwhBrowser *self)
+{
+ const gchar *icon_uri;
+
+ icon_uri = webkit_web_view_get_icon_uri (WEBKIT_WEB_VIEW (self->priv->web_view));
+ set_location_icon (self, icon_uri);
+}
+
+static void
+on_web_view_progress_notify (GObject *object,
+ GParamSpec *pspec,
+ GwhBrowser *self)
+{
+ gdouble value;
+
+ value = webkit_web_view_get_progress (WEBKIT_WEB_VIEW (self->priv->web_view));
+ if (value >= 1.0) {
+ value = 0.0;
+ }
+ gtk_entry_set_progress_fraction (GTK_ENTRY (self->priv->url_entry), value);
+}
+
+
+static void
+on_item_flip_orientation_activate (GtkMenuItem *item,
+ GwhBrowser *self)
+{
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (self),
+ gtk_orientable_get_orientation (GTK_ORIENTABLE (self)) == GTK_ORIENTATION_VERTICAL
+ ? GTK_ORIENTATION_HORIZONTAL
+ : GTK_ORIENTATION_VERTICAL);
+}
+
+static void
+on_item_zoom_100_activate (GtkMenuItem *item,
+ GwhBrowser *self)
+{
+ webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW (self->priv->web_view), 1.0);
+}
+
+static void
+on_item_full_content_zoom_activate (GtkCheckMenuItem *item,
+ GwhBrowser *self)
+{
+ webkit_web_view_set_full_content_zoom (WEBKIT_WEB_VIEW (self->priv->web_view),
+ gtk_check_menu_item_get_active (item));
+}
+
+static void
+on_web_view_populate_popup (WebKitWebView *view,
+ GtkMenu *menu,
+ GwhBrowser *self)
+{
+ GtkWidget *item;
+ GtkWidget *submenu;
+
+ #define ADD_SEPARATOR(menu) \
+ item = gtk_separator_menu_item_new (); \
+ gtk_widget_show (item); \
+ gtk_menu_append (menu, item)
+
+ ADD_SEPARATOR (menu);
+
+ /* Zoom menu */
+ submenu = gtk_menu_new ();
+ item = gtk_menu_item_new_with_mnemonic ("_Zoom");
+ gtk_widget_show (item);
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu);
+ gtk_menu_append (menu, item);
+ /* zoom in */
+ item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_IN, NULL);
+ g_signal_connect_swapped (item, "activate",
+ G_CALLBACK (webkit_web_view_zoom_in), view);
+ gtk_menu_append (GTK_MENU (submenu), item);
+ /* zoom out */
+ item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_OUT, NULL);
+ g_signal_connect_swapped (item, "activate",
+ G_CALLBACK (webkit_web_view_zoom_out), view);
+ gtk_menu_append (GTK_MENU (submenu), item);
+ /* zoom 1:1 */
+ ADD_SEPARATOR (submenu);
+ item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_100, NULL);
+ g_signal_connect (item, "activate",
+ G_CALLBACK (on_item_zoom_100_activate), self);
+ gtk_menu_append (GTK_MENU (submenu), item);
+ /* full content zoom */
+ ADD_SEPARATOR (submenu);
+ item = gtk_check_menu_item_new_with_mnemonic ("Full-_content zoom");
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
+ webkit_web_view_get_full_content_zoom (view));
+ g_signal_connect (item, "activate",
+ G_CALLBACK (on_item_full_content_zoom_activate), self);
+ gtk_menu_append (GTK_MENU (submenu), item);
+ /* show zoom sumbenu */
+ gtk_widget_show_all (submenu);
+
+ ADD_SEPARATOR (menu);
+
+ item = gtk_menu_item_new_with_label ("Flip panes orientation");
+ g_signal_connect (item, "activate",
+ G_CALLBACK (on_item_flip_orientation_activate), self);
+ gtk_widget_show (item);
+ gtk_menu_append (menu, item);
+ if (! INSPECTOR_VISIBLE (self) || INSPECTOR_DETACHED (self)) {
+ gtk_widget_set_sensitive (item, FALSE);
+ }
+
+ #undef ADD_SEPARATOR
+
+ g_signal_emit (self, signals[POPULATE_POPUP], 0, menu);
+}
+
+static gboolean
+on_web_view_scroll_event (GtkWidget *widget,
+ GdkEventScroll *event,
+ GwhBrowser *self)
+{
+ guint mods = event->state & gtk_accelerator_get_default_mod_mask ();
+ gboolean handled = FALSE;
+
+ if (mods == GDK_CONTROL_MASK) {
+ handled = TRUE;
+ switch (event->direction) {
+ case GDK_SCROLL_DOWN:
+ webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (self->priv->web_view));
+ break;
+
+ case GDK_SCROLL_UP:
+ webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (self->priv->web_view));
+ break;
+
+ default:
+ handled = FALSE;
+ }
+ }
+
+ return handled;
+}
+
+static void
+on_orientation_notify (GObject *object,
+ GParamSpec *pspec,
+ GwhBrowser *self)
+{
+ g_object_set (G_OBJECT (self->priv->settings), "browser-orientation",
+ gtk_orientable_get_orientation (GTK_ORIENTABLE (self)), NULL);
+}
+
+static void
+gwh_browser_destroy (GtkObject *object)
+{
+ GwhBrowser *self = GWH_BROWSER (object);
+
+ /* save the setting now because we can't really set it at the time it changed,
+ * but it's not a problem, anyway probably nobody but us is interested by the
+ * geometry of our inspector window. */
+ g_object_set (self->priv->settings, "inspector-window-geometry",
+ get_web_inspector_window_geometry (self), NULL);
+
+ /* remove signal handlers that might get called during the destruction phase
+ * but that rely on stuff that might already heave been destroyed */
+ g_signal_handlers_disconnect_matched (self->priv->inspector,
+ G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL,
+ self);
+ g_signal_handlers_disconnect_matched (self->priv->web_view,
+ G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL,
+ self);
+ /* also destroy the window, since it has no parent that will tell it to die */
+ gtk_widget_destroy (self->priv->inspector_window);
+
+ GTK_OBJECT_CLASS (gwh_browser_parent_class)->destroy (object);
+}
+
+static void
+gwh_browser_finalize (GObject *object)
+{
+ GwhBrowser *self = GWH_BROWSER (object);
+
+ if (self->priv->default_icon) {
+ g_object_unref (self->priv->default_icon);
+ }
+ g_object_unref (self->priv->settings);
+
+ G_OBJECT_CLASS (gwh_browser_parent_class)->finalize (object);
+}
+
+static void
+gwh_browser_constructed (GObject *object)
+{
+ GwhBrowser *self = GWH_BROWSER (object);
+
+ if (G_OBJECT_CLASS (gwh_browser_parent_class)->constructed) {
+ G_OBJECT_CLASS (gwh_browser_parent_class)->constructed (object);
+ }
+
+ /* a bit ugly, fake notifications */
+ g_object_notify (G_OBJECT (self->priv->settings), "browser-last-uri");
+ g_object_notify (G_OBJECT (self->priv->settings), "browser-orientation");
+ g_object_notify (G_OBJECT (self->priv->settings), "inspector-window-geometry");
+}
+
+static void
+gwh_browser_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ switch (prop_id) {
+ case PROP_INSPECTOR_TRANSIENT_FOR:
+ g_value_set_object (value,
+ gwh_browser_get_inspector_transient_for (GWH_BROWSER (object)));
+ break;
+
+ case PROP_URI:
+ g_value_set_string (value, gwh_browser_get_uri (GWH_BROWSER (object)));
+ break;
+
+ case PROP_ORIENTATION:
+ g_value_set_enum (value,
+ gtk_orientable_get_orientation (GTK_ORIENTABLE (GWH_BROWSER (object)->priv->paned)));
+ break;
+
+ case PROP_TOOLBAR:
+ g_value_set_object (value, GWH_BROWSER (object)->priv->toolbar);
+ break;
+
+ case PROP_WEB_VIEW:
+ g_value_set_object (value, GWH_BROWSER (object)->priv->web_view);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+}
+
+static void
+gwh_browser_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ switch (prop_id) {
+ case PROP_INSPECTOR_TRANSIENT_FOR:
+ gwh_browser_set_inspector_transient_for (GWH_BROWSER (object),
+ g_value_get_object (value));
+ break;
+
+ case PROP_URI:
+ gwh_browser_set_uri (GWH_BROWSER (object), g_value_get_string (value));
+ break;
+
+ case PROP_ORIENTATION:
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (GWH_BROWSER (object)->priv->paned),
+ g_value_get_enum (value));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+}
+
+static void
+gwh_browser_show_all (GtkWidget *widget)
+{
+ /* don't show_all() on this widget, it would show the cancel or reload
+ * button */
+ gtk_widget_show (widget);
+}
+
+static void
+gwh_browser_class_init (GwhBrowserClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+ object_class->finalize = gwh_browser_finalize;
+ object_class->constructed = gwh_browser_constructed;
+ object_class->get_property = gwh_browser_get_property;
+ object_class->set_property = gwh_browser_set_property;
+
+ gtkobject_class->destroy = gwh_browser_destroy;
+
+ widget_class->show_all = gwh_browser_show_all;
+
+ signals[POPULATE_POPUP] = g_signal_new ("populate-popup",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GwhBrowserClass, populate_popup),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1, GTK_TYPE_MENU);
+
+ g_object_class_override_property (object_class,
+ PROP_ORIENTATION,
+ "orientation");
+
+ g_object_class_install_property (object_class, PROP_INSPECTOR_TRANSIENT_FOR,
+ g_param_spec_object ("inspector-transient-for",
+ "Inspector transient for",
+ "The parent window of the inspector when detached.",
+ GTK_TYPE_WINDOW,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class, PROP_URI,
+ g_param_spec_string ("uri",
+ "URI",
+ "The browser's URI",
+ NULL,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class, PROP_WEB_VIEW,
+ g_param_spec_object ("web-view",
+ "Web view",
+ "The browser's web view",
+ WEBKIT_TYPE_WEB_VIEW,
+ G_PARAM_READABLE));
+ g_object_class_install_property (object_class, PROP_TOOLBAR,
+ g_param_spec_object ("toolbar",
+ "Toolbar",
+ "The browser's toolbar",
+ GTK_TYPE_TOOLBAR,
+ G_PARAM_READABLE));
+
+ g_type_class_add_private (klass, sizeof (GwhBrowserPrivate));
+}
+
+static GtkWidget *
+create_toolbar (GwhBrowser *self)
+{
+ GtkWidget *toolbar;
+ GtkToolItem *item;
+
+ toolbar = g_object_new (GTK_TYPE_TOOLBAR,
+ "icon-size", GTK_ICON_SIZE_MENU,
+ "toolbar-style", GTK_TOOLBAR_ICONS,
+ NULL);
+
+ self->priv->item_prev = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK);
+ gtk_tool_item_set_tooltip_text (self->priv->item_prev, "Back");
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), self->priv->item_prev, -1);
+ gtk_widget_show (GTK_WIDGET (self->priv->item_prev));
+ self->priv->item_next = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
+ gtk_tool_item_set_tooltip_text (self->priv->item_next, "Forward");
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), self->priv->item_next, -1);
+ gtk_widget_show (GTK_WIDGET (self->priv->item_next));
+ self->priv->item_cancel = gtk_tool_button_new_from_stock (GTK_STOCK_CANCEL);
+ gtk_tool_item_set_tooltip_text (self->priv->item_cancel, "Cancel loading");
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), self->priv->item_cancel, -1);
+ /* don't show cancel */
+ self->priv->item_reload = gtk_tool_button_new_from_stock (GTK_STOCK_REFRESH);
+ gtk_tool_item_set_tooltip_text (self->priv->item_reload, "Reload current page");
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), self->priv->item_reload, -1);
+ gtk_widget_show (GTK_WIDGET (self->priv->item_reload));
+
+ self->priv->url_entry = gtk_entry_new ();
+ item = gtk_tool_item_new ();
+ gtk_tool_item_set_is_important (item, TRUE);
+ gtk_container_add (GTK_CONTAINER (item), self->priv->url_entry);
+ gtk_tool_item_set_expand (item, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+ gtk_widget_show_all (GTK_WIDGET (item));
+
+ self->priv->item_inspector = gtk_toggle_tool_button_new_from_stock (GTK_STOCK_INFO);
+ gtk_tool_button_set_label (GTK_TOOL_BUTTON (self->priv->item_inspector), "Web inspector");
+ gtk_tool_item_set_tooltip_text (self->priv->item_inspector, "Toggle web inspector");
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), self->priv->item_inspector, -1);
+ gtk_widget_show (GTK_WIDGET (self->priv->item_inspector));
+
+ gtk_widget_set_sensitive (GTK_WIDGET (self->priv->item_prev), FALSE);
+ gtk_widget_set_sensitive (GTK_WIDGET (self->priv->item_next), FALSE);
+ gtk_widget_set_sensitive (GTK_WIDGET (self->priv->item_cancel), FALSE);
+
+ set_location_icon (self, NULL);
+
+ g_signal_connect_swapped (G_OBJECT (self->priv->item_prev), "clicked",
+ G_CALLBACK (webkit_web_view_go_back),
+ self->priv->web_view);
+ g_signal_connect_swapped (G_OBJECT (self->priv->item_next), "clicked",
+ G_CALLBACK (webkit_web_view_go_forward),
+ self->priv->web_view);
+ g_signal_connect_swapped (G_OBJECT (self->priv->item_cancel), "clicked",
+ G_CALLBACK (webkit_web_view_stop_loading),
+ self->priv->web_view);
+ g_signal_connect_swapped (G_OBJECT (self->priv->item_reload), "clicked",
+ G_CALLBACK (webkit_web_view_reload),
+ self->priv->web_view);
+ g_signal_connect (G_OBJECT (self->priv->item_inspector), "toggled",
+ G_CALLBACK (on_item_inspector_toggled), self);
+ g_signal_connect (G_OBJECT (self->priv->url_entry), "activate",
+ G_CALLBACK (on_url_entry_activate), self);
+
+ return toolbar;
+}
+
+static void
+gwh_browser_init (GwhBrowser *self)
+{
+ GtkWidget *scrolled;
+ WebKitWebSettings *wkws;
+
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GWH_TYPE_BROWSER,
+ GwhBrowserPrivate);
+
+ self->priv->default_icon = NULL;
+ /* web view need to be created first because we use it in create_toolbar() */
+ self->priv->web_view = webkit_web_view_new ();
+ wkws = webkit_web_view_get_settings (WEBKIT_WEB_VIEW (self->priv->web_view));
+ g_object_set (wkws, "enable-developer-extras", TRUE, NULL);
+
+ self->priv->settings = gwh_settings_get_default ();
+
+ self->priv->toolbar = create_toolbar (self);
+ self->priv->paned = gtk_vpaned_new ();
+ scrolled = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_container_add (GTK_CONTAINER (scrolled), self->priv->web_view);
+
+ gtk_box_pack_start (GTK_BOX (self), self->priv->toolbar, FALSE, TRUE, 0);
+ gtk_widget_show (self->priv->toolbar);
+ gtk_box_pack_start (GTK_BOX (self), self->priv->paned, TRUE, TRUE, 0);
+ gtk_paned_pack1 (GTK_PANED (self->priv->paned), scrolled, TRUE, TRUE);
+ gtk_widget_show_all (self->priv->paned);
+
+ self->priv->inspector_view = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self->priv->inspector_view),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ self->priv->inspector_web_view = webkit_web_view_new ();
+ gtk_widget_show (self->priv->inspector_web_view);
+ gtk_container_add (GTK_CONTAINER (self->priv->inspector_view),
+ self->priv->inspector_web_view);
+
+ self->priv->inspector_window_x = self->priv->inspector_window_y = 0;
+ self->priv->inspector_window = g_object_new (GTK_TYPE_WINDOW,
+ "type", GTK_WINDOW_TOPLEVEL,
+ "skip-taskbar-hint", TRUE,
+ "title", "Web inspector",
+ NULL);
+ g_signal_connect (self->priv->inspector_window, "delete-event",
+ G_CALLBACK (on_inspector_window_delete_event), self);
+ gtk_container_add (GTK_CONTAINER (self->priv->inspector_window),
+ self->priv->inspector_view);
+
+ g_signal_connect (self, "notify::orientation",
+ G_CALLBACK (on_orientation_notify), self);
+
+ self->priv->inspector = webkit_web_view_get_inspector (WEBKIT_WEB_VIEW (self->priv->web_view));
+ g_signal_connect (self->priv->inspector, "inspect-web-view",
+ G_CALLBACK (on_inspector_inspect_web_view), self);
+ g_signal_connect (self->priv->inspector, "show-window",
+ G_CALLBACK (on_inspector_show_window), self);
+ g_signal_connect (self->priv->inspector, "close-window",
+ G_CALLBACK (on_inspector_close_window), self);
+ g_signal_connect (self->priv->inspector, "detach-window",
+ G_CALLBACK (on_inspector_detach_window), self);
+ g_signal_connect (self->priv->inspector, "attach-window",
+ G_CALLBACK (on_inspector_attach_window), self);
+
+ g_signal_connect (G_OBJECT (self->priv->web_view), "notify::load-status",
+ G_CALLBACK (on_web_view_load_status_notify), self);
+ g_signal_connect (G_OBJECT (self->priv->web_view), "notify::progress",
+ G_CALLBACK (on_web_view_progress_notify), self);
+ g_signal_connect (G_OBJECT (self->priv->web_view), "notify::uri",
+ G_CALLBACK (on_web_view_uri_notify), self);
+ g_signal_connect (G_OBJECT (self->priv->web_view), "notify::load-status",
+ G_CALLBACK (on_web_view_load_status_notify), self);
+ g_signal_connect (G_OBJECT (self->priv->web_view), "notify::load-error",
+ G_CALLBACK (on_web_view_load_error), self);
+ g_signal_connect (G_OBJECT (self->priv->web_view), "notify::icon-uri",
+ G_CALLBACK (on_web_view_icon_uri_notify), self);
+ g_signal_connect (G_OBJECT (self->priv->web_view), "populate-popup",
+ G_CALLBACK (on_web_view_populate_popup), self);
+ g_signal_connect (G_OBJECT (self->priv->web_view), "scroll-event",
+ G_CALLBACK (on_web_view_scroll_event), self);
+
+ gtk_widget_grab_focus (self->priv->url_entry);
+
+ g_signal_connect (self->priv->settings, "notify::browser-last-uri",
+ G_CALLBACK (on_settings_browser_last_uri_notify), self);
+ g_signal_connect (self->priv->settings, "notify::browser-orientation",
+ G_CALLBACK (on_settings_browser_orientation_notify), self);
+ g_signal_connect (self->priv->settings, "notify::inspector-window-geometry",
+ G_CALLBACK (on_settings_inspector_window_geometry_notify), self);
+}
+
+
+/*----------------------------- Begin public API -----------------------------*/
+
+GtkWidget *
+gwh_browser_new (void)
+{
+ return g_object_new (GWH_TYPE_BROWSER, NULL);
+}
+
+void
+gwh_browser_set_uri (GwhBrowser *self,
+ const gchar *uri)
+{
+ gchar *real_uri;
+ gchar *scheme;
+
+ g_return_if_fail (GWH_IS_BROWSER (self));
+ g_return_if_fail (uri != NULL);
+
+ real_uri = g_strdup (uri);
+ scheme = g_uri_parse_scheme (real_uri);
+ if (! scheme) {
+ gchar *tmp;
+
+ tmp = g_strconcat ("http://", uri, NULL);
+ g_free (real_uri);
+ real_uri = tmp;
+ }
+ g_free (scheme);
+ if (g_strcmp0 (real_uri, gwh_browser_get_uri (self)) != 0) {
+ webkit_web_view_open (WEBKIT_WEB_VIEW (self->priv->web_view), real_uri);
+ g_object_notify (G_OBJECT (self), "uri");
+ }
+ g_free (real_uri);
+}
+
+const gchar *
+gwh_browser_get_uri (GwhBrowser *self)
+{
+ g_return_val_if_fail (GWH_IS_BROWSER (self), NULL);
+
+ return webkit_web_view_get_uri (WEBKIT_WEB_VIEW (self->priv->web_view));
+}
+
+GtkToolbar *
+gwh_browser_get_toolbar (GwhBrowser *self)
+{
+ g_return_val_if_fail (GWH_IS_BROWSER (self), NULL);
+
+ return GTK_TOOLBAR (self->priv->toolbar);
+}
+
+WebKitWebView *
+gwh_browser_get_web_view (GwhBrowser *self)
+{
+ g_return_val_if_fail (GWH_IS_BROWSER (self), NULL);
+
+ return WEBKIT_WEB_VIEW (self->priv->web_view);
+}
+
+void
+gwh_browser_reload (GwhBrowser *self)
+{
+ g_return_if_fail (GWH_IS_BROWSER (self));
+
+ webkit_web_view_reload (WEBKIT_WEB_VIEW (self->priv->web_view));
+}
+
+void
+gwh_browser_set_inspector_transient_for (GwhBrowser *self,
+ GtkWindow *window)
+{
+ g_return_if_fail (GWH_IS_BROWSER (self));
+ g_return_if_fail (window == NULL || GTK_IS_WINDOW (window));
+
+ gtk_window_set_transient_for (GTK_WINDOW (self->priv->inspector_window),
+ window);
+}
+
+GtkWindow *
+gwh_browser_get_inspector_transient_for (GwhBrowser *self)
+{
+ g_return_val_if_fail (GWH_IS_BROWSER (self), NULL);
+
+ return gtk_window_get_transient_for (GTK_WINDOW (self->priv->inspector_window));
+}
Added: trunk/geany-plugins/webhelper/src/gwh-browser.h
===================================================================
--- trunk/geany-plugins/webhelper/src/gwh-browser.h (rev 0)
+++ trunk/geany-plugins/webhelper/src/gwh-browser.h 2010-11-01 15:06:12 UTC (rev 1698)
@@ -0,0 +1,87 @@
+/*
+ *
+ * Copyright (C) 2010 Colomban Wendling <ban(a)herbesfolles.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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef H_GWH_BROWSER
+#define H_GWH_BROWSER
+
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <webkit/webkit.h>
+
+G_BEGIN_DECLS
+
+
+#define GWH_TYPE_BROWSER (gwh_browser_get_type ())
+#define GWH_BROWSER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GWH_TYPE_BROWSER, GwhBrowser))
+#define GWH_BROWSER_CLASS(ko) (G_TYPE_CHECK_CLASS_CAST ((k), GWH_TYPE_BROWSER, GwhBrowserClass))
+#define GWH_IS_BROWSER(b) (G_TYPE_CHECK_INSTANCE_TYPE ((b), GWH_TYPE_BROWSER))
+#define GWH_IS_BROWSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GWH_TYPE_BROWSER))
+
+
+typedef enum {
+ GWH_BROWSER_POSITION_BOTTOM,
+ GWH_BROWSER_POSITION_LEFT
+} GwhBrowserPosition;
+
+
+typedef struct _GwhBrowser GwhBrowser;
+typedef struct _GwhBrowserClass GwhBrowserClass;
+typedef struct _GwhBrowserPrivate GwhBrowserPrivate;
+
+struct _GwhBrowser
+{
+ GtkVBox parent;
+
+ GwhBrowserPrivate *priv;
+};
+
+struct _GwhBrowserClass
+{
+ GtkVBoxClass parent_class;
+
+ void (*populate_popup) (GwhBrowser *browser,
+ GtkMenu *menu);
+};
+
+
+G_GNUC_INTERNAL
+GType gwh_browser_get_type (void) G_GNUC_CONST;
+G_GNUC_INTERNAL
+GtkWidget *gwh_browser_new (void);
+G_GNUC_INTERNAL
+void gwh_browser_set_uri (GwhBrowser *self,
+ const gchar *uri);
+G_GNUC_INTERNAL
+const gchar *gwh_browser_get_uri (GwhBrowser *self);
+G_GNUC_INTERNAL
+GtkToolbar *gwh_browser_get_toolbar (GwhBrowser *self);
+G_GNUC_INTERNAL
+WebKitWebView *gwh_browser_get_web_view (GwhBrowser *self);
+G_GNUC_INTERNAL
+void gwh_browser_reload (GwhBrowser *self);
+G_GNUC_INTERNAL
+void gwh_browser_set_inspector_transient_for (GwhBrowser *self,
+ GtkWindow *window);
+G_GNUC_INTERNAL
+GtkWindow *gwh_browser_get_inspector_transient_for (GwhBrowser *self);
+
+
+G_END_DECLS
+
+#endif /* guard */
Added: trunk/geany-plugins/webhelper/src/gwh-enum-types.c.tpl
===================================================================
--- trunk/geany-plugins/webhelper/src/gwh-enum-types.c.tpl (rev 0)
+++ trunk/geany-plugins/webhelper/src/gwh-enum-types.c.tpl 2010-11-01 15:06:12 UTC (rev 1698)
@@ -0,0 +1,34 @@
+/*** BEGIN file-header ***/
+#include "gwh-enum-types.h"
+
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@filename@" */
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType
+@enum_name@_get_type (void)
+{
+ static GType etype = 0;
+ if (G_UNLIKELY(etype == 0)) {
+ static const G@Type@Value values[] = {
+/*** END value-header ***/
+
+/*** BEGIN value-production ***/
+ { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
+/*** END value-production ***/
+
+/*** BEGIN value-tail ***/
+ { 0, NULL, NULL }
+ };
+ etype = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
+ }
+ return etype;
+}
+
+/*** END value-tail ***/
+
+/*** BEGIN file-tail ***/
+/*** END file-tail ***/
Added: trunk/geany-plugins/webhelper/src/gwh-enum-types.h.tpl
===================================================================
--- trunk/geany-plugins/webhelper/src/gwh-enum-types.h.tpl (rev 0)
+++ trunk/geany-plugins/webhelper/src/gwh-enum-types.h.tpl 2010-11-01 15:06:12 UTC (rev 1698)
@@ -0,0 +1,30 @@
+/*** BEGIN file-header ***/
+#ifndef H_GWH_ENUM_TYPES
+#define H_GWH_ENUM_TYPES
+
+#include <glib-object.h>
+
+/* include all headers that may introduce new enums */
+#include "gwh-browser.h"
+#include "gwh-settings.h"
+#include "gwh-utils.h"
+
+G_BEGIN_DECLS
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+
+/* enumerations from "@filename@" */
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+G_GNUC_INTERNAL
+GType @enum_name@_get_type (void) G_GNUC_CONST;
+#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
+/*** END value-header ***/
+
+/*** BEGIN file-tail ***/
+G_END_DECLS
+
+#endif /* guard */
+/*** END file-tail ***/
Added: trunk/geany-plugins/webhelper/src/gwh-plugin.c
===================================================================
--- trunk/geany-plugins/webhelper/src/gwh-plugin.c (rev 0)
+++ trunk/geany-plugins/webhelper/src/gwh-plugin.c 2010-11-01 15:06:12 UTC (rev 1698)
@@ -0,0 +1,203 @@
+/*
+ *
+ * Copyright (C) 2010 Colomban Wendling <ban(a)herbesfolles.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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include <geanyplugin.h>
+#include <geany.h>
+#include <document.h>
+
+#include "config.h"
+#include "gwh-browser.h"
+#include "gwh-settings.h"
+
+
+GeanyPlugin *geany_plugin;
+GeanyData *geany_data;
+GeanyFunctions *geany_functions;
+
+
+PLUGIN_VERSION_CHECK(195)
+
+PLUGIN_SET_TRANSLATABLE_INFO (
+ LOCALEDIR, GETTEXT_PACKAGE,
+ _("Web helper"),
+ _("Display a preview web page that gets updated upon document saving and "
+ "provide web analysis and debugging tools (aka Web Inspector), all using "
+ "WebKit."),
+ "0.1",
+ "Colomban Wendling <ban(a)herbesfolles.org>"
+)
+
+
+static GtkWidget *G_browser = NULL;
+static gint G_page_num = 0;
+static GtkWidget *G_notebook = NULL;
+static GwhSettings *G_settings = NULL;
+
+
+static void
+on_document_save (GObject *obj,
+ GeanyDocument *doc,
+ gpointer user_data)
+{
+ gboolean auto_reload = FALSE;
+
+ g_object_get (G_OBJECT (G_settings), "browser-auto-reload", &auto_reload,
+ NULL);
+ if (auto_reload) {
+ gwh_browser_reload (GWH_BROWSER (G_browser));
+ }
+}
+
+static void
+on_item_auto_reload_toggled (GtkCheckMenuItem *item,
+ gpointer dummy)
+{
+ g_object_set (G_OBJECT (G_settings), "browser-auto-reload",
+ gtk_check_menu_item_get_active (item), NULL);
+}
+
+static void
+on_browser_populate_popup (GwhBrowser *browser,
+ GtkMenu *menu,
+ gpointer dummy)
+{
+ GtkWidget *item;
+ gboolean auto_reload = FALSE;
+
+ item = gtk_separator_menu_item_new ();
+ gtk_widget_show (item);
+ gtk_menu_append (menu, item);
+
+ g_object_get (G_OBJECT (G_settings), "browser-auto-reload", &auto_reload,
+ NULL);
+ item = gtk_check_menu_item_new_with_mnemonic ("Reload upon document saving");
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), auto_reload);
+ gtk_widget_show (item);
+ gtk_menu_append (menu, item);
+ g_signal_connect (item, "toggled", G_CALLBACK (on_item_auto_reload_toggled),
+ NULL);
+}
+
+
+static gchar *
+get_config_filename (void)
+{
+ return g_build_filename (geany_data->app->configdir, "plugins",
+ PACKAGE_TARNAME, PACKAGE_TARNAME".conf", NULL);
+}
+
+static void
+load_config (void)
+{
+ gchar *path;
+ GError *err = NULL;
+
+ G_settings = gwh_settings_get_default ();
+ path = get_config_filename ();
+ if (! gwh_settings_load_from_file (G_settings, path, &err)) {
+ g_warning ("Failed to load configuration: %s", err->message);
+ g_error_free (err);
+ }
+ g_free (path);
+}
+
+static void
+save_config (void)
+{
+ gchar *path;
+ gchar *dirname;
+ GError *err = NULL;
+
+ path = get_config_filename ();
+ dirname = g_path_get_dirname (path);
+ utils_mkdir (dirname, FALSE);
+ g_free (dirname);
+ if (! gwh_settings_save_to_file (G_settings, path, &err)) {
+ g_warning ("Failed to save configuration: %s", err->message);
+ g_error_free (err);
+ }
+ g_object_unref (G_settings);
+ G_settings = NULL;
+}
+
+void
+plugin_init (GeanyData *data)
+{
+ gint position;
+
+ /* even though it's not really a good idea to keep all the library we load
+ * into memory, this is needed for webkit. first, without this we creash after
+ * module unloading, and webkitgtk inserts static data into the GLib
+ * (g_quark_from_static_string() for example) so it's not safe to remove it */
+ plugin_module_make_resident (geany_plugin);
+
+ load_config ();
+
+ G_browser = gwh_browser_new ();
+ gwh_browser_set_inspector_transient_for (GWH_BROWSER (G_browser),
+ GTK_WINDOW (data->main_widgets->window));
+ g_signal_connect (G_browser, "populate-popup",
+ G_CALLBACK (on_browser_populate_popup), NULL);
+
+ g_object_get (G_OBJECT (G_settings), "browser-position", &position, NULL);
+ if (position == GWH_BROWSER_POSITION_LEFT) {
+ G_notebook = data->main_widgets->sidebar_notebook;
+ } else {
+ G_notebook = data->main_widgets->message_window_notebook;
+ }
+ G_page_num = gtk_notebook_append_page (GTK_NOTEBOOK (G_notebook), G_browser,
+ gtk_label_new (_("Web preview")));
+
+ gtk_widget_show_all (G_browser);
+
+ plugin_signal_connect (geany_plugin, NULL, "document-save", TRUE,
+ G_CALLBACK (on_document_save), NULL);
+}
+
+void
+plugin_cleanup (void)
+{
+ /* remove the page we added. we handle the case where the page were
+ * reordered */
+ if (gtk_notebook_get_nth_page (GTK_NOTEBOOK (G_notebook),
+ G_page_num) != G_browser) {
+ gint i;
+ gint n;
+
+ G_page_num = -1;
+ n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (G_notebook));
+ for (i = 0; i < n; i++) {
+ if (gtk_notebook_get_nth_page (GTK_NOTEBOOK (G_notebook),
+ i) == G_browser) {
+ G_page_num = i;
+ break;
+ }
+ }
+ }
+ if (G_page_num >= 0) {
+ gtk_notebook_remove_page (GTK_NOTEBOOK (G_notebook), G_page_num);
+ }
+
+ save_config ();
+}
Added: trunk/geany-plugins/webhelper/src/gwh-settings.c
===================================================================
--- trunk/geany-plugins/webhelper/src/gwh-settings.c (rev 0)
+++ trunk/geany-plugins/webhelper/src/gwh-settings.c 2010-11-01 15:06:12 UTC (rev 1698)
@@ -0,0 +1,454 @@
+/*
+ *
+ * Copyright (C) 2010 Colomban Wendling <ban(a)herbesfolles.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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "gwh-settings.h"
+
+#include <string.h>
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h> /* for GtkOrientation */
+
+#include "gwh-enum-types.h" /* for GwhUiBrowserPosition */
+
+
+/* sets @ptr to @value, freeing @ptr before.
+ * note that:
+ * * ptr can be used to compute @value, assignation is done after comuptation
+ * * ptr is used twice, so it must be side-effects-free */
+#define setptr(ptr, value) \
+ G_STMT_START { \
+ gpointer new_ptr = (value); \
+ g_free (ptr); \
+ ptr = new_ptr; \
+ } G_STMT_END
+
+
+struct _GwhSettingsPrivate
+{
+ gboolean browser_auto_reload;
+ gchar *browser_last_uri;
+ GtkOrientation browser_orientation;
+ GwhBrowserPosition browser_position;
+ gchar *inspector_window_geometry;
+};
+
+enum
+{
+ PROP_0,
+ PROP_BROWSER_AUTO_RELOAD,
+ PROP_BROWSER_LAST_URI,
+ PROP_BROWSER_ORIENTATION,
+ PROP_BROWSER_POSITION,
+ PROP_INSPECTOR_WINDOW_GEOMETRY
+};
+
+
+G_DEFINE_TYPE (GwhSettings, gwh_settings, G_TYPE_OBJECT)
+
+
+static void
+gwh_settings_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GwhSettings *self = GWH_SETTINGS (object);
+
+ switch (prop_id) {
+ case PROP_BROWSER_AUTO_RELOAD:
+ g_value_set_boolean (value, self->priv->browser_auto_reload);
+ break;
+ case PROP_BROWSER_LAST_URI:
+ g_value_set_string (value, self->priv->browser_last_uri);
+ break;
+ case PROP_BROWSER_ORIENTATION:
+ g_value_set_enum (value, self->priv->browser_orientation);
+ break;
+ case PROP_BROWSER_POSITION:
+ g_value_set_enum (value, self->priv->browser_position);
+ break;
+ case PROP_INSPECTOR_WINDOW_GEOMETRY:
+ g_value_set_string (value, self->priv->inspector_window_geometry);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+}
+
+static void
+gwh_settings_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GwhSettings *self = GWH_SETTINGS (object);
+
+ switch (prop_id) {
+ case PROP_BROWSER_AUTO_RELOAD:
+ self->priv->browser_auto_reload = g_value_get_boolean (value);
+ break;
+ case PROP_BROWSER_LAST_URI:
+ setptr (self->priv->browser_last_uri, g_value_dup_string (value));
+ break;
+ case PROP_BROWSER_ORIENTATION:
+ self->priv->browser_orientation = g_value_get_enum (value);
+ break;
+ case PROP_BROWSER_POSITION:
+ self->priv->browser_position = g_value_get_enum (value);
+ break;
+ case PROP_INSPECTOR_WINDOW_GEOMETRY:
+ setptr (self->priv->inspector_window_geometry, g_value_dup_string (value));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+}
+
+static GObject *
+gwh_settings_constructor (GType gtype,
+ guint n_properties,
+ GObjectConstructParam *properties)
+{
+ static GObject *obj = NULL;
+
+ if (G_UNLIKELY (! obj)) {
+ obj = G_OBJECT_CLASS (gwh_settings_parent_class)->constructor (gtype,
+ n_properties,
+ properties);
+ }
+
+ /* reffing the object unconditionally will leak one ref (the first one), but
+ * since we don't want the object to ever die, this is needed. the other
+ * solution would be to force users to keep their reference all along, but
+ * then if one drop its reference before somebody else get her one, the
+ * settings would be implicitly "reset" to their default values */
+ return g_object_ref (obj);
+}
+
+static void
+gwh_settings_finalize (GObject *object)
+{
+ GwhSettings *self = GWH_SETTINGS (object);
+
+ self->priv->browser_auto_reload = FALSE;
+ setptr (self->priv->browser_last_uri, NULL);
+ self->priv->browser_orientation = 0;
+ self->priv->browser_position = 0;
+ setptr (self->priv->inspector_window_geometry, NULL);
+
+ G_OBJECT_CLASS (gwh_settings_parent_class)->finalize (object);
+}
+
+static void
+gwh_settings_class_init (GwhSettingsClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->constructor = gwh_settings_constructor;
+ object_class->finalize = gwh_settings_finalize;
+ object_class->get_property = gwh_settings_get_property;
+ object_class->set_property = gwh_settings_set_property;
+
+ g_object_class_install_property (object_class, PROP_BROWSER_AUTO_RELOAD,
+ g_param_spec_boolean ("browser-auto-reload",
+ "Browser auto reload",
+ "Whether the browser reloads itself upon document saving",
+ TRUE,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class, PROP_BROWSER_LAST_URI,
+ g_param_spec_string ("browser-last-uri",
+ "Browser last URI",
+ "Last URI visited with the browser",
+ "about:blank",
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class, PROP_BROWSER_ORIENTATION,
+ g_param_spec_enum ("browser-orientation",
+ "Browser orientation",
+ "Orientation of the browser widget",
+ GTK_TYPE_ORIENTATION,
+ GTK_ORIENTATION_VERTICAL,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class, PROP_BROWSER_POSITION,
+ g_param_spec_enum ("browser-position",
+ "browser position",
+ "Position of the browser widget in the Geany's UI",
+ GWH_TYPE_BROWSER_POSITION,
+ GWH_BROWSER_POSITION_BOTTOM,
+ G_PARAM_READWRITE));
+ g_object_class_install_property (object_class, PROP_INSPECTOR_WINDOW_GEOMETRY,
+ g_param_spec_string ("inspector-window-geometry",
+ "Inspector window geometry",
+ "Last geometry of the inspector window",
+ "400x300",
+ G_PARAM_READWRITE));
+
+ g_type_class_add_private (klass, sizeof (GwhSettingsPrivate));
+}
+
+static void
+gwh_settings_init (GwhSettings *self)
+{
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GWH_TYPE_SETTINGS,
+ GwhSettingsPrivate);
+ self->priv->browser_auto_reload = TRUE;
+ self->priv->browser_last_uri = g_strdup ("about:blank");
+ self->priv->browser_orientation = GTK_ORIENTATION_VERTICAL;
+ self->priv->browser_position = GWH_BROWSER_POSITION_BOTTOM;
+ self->priv->inspector_window_geometry = g_strdup ("400x300");
+}
+
+
+/*----------------------------- Begin public API -----------------------------*/
+
+GwhSettings *
+gwh_settings_get_default (void)
+{
+ return g_object_new (GWH_TYPE_SETTINGS, NULL);
+}
+
+static void
+get_key_and_group_from_property_name (const gchar *name,
+ gchar **group,
+ gchar **key)
+{
+ const gchar *sep;
+
+ sep = strchr (name, '-');
+ if (sep && sep[1] != 0) {
+ *group = g_strndup (name, (gsize)(sep - name));
+ *key = g_strdup (&sep[1]);
+ } else {
+ *group = g_strdup ("general");
+ *key = g_strdup (name);
+ }
+}
+
+static gboolean
+key_file_set_value (GKeyFile *kf,
+ const gchar *name,
+ const GValue *value,
+ GError **error)
+{
+ gboolean success = TRUE;
+ gchar *group;
+ gchar *key;
+
+ get_key_and_group_from_property_name (name, &group, &key);
+ switch (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (value))) {
+ case G_TYPE_BOOLEAN:
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1697
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1697&view=rev
Author: colombanw
Date: 2010-11-01 15:05:26 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
GeanyGenDoc: Add TODO-list entry
Modified Paths:
--------------
trunk/geany-plugins/geanygendoc/TODO
Modified: trunk/geany-plugins/geanygendoc/TODO
===================================================================
--- trunk/geany-plugins/geanygendoc/TODO 2010-10-31 10:08:49 UTC (rev 1696)
+++ trunk/geany-plugins/geanygendoc/TODO 2010-11-01 15:05:26 UTC (rev 1697)
@@ -17,3 +17,12 @@
* Add a pop-up menu to the document type selector for common actions (edit,
clear, etc.).
+
+* When user choose "edit current language configuration", don't copy the system
+ configuration if the user don't have one, but simply open the system one with
+ the correct path for it to be saved on the user's configurations directory
+ when actually saved.
+ This would implement "copy on write" style copying, which would avoid landing
+ user configuration files just because they opened it once (e.g. by mistake).
+ This is a real problem since we use user's config first, so they won't get
+ the possible updates of the default distribution in such cases.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.