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

Remove Hildon specific icon and shortcut values

Browse source
This commit is contained in:
Christian Dywan 2009-11-29 23:38:40 +01:00
parent 03efa65da1
commit baaca9a061
2 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icons/wscript_build
View file

@ -15,11 +15,7 @@ def add_image (bld, category, name):
if rsvg_convert: if rsvg_convert:
Utils.check_dir (blddir + '/icons') Utils.check_dir (blddir + '/icons')
if bld.env['HAVE_HILDON']: icon_sizes = [16, 22, 24, 32, 48]
category = 'hildon'
icon_sizes = [48, 64]
else:
icon_sizes = [16, 22, 24, 32, 48]
for size in icon_sizes: for size in icon_sizes:
format = str (size) + 'x' + str (size) format = str (size) + 'x' + str (size)

12
midori/midori-browser.c
View file

@ -4925,18 +4925,10 @@ 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",
@ -4950,11 +4942,7 @@ 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") },