Embed GtkHTML 4.10.0 URI functions

[andy/viking.git] / src / globals.h

diff --git a/src/globals.h b/src/globals.h
index 29a5b49e6abc675e15bced8c583bd41e4ccc3ffd..485d50ad4bc568c60478ea1da712c7c809be4aa8 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -33,7 +33,6 @@ G_BEGIN_DECLS
 #define VIKING_URL PACKAGE_URL
 
 #define ALTI_TO_MPP 1.4017295
-#define MPP_TO_ALTI 0.7134044
 
 #define VIK_FEET_IN_METER 3.2808399
 #define VIK_METERS_TO_FEET(X) ((X)*VIK_FEET_IN_METER)
@@ -43,6 +42,10 @@ G_BEGIN_DECLS
 #define VIK_METERS_TO_MILES(X) ((X)*VIK_MILES_IN_METER)
 #define VIK_MILES_TO_METERS(X) ((X)/VIK_MILES_IN_METER)
 
+#define VIK_NAUTICAL_MILES_IN_METER 0.000539957
+#define VIK_METERS_TO_NAUTICAL_MILES(X) ((X)*VIK_NAUTICAL_MILES_IN_METER)
+#define VIK_NAUTICAL_MILES_TO_METERS(X) ((X)/VIK_NAUTICAL_MILES_IN_METER)
+
 /* MPS - Metres Per Second */
 /* MPH - Metres Per Hour */
 #define VIK_MPH_IN_MPS 2.23693629
@@ -99,6 +102,7 @@ vik_degree_format_t a_vik_get_degree_format ( );
 typedef enum {
   VIK_UNITS_DISTANCE_KILOMETRES,
   VIK_UNITS_DISTANCE_MILES,
+  VIK_UNITS_DISTANCE_NAUTICAL_MILES,
 } vik_units_distance_t;
 
 vik_units_distance_t a_vik_get_units_distance ( );
@@ -224,6 +228,9 @@ gint a_vik_get_recent_number_files ( );
 #define VIKING_PREFERENCES_STARTUP_GROUP_KEY "viking.startup"
 #define VIKING_PREFERENCES_STARTUP_NAMESPACE "viking.startup."
 
+// Additions to 'Stock Icons'
+#define VIK_ICON_SHOW_PICTURE "vik-icon-Show Picture"
+
 G_END_DECLS
 
 #endif