]> err.no Git - mapper/commitdiff
Fix hardware key customization dialog menu
authorKaj-Michael Lang <milang@tal.org>
Fri, 21 Mar 2008 20:12:03 +0000 (22:12 +0200)
committerKaj-Michael Lang <milang@tal.org>
Fri, 21 Mar 2008 20:12:03 +0000 (22:12 +0200)
src/cb.c
src/cb.h
src/ui-common.c

index 549ef0dadbce5d816cf1a6787389148c15530f8e..64b5ffd759baa8861050dd638d2dc1d3daf8c2e1 100644 (file)
--- a/src/cb.c
+++ b/src/cb.c
@@ -536,6 +536,13 @@ settings_dialog_osm();
 return TRUE;
 }
 
+gboolean 
+menu_cb_settings_keys(GtkAction * action)
+{
+settings_dialog_hardkeys();
+return TRUE;
+}
+
 gboolean 
 menu_cb_import_osm(GtkAction * action)
 {
index 0c1aeba0c5f58593b9ba23616fa7bbe25382c8cb..01cc1d672cc6982261375ec133c12c828bf7508f 100644 (file)
--- a/src/cb.h
+++ b/src/cb.h
@@ -72,6 +72,7 @@ gboolean menu_cb_settings(GtkAction * action);
 gboolean menu_cb_settings_gps(GtkAction * action);
 gboolean menu_cb_settings_osm(GtkAction * action);
 gboolean menu_cb_settings_colors(GtkAction * action);
+gboolean menu_cb_settings_keys(GtkAction * action);
 gboolean menu_cb_import_osm(GtkAction * action);
 gboolean menu_cb_help(GtkAction * action);
 gboolean menu_cb_about(GtkAction * action);
index eded8ba460cbadf2a8ea5396d9c6a04d87c3355e..dc818c526573ac00029bf918139a0bed6b18f6b0 100644 (file)
@@ -90,11 +90,12 @@ static const gchar *mapper_ui =
 "       <menuitem action='file_settings_gps'/>"
 "       <menuitem action='file_settings_generic'/>"
 "       <menuitem action='file_settings_colors'/>"
+"       <separator/>"
+"       <menuitem action='file_settings_osm'/>"
 #ifdef WITH_DEVICE_770
+"       <separator/>"
 "       <menuitem action='file_settings_keys'/>"
 #endif
-"       <separator/>"
-"       <menuitem action='file_settings_osm'/>"
 "         </menu>"
 "      <separator/>"
 "      <menuitem action='file_import_osm'/>"
@@ -225,6 +226,7 @@ static GtkActionEntry ui_entries[] = {
        {"file_settings_colors", NULL, N_("_Colors..."), NULL, NULL, G_CALLBACK(menu_cb_settings_colors) },
        {"file_settings_gps", NULL, N_("_Gps..."), NULL, NULL, G_CALLBACK(menu_cb_settings_gps) },
        {"file_settings_osm", NULL, N_("_Map info..."), NULL, NULL, G_CALLBACK(menu_cb_settings_osm) },
+       {"file_settings_keys", NULL, N_("_Keys..."), NULL, NULL, G_CALLBACK(menu_cb_settings_keys) },
        {"file_import_osm", NULL, N_("_Import OSM data..."), NULL, NULL, G_CALLBACK(menu_cb_import_osm) },
        {"file_quit", GTK_STOCK_QUIT, N_("_Quit"), "<control>Q", NULL, G_CALLBACK(mapper_cb_quit) },