fix #1940: Quicker change of OSM offline maps

1 files changed, 49 insertions, 34 deletions

diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
index c2887e3..41e3aad 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/init.xml
@@ -669,7 +669,7 @@
 					android:textColorLink="?text_color_link"
 					android:linksClickable="true"
 					android:text="@string/init_showwaypoint_description" />
-<!-- ** -->
+<!-- maps -->
 			<RelativeLayout style="@style/separator_horizontal_layout" >
 				<View style="@style/separator_horizontal" />
 				<TextView style="@style/separator_horizontal_headline"
@@ -693,22 +693,36 @@
 					android:layout_width="fill_parent"
 					android:layout_height="wrap_content"
 					android:prompt="@string/init_mapsource_select" />
-			<LinearLayout
-					android:id="@+id/init_mapfilegroup"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:orientation="horizontal" >
-				<Button style="@style/button_full"
-						android:id="@+id/select_mapfile"
-						android:text="@string/init_select_mapfile"
-						android:layout_width="wrap_content" />
-				<EditText style="@style/edittext_full"
-						android:id="@+id/mapfile"
-						android:singleLine="true"
-						android:lines="1"
-						android:scrollHorizontally="true"
-						android:inputType="textNoSuggestions" />
-			</LinearLayout>
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="10dip"
+                    android:layout_marginBottom="5dip"
+                    android:layout_gravity="left"
+                    android:padding="3dip"
+                    android:textSize="14dip"
+                    android:textColor="?text_color"
+                    android:textColorLink="?text_color_link"
+                    android:linksClickable="true"
+                    android:autoLink="web"
+                    android:text="@string/init_map_directory_description" />
+            <LinearLayout
+                    android:id="@+id/init_mapdir_group"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" >
+                <Button style="@style/button_full"
+                        android:id="@+id/select_map_directory"
+                        android:text="@string/init_select_map_directory"
+                        android:layout_width="wrap_content" />
+                <EditText style="@style/edittext_full"
+                        android:id="@+id/map_directory"
+                        android:singleLine="true"
+                        android:lines="1"
+                        android:scrollHorizontally="true"
+                        android:inputType="textNoSuggestions" />
+            </LinearLayout>
             <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -718,23 +732,24 @@
                     android:textSize="14dip"
                     android:textColor="?text_color"
                     android:text="@string/init_rendertheme_folder" />
-			<LinearLayout
-					android:id="@+id/init_themefilegroup"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:orientation="horizontal" >
-				<Button style="@style/button_full"
-						android:id="@+id/select_themefolder"
-						android:text="@string/init_select_themefolder"
-						android:layout_width="wrap_content" />
-				<EditText style="@style/edittext_full"
-						android:id="@+id/themefolder"
-						android:singleLine="true"
-						android:lines="1"
-						android:scrollHorizontally="true"
-						android:inputType="textNoSuggestions" />
-			</LinearLayout>
-<!-- ** -->
+            <LinearLayout
+                    android:id="@+id/init_themefilegroup"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" >
+                <Button style="@style/button_full"
+                        android:id="@+id/select_themefolder"
+                        android:text="@string/init_select_themefolder"
+                        android:layout_width="wrap_content" />
+                <EditText style="@style/edittext_full"
+                        android:id="@+id/themefolder"
+                        android:singleLine="true"
+                        android:lines="1"
+                        android:scrollHorizontally="true"
+                        android:inputType="textNoSuggestions" />
+            </LinearLayout>
+            
+<!-- GPX -->
 			<RelativeLayout style="@style/separator_horizontal_layout" >
 				<View style="@style/separator_horizontal" />
 				<TextView style="@style/separator_horizontal_headline"