Merge pull request #1901 from marco-jacob/issue#1794retry

fixes #1794 - added gpx export dir setting with SimpleDirChooser

9 files changed, 128 insertions, 5 deletions

diff --git a/main/res/layout/gpx_export_dialog.xml b/main/res/layout/gpx_export_dialog.xml
index 86c0862..7c9345f 100644
--- a/main/res/layout/gpx_export_dialog.xml
+++ b/main/res/layout/gpx_export_dialog.xml
@@ -6,6 +6,7 @@
     android:padding="3dip" >

 

     <TextView

+        android:id="@id/info"

         android:layout_width="wrap_content"

         android:layout_height="wrap_content"

         android:text="@string/export_gpx_info" />

diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
index 80a12ca..e660b27 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/init.xml
@@ -714,6 +714,42 @@
 			<RelativeLayout style="@style/separator_horizontal_layout" >
 				<View style="@style/separator_horizontal" />
 				<TextView style="@style/separator_horizontal_headline"
+						android:text="@string/init_gpx_exportdir" />
+			</RelativeLayout>
+			<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_gpx_exportdir_description" />
+			<LinearLayout
+					android:id="@+id/init_gpx_export_group"
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:orientation="horizontal" >
+				<Button style="@style/button_full"
+						android:id="@+id/select_gpx_exportdir"
+						android:text="@string/init_select_gpx_exportdir"
+						android:layout_width="wrap_content" />
+				<EditText style="@style/edittext_full"
+						android:id="@+id/gpx_exportdir"
+						android:singleLine="true"
+						android:lines="1"
+						android:scrollHorizontally="true"
+						android:inputType="textNoSuggestions" />
+			</LinearLayout>
+<!-- ** -->
+			<RelativeLayout style="@style/separator_horizontal_layout" >
+				<View style="@style/separator_horizontal" />
+				<TextView style="@style/separator_horizontal_headline"
 						android:text="@string/init_altitude" />
 			</RelativeLayout>
 			<EditText style="@style/edittext_full"
diff --git a/main/res/layout/simple_dir_chooser.xml b/main/res/layout/simple_dir_chooser.xml
new file mode 100644
index 0000000..491e0a2
--- /dev/null
+++ b/main/res/layout/simple_dir_chooser.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+		android:orientation="vertical"
+    	android:background="?background_color">
+    <LinearLayout
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:orientation="vertical"
+	        android:layout_weight="2">
+		<RelativeLayout style="@style/separator_horizontal_layout" >
+			<View style="@style/separator_horizontal" />
+			<TextView style="@style/separator_horizontal_headline"
+					android:text="@string/simple_dir_chooser_title" />
+		</RelativeLayout>
+	    <EditText 
+		        style="@style/edittext_full"
+				android:id="@+id/simple_dir_chooser_path"
+				android:singleLine="true"
+				android:lines="0"
+				android:editable="false"
+				android:scrollHorizontally="true"
+				android:inputType="textNoSuggestions" />
+	</LinearLayout>
+   	<ListView 
+	        android:layout_height="fill_parent" 
+	        android:layout_width="wrap_content" 
+			android:layout_weight="100"
+	        android:id="@+id/android:list" />
+	<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal"
+			android:paddingTop="10dip"
+			android:layout_weight="1">
+	    <Button style="@style/button_full"
+				android:id="@+id/simple_dir_chooser_ok"
+				android:text="@android:string/ok"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
+		<Button style="@style/button_full"
+				android:id="@+id/simple_dir_chooser_cancel"
+				android:text="@android:string/cancel"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
+	</LinearLayout>
+</LinearLayout>
diff --git a/main/res/layout/simple_dir_item.xml b/main/res/layout/simple_dir_item.xml
new file mode 100644
index 0000000..ec4cd28
--- /dev/null
+++ b/main/res/layout/simple_dir_item.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:orientation="horizontal"
+		android:background="?background_color" >
+	<CheckBox android:text=""
+        android:id="@+id/CheckBox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checked="false" />
+    <TextView 
+	    android:text="@+id/TextView01" 
+	    android:id="@+id/TextView01" 
+	    android:layout_width="wrap_content" 
+	    android:layout_height="wrap_content" 
+	    android:singleLine="true" 
+	    android:textStyle="bold" 
+	    android:layout_marginTop="5dip" 
+	    android:layout_marginLeft="5dip" />
+</LinearLayout>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index f811f44..05cc5a1 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -425,6 +425,10 @@
   <string name="init_mapsources_description">Hier kann die Quelle der benutzen Karte gewählt werden. Alternativ zu Google Maps stehen verschiedene OpenStreetMap-Stile zur Verfügung und daneben auch Karten-Dateien für die Offline-Nutzung (siehe http://code.google.com/p/mapsforge/ für die Details).</string>
   <string name="init_mapsource_select">Kartenquelle wählen</string>
   <string name="init_select_mapfile">…</string>
+  <string name="init_select_gpx_exportdir">…</string>
+  <string name="init_gpx_exportdir">Verzeichnis für GPX Exporte</string>
+  <string name="init_gpx_exportdir_description">Hier kann das Verzeichnis für GPX-Exporte gewählt werden.</string>
+  <string name="init_gpx_exportdir_select">Wähle Verzeichnis für GPX Exporte</string>
   <string name="init_maptrail">Zeige Spur auf Karte</string>
   <string name="init_share_after_export">Weiterleiten nach dem Export</string>
   <string name="init_trackautovisit">Trackables automatisch auf \"besuchen\" setzen</string>
@@ -607,6 +611,10 @@
   <string name="file_searching">Suche nach passenden Dateien</string>
   <string name="file_title_searching">Suche</string>
 
+  <!-- simple_dir_chooser -->
+  <string name="simple_dir_chooser_title">Verzeichnis wählen</string>
+  <string name="simple_dir_chooser_current_path">Pfad:</string>
+  
   <!-- gpx -->
   <string name="gpx_import_loading_caches">Lade Caches aus GPX-Datei</string>
   <string name="gpx_import_loading_waypoints">Lade Wegpunkte aus GPX-Datei</string>
@@ -804,7 +812,7 @@
   <string name="export_fieldnotes_onlynew">Nur seit letztem Export</string>
   <string name="export_fieldnotes_creating">Erstelle Field Notes…</string>
   <string name="export_gpx">GPX</string>
-  <string name="export_gpx_info">GPX-Datei wird nach /sdcard/gpx mit dem aktuellen Datum und Zeit als Dateiname exportiert.</string>
+  <string name="export_gpx_info">GPX-Datei wird nach %1$s mit dem aktuellen Datum und Zeit als Dateiname exportiert.</string>
   <string name="export_gpx_to">Exportierte GPX-Datei senden an</string>
   
   <!-- attribute unknown -->
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index 7516a47..a9af5b5 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -796,7 +796,7 @@
   <string name="export_fieldnotes_onlynew">Solo quelli nuovi rispetto all\'ultima esportazione</string>
   <string name="export_fieldnotes_creating">Creazione Field Notes…</string>
   <string name="export_gpx">GPX</string>
-  <string name="export_gpx_info">Il file GPX sarà esportato in /sdcard/gpx con data ed ora correnti come nome file.</string>
+  <string name="export_gpx_info">Il file GPX sarà esportato in %1$s con data ed ora correnti come nome file.</string>
   <string name="export_gpx_to">Invia il GPX esportato a</string>
 
 <!--  attribute unknown -->
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 2aa0291..acfbe4c 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -828,7 +828,7 @@
   <string name="export_fieldnotes_onlynew">最後にエクスポートした時から更新がある場合のみ</string>   <!-- only new logs since last export/upload  line53:FieldnoteExport.java -->
   <string name="export_fieldnotes_creating">フィールドノートを作成中…</string>
   <string name="export_gpx">GPX</string>
-  <string name="export_gpx_info">GPXファイルは/sdcard/gpxフォルダに保存され、ファイル名は現在の日時になります。</string>
+  <string name="export_gpx_info">GPXファイルは%1$sフォルダに保存され、ファイル名は現在の日時になります。</string>
   <string name="export_gpx_to">エクスポートしたGPXファイルを送る:</string>
   
   <!--  attribute unknown -->
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 37fe1c7..21f72a6 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -798,7 +798,7 @@
   <string name="export_fieldnotes_onlynew">Bara sedan senaste exporteringen</string>
   <string name="export_fieldnotes_creating">Skapar Field Notes…</string>
   <string name="export_gpx">GPX</string>
-  <string name="export_gpx_info">GPX filen kommer att exporteras till /sdcard/gpx med datum och tid i filnamnet.</string>
+  <string name="export_gpx_info">GPX filen kommer att exporteras till %1$s med datum och tid i filnamnet.</string>
   <string name="export_gpx_to">Skicka exporterad GPX till</string>
 
   <!-- next things -->
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index edc81ed..d0b65d3 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -426,6 +426,10 @@
   <string name="init_mapsources_description">Here you can select the source for your maps. As an alternative to Google maps various OpenStreetMap styles are available and even offline map files (See <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a> for details).</string>
   <string name="init_mapsource_select">Select Map Source</string>
   <string name="init_select_mapfile">…</string>
+  <string name="init_select_gpx_exportdir">…</string>
+  <string name="init_gpx_exportdir">GPX Export Directory</string>
+  <string name="init_gpx_exportdir_description">Here you can select the directory for GPX exports.</string>
+  <string name="init_gpx_exportdir_select">Select GPX Export Directory</string>
   <string name="init_maptrail">Show trail on Map</string>
   <string name="init_share_after_export">Open share menu after GPX export</string>
   <string name="init_trackautovisit">Set trackables to \"Visited\" as a default</string>
@@ -617,6 +621,10 @@
   <string name="file_searching">Searching for matching files</string>
   <string name="file_title_searching">Searching</string>
 
+  <!-- simple_dir_chooser -->
+  <string name="simple_dir_chooser_title">Choose directory</string>
+  <string name="simple_dir_chooser_current_path">Path:</string>
+  
   <!-- gpx -->
   <string name="gpx_import_loading_caches">Loading caches from .gpx file</string>
   <string name="gpx_import_loading_waypoints">Loading waypoints file</string>
@@ -828,7 +836,7 @@
   <string name="export_fieldnotes_onlynew">Only since last export</string>
   <string name="export_fieldnotes_creating">Creating Field Notes…</string>
   <string name="export_gpx">GPX</string>
-  <string name="export_gpx_info">The GPX file will be exported to /sdcard/gpx with current date and time as file name.</string>
+  <string name="export_gpx_info">The GPX file will be exported to %1$s with current date and time as file name.</string>
   <string name="export_gpx_to">Send exported GPX to</string>
   
   <!--  attribute unknown -->