Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Thu, 25 Apr 2024 20:38:08 UTC
Commit: 8b17184e6a2eecfd598367d9f9783e9abbcd984f
https://github.com/geany/geany-plugins/commit/8b17184e6a2eecfd598367d9f9783…
Log Message:
-----------
webhelper: Update minimal requirements
GTK, GLib, GIO, Gdk-Pixbuf, WebKit, all those are actually minimal
dependencies of the code (although arguably GIO is always at the same
version than GLib, so having something different there is somewhat of a
lie). Geany is merely based on the PLUGIN_VERSION_CHECK(), which might
or might not be appropriate.
Modified Paths:
--------------
build/webhelper.m4
webhelper/README
Modified: build/webhelper.m4
7 lines changed, 3 insertions(+), 4 deletions(-)
===================================================================
@@ -2,12 +2,11 @@ AC_DEFUN([GP_CHECK_WEBHELPER],
[
GP_ARG_DISABLE([WebHelper], [auto])
- GTK_VERSION=2.16
- dnl 2.22 for glib-mkenums' @basename@ template
+ GTK_VERSION=3.0
GLIB_VERSION=2.38
- GIO_VERSION=2.18
+ GIO_VERSION=2.30
GDK_PIXBUF_VERSION=2.0
- WEBKIT_VERSION=1.1.18
+ WEBKIT_VERSION=2.18
AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums], [no])
AC_SUBST([GLIB_MKENUMS])
Modified: webhelper/README
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -26,9 +26,9 @@ Prominent features
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 intend to build it yourself, you will need to get the development
+This plugin requires GTK3, GLib (>= 2.38), GIO (>= 2.30), GdkPixbuf,
+WebKit2GTK (either API 4.0 or 4.1), and obviously Geany (>= 1.25) to work.
+If you intend 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/.
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Tue, 21 Nov 2023 23:34:26 UTC
Commit: fc54c5700fe86ffb13fa254096a163efbc479728
https://github.com/geany/geany-plugins/commit/fc54c5700fe86ffb13fa254096a16…
Log Message:
-----------
webhelper: Show accelerator in context menu
This looks pretty and helps a bit with discovery... although this item
currently has no default binding so the user has to have set one,
meaning they already probably know about it. But it looks nice and
consistent.
Modified Paths:
--------------
webhelper/src/gwh-browser.c
Modified: webhelper/src/gwh-browser.c
22 lines changed, 22 insertions(+), 0 deletions(-)
===================================================================
@@ -225,6 +225,27 @@ on_item_bookmark_toggled (GtkCheckMenuItem *item,
}
}
+static void
+item_show_accelerator (GtkWidget *item,
+ gsize key_id)
+{
+ GeanyKeyBinding *binding = keybindings_get_item (gwh_keybindings_get_group (),
+ key_id);
+
+ if (binding->key) {
+ /* we need an accel group for setting the accelerator, but we can't get
+ * Geany's. It doesn't matter though, as this is only for showing the
+ * accelarator, not actually for tiggering the item. */
+ GtkAccelGroup *dummy_accel_group = gtk_accel_group_new ();
+
+ gtk_widget_add_accelerator (item, "activate", dummy_accel_group,
+ binding->key, binding->mods,
+ GTK_ACCEL_VISIBLE);
+ g_object_set_data_full (G_OBJECT (item), "dummy_accel_group",
+ dummy_accel_group, g_object_unref);
+ }
+}
+
static void
on_url_entry_icon_press (GtkEntry *entry,
GtkEntryIconPosition icon_pos,
@@ -243,6 +264,7 @@ on_url_entry_icon_press (GtkEntry *entry,
G_CALLBACK (on_item_bookmark_toggled), self);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
+ item_show_accelerator (item, GWH_KB_TOGGLE_BOOKMARK);
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
event->button, event->time);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Tue, 21 Nov 2023 21:33:51 UTC
Commit: 81fcbb00c2955bde7a26b1b9e1134f87f050adc6
https://github.com/geany/geany-plugins/commit/81fcbb00c2955bde7a26b1b9e1134…
Log Message:
-----------
webhelper: Improve usage in README
Modified Paths:
--------------
webhelper/README
Modified: webhelper/README
12 lines changed, 12 insertions(+), 0 deletions(-)
===================================================================
@@ -47,6 +47,18 @@ When loaded into Geany, this plugins adds a web view in the message window
(the default), the sidebar or in a separate window. You can find most of the
features from this view.
+The web view displays the URL chosen in the address bar. This can be any valid
+URL that would work in a web browser, for example it could be a local web
+server like ``http://localhost/test/index.php``, a local file like
+``file:///home/user/projects/test/index.html``, or a remote website like
+``https://en.wikipedia.org/wiki/``.
+
+In addition to a rendered preview, the main feature is the inspector. To
+inspect the displayed page, either open the inspector using the toolbar item on
+the far end of the address bar, or right click on any element of the page and
+select *Inspect Element*. For more documentation on the inspector's features,
+see https://webkit.org/web-inspector/.
+
Bookmarks
---------
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Tue, 21 Nov 2023 21:45:02 UTC
Commit: 5dd2304beba69e9a83bd19ce97d0a6f5d207a2c9
https://github.com/geany/geany-plugins/commit/5dd2304beba69e9a83bd19ce97d0a…
Log Message:
-----------
webhelper: Allow building with webkit2gtk-4.1
This is the same as webkit2gtk-4.0 but using libsoup3 instead of
libsoup2, which is irrelevant for WebHelper's usage.
Modified Paths:
--------------
build/webhelper.m4
Modified: build/webhelper.m4
11 lines changed, 10 insertions(+), 1 deletions(-)
===================================================================
@@ -19,13 +19,22 @@ AC_DEFUN([GP_CHECK_WEBHELPER],
fi
fi
+ dnl Support both webkit2gtk 4.0 and 4.1, as the only difference is the
+ dnl libsoup version in the API, which we don't use.
+ dnl Prefer the 4.1 version, but use the 4.0 version as fallback if
+ dnl available -- yet still ask for the 4.1 if neither are available
+ webkit_package=webkit2gtk-4.1
+ PKG_CHECK_EXISTS([${webkit_package} >= ${WEBKIT_VERSION}],,
+ [PKG_CHECK_EXISTS([webkit2gtk-4.0 >= ${WEBKIT_VERSION}],
+ [webkit_package=webkit2gtk-4.0])])
+
GP_CHECK_PLUGIN_GTK3_ONLY([webhelper])
GP_CHECK_PLUGIN_DEPS([WebHelper], [WEBHELPER],
[$GP_GTK_PACKAGE >= ${GTK_VERSION}
glib-2.0 >= ${GLIB_VERSION}
gio-2.0 >= ${GIO_VERSION}
gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION}
- webkit2gtk-4.0 >= ${WEBKIT_VERSION}
+ $webkit_package >= ${WEBKIT_VERSION}
gthread-2.0])
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).