debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Enable Zoom and Fullscreen with hardware keys on Hildon

Browse source
This commit is contained in:
Christian Dywan 2009-11-29 15:09:00 +01:00
parent d9eb5dcec9
commit 2973df0f9b
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
midori/midori-browser.c
View file

@ -46,6 +46,8 @@
"sender='" MCE_SERVICE "'," \ "sender='" MCE_SERVICE "'," \
"path='" MCE_SIGNAL_PATH "'," \ "path='" MCE_SIGNAL_PATH "'," \
"interface='" MCE_SIGNAL_IF "'" "interface='" MCE_SIGNAL_IF "'"
#include <gdk/gdkx.h>
#include <X11/Xatom.h>
#endif #endif
struct _MidoriBrowser struct _MidoriBrowser
@ -4923,10 +4925,18 @@ static const GtkActionEntry entries[] = {
NULL, "<Ctrl>r", NULL, "<Ctrl>r",
N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) }, N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
{ "ZoomIn", GTK_STOCK_ZOOM_IN, { "ZoomIn", GTK_STOCK_ZOOM_IN,
#if HAVE_HILDON
NULL, "F7",
#else
NULL, "<Ctrl>plus", NULL, "<Ctrl>plus",
#endif
N_("Increase the zoom level"), G_CALLBACK (_action_zoom_in_activate) }, N_("Increase the zoom level"), G_CALLBACK (_action_zoom_in_activate) },
{ "ZoomOut", GTK_STOCK_ZOOM_OUT, { "ZoomOut", GTK_STOCK_ZOOM_OUT,
#if HAVE_HILDON
NULL, "F8",
#else
NULL, "<Ctrl>minus", NULL, "<Ctrl>minus",
#endif
N_("Decrease the zoom level"), G_CALLBACK (_action_zoom_out_activate) }, N_("Decrease the zoom level"), G_CALLBACK (_action_zoom_out_activate) },
{ "ZoomNormal", GTK_STOCK_ZOOM_100, { "ZoomNormal", GTK_STOCK_ZOOM_100,
NULL, "<Ctrl>0", NULL, "<Ctrl>0",
@ -4940,7 +4950,11 @@ static const GtkActionEntry entries[] = {
N_("View the source code of the selection"), N_("View the source code of the selection"),
NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ }, NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ },
{ "Fullscreen", GTK_STOCK_FULLSCREEN, { "Fullscreen", GTK_STOCK_FULLSCREEN,
#if HAVE_HILDON
NULL, "F6",
#else
NULL, "F11", NULL, "F11",
#endif
N_("Toggle fullscreen view"), G_CALLBACK (_action_fullscreen_activate) }, N_("Toggle fullscreen view"), G_CALLBACK (_action_fullscreen_activate) },
{ "Go", NULL, N_("_Go") }, { "Go", NULL, N_("_Go") },
@ -5281,6 +5295,15 @@ midori_browser_realize_cb (GtkStyle* style,
{ {
GdkScreen* screen; GdkScreen* screen;
GtkIconTheme* icon_theme; GtkIconTheme* icon_theme;
#ifdef HAVE_HILDON_2_2
/* hildon_gtk_window_enable_zoom_keys */
guint32 set = 1;
gdk_property_change (GTK_WIDGET (browser)->window,
gdk_atom_intern ("_HILDON_ZOOM_KEY_ATOM", FALSE),
gdk_x11_xatom_to_atom (XA_INTEGER),
32, GDK_PROP_MODE_REPLACE,
(const guchar *) &set, 1);
#endif
screen = gtk_widget_get_screen (GTK_WIDGET (browser)); screen = gtk_widget_get_screen (GTK_WIDGET (browser));
if (screen) if (screen)