2006-09-11 Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>

* hildon-widgets/hildon-app.h:
	* hildon-widgets/hildon-defines.h: Reverting back to old key mapping.

diff --git a/ChangeLog b/ChangeLog
index 7efe20c..8a3e5b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-09-11  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
+       * hildon-widgets/hildon-app.h:
+       * hildon-widgets/hildon-defines.h: Reverting back to old key mapping.
+
+2006-09-11  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+
        * hildon-widgets/hildon-time-editor.c: When user clicked the clock
        button, before launching the time picker try to validate the entered
        values. Fixes #NB40055.

diff --git a/hildon-widgets/hildon-app.h b/hildon-widgets/hildon-app.h
index 702b967..4e18a64 100644 (file)
--- a/hildon-widgets/hildon-app.h
+++ b/hildon-widgets/hildon-app.h
@@ -101,13 +101,13 @@ GType hildon_zoom_level_get_type (void);
  * FIXME: These should be removed when API changes are allowed, 
  * they are not used in hildon code anymore (but might be in external). 
  */ 
+#define HILDON_MENU_KEY         GDK_F4
 #define HILDON_HOME_KEY         GDK_F5
 #define HILDON_TOOLBAR_KEY      GDK_T
 #define HILDON_FULLSCREEN_KEY   GDK_F6
 #define HILDON_INCREASE_KEY     GDK_F7
 #define HILDON_DECREASE_KEY     GDK_F8
 #define HILDON_TOOLBAR_MODIFIERS (GDK_SHIFT_MASK | GDK_CONTROL_MASK)
-#define HILDON_MENU_KEY         GDK_F10
 
 #define HILDON_KEYEVENT_IS_MENU_KEY(keyevent) (keyevent->keyval == HILDON_MENU_KEY)
 #define HILDON_KEYEVENT_IS_HOME_KEY(keyevent) (keyevent->keyval == HILDON_HOME_KEY)

diff --git a/hildon-widgets/hildon-defines.h b/hildon-widgets/hildon-defines.h
index 0d21749..5385423 100644 (file)
--- a/hildon-widgets/hildon-defines.h
+++ b/hildon-widgets/hildon-defines.h
@@ -128,12 +128,12 @@ extern const HildonIconSizes *hildoniconsizes;
 #define HILDON_HARDKEY_RIGHT      GDK_Right
 #define HILDON_HARDKEY_DOWN       GDK_Down
 #define HILDON_HARDKEY_SELECT     GDK_Return
+#define HILDON_HARDKEY_MENU       GDK_F4
 #define HILDON_HARDKEY_HOME       GDK_F5
 #define HILDON_HARDKEY_ESC        GDK_Escape
 #define HILDON_HARDKEY_FULLSCREEN GDK_F6
 #define HILDON_HARDKEY_INCREASE   GDK_F7
 #define HILDON_HARDKEY_DECREASE   GDK_F8
-#define HILDON_HARDKEY_MENU       GDK_F10
 
 gulong hildon_gtk_widget_set_logical_font (GtkWidget *widget, const gchar *logicalfontname);
 gulong hildon_gtk_widget_set_logical_color (GtkWidget *widget, GtkRcFlags rcflags,