--- trunk/src/config.h	2009/08/24 12:57:15	75
+++ trunk/src/config.h	2009/09/10 13:06:16	106
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2008-2009 Till Harbaum <till@harbaum.org>.
+ *
+ * This file is part of GPXView.
+ *
+ * GPXView is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GPXView is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef CONFIG_H
 #define CONFIG_H
 
@@ -29,37 +48,59 @@
 #define USE_CAIRO
 #define ENABLE_OSD
 #define ENABLE_BALLOON
+#define OSD_SCALE
+#define OSD_CROSSHAIR
 
 #ifdef USE_MAEMO
 #define BIG_BALLOONS
-#endif
-
-#ifdef BIG_BALLOONS
 #define BALLOON_AREA_WIDTH       380
 #define BALLOON_AREA_HEIGHT      100
 #define BALLOON_CORNER_RADIUS     20
-#define OSM_GPS_MAP_OSD_DIAMETER  60
-#endif
+#define OSD_FONT_SIZE             28
+#define OSD_DIAMETER         60
+#define OSD_SCALE_FONT_SIZE  20
+#define OSD_CROSSHAIR_RADIUS 20
 
-#ifdef USE_MAEMO
 /* limit screen refresh while dragging to avoid delays */
 #define OSM_GPS_MAP_REFRESH  25
 #endif
 
+
+/* only maemo devices up to version 4 have a fullscreen button */
+#ifdef USE_MAEMO
+#include <hildon/hildon-defines.h>
+#if (MAEMO_VERSION_MAJOR < 5)
+#define OSM_GPS_MAP_KEY_FULLSCREEN  HILDON_HARDKEY_FULLSCREEN
+#else
+#define OSM_GPS_MAP_KEY_FULLSCREEN  'f'
+#endif
+#define OSM_GPS_MAP_KEY_ZOOMIN      HILDON_HARDKEY_INCREASE
+#define OSM_GPS_MAP_KEY_ZOOMOUT     HILDON_HARDKEY_DECREASE
+#else
+#define OSM_GPS_MAP_KEY_FULLSCREEN  GDK_F11
+#define OSM_GPS_MAP_KEY_ZOOMIN      '+'
+#define OSM_GPS_MAP_KEY_ZOOMOUT     '-'
+#endif
+
+#define OSM_GPS_MAP_KEY_UP          GDK_Up
+#define OSM_GPS_MAP_KEY_DOWN        GDK_Down
+#define OSM_GPS_MAP_KEY_LEFT        GDK_Left
+#define OSM_GPS_MAP_KEY_RIGHT       GDK_Right
+
 /* specify OSD colors explicitely. Otherwise gtk default */
-/* colors are used. Only fremantle uses gtk defaults */
+/* colors are used. fremantle always uses gtk defaults */
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
 #define OSD_COLOR_BG         1, 1, 1         // white background
 #define OSD_COLOR            0.5, 0.5, 1     // light blue border and controls
 #define OSD_COLOR_DISABLED   0.8, 0.8, 0.8   // light grey disabled controls
 #define OSD_SHADOW_ENABLE
 #else
-#define OSD_COLOR_BG         0, 0, 0         // black background
-#define OSD_COLOR            1, 1, 1         // white border and controls
-#define OSD_COLOR_DISABLED   0.2, 0.2, 0.2   // dark grey disabled controls
+#define OSD_Y  -10
 #endif
 
 #define OSD_DOUBLE_BUFFER    // render osd/map together offscreen
-#define OSD_NODIR            // no direction arrows (map is panned)
+#define OSD_GPS_BUTTON       // display a GPS button
+#define OSD_NO_DPAD          // no direction arrows (map is panned)
+#define OSD_SOURCE_SEL       // display source selection tab
 
 #endif // CONFIG_H