diff options
| author | rsudev <rasch@munin-soft.de> | 2011-08-12 22:33:07 +0200 |
|---|---|---|
| committer | rsudev <rasch@munin-soft.de> | 2011-08-12 22:33:07 +0200 |
| commit | 3f7c3b39f675acdb8eecb7d8ff81758d67fccceb (patch) | |
| tree | 0084228caf06921e1241b441a040cbea1a33e448 | |
| parent | d4b05d5e07dc2bfbbd6d435c993dac7a434f98bc (diff) | |
| download | cgeo-3f7c3b39f675acdb8eecb7d8ff81758d67fccceb.zip cgeo-3f7c3b39f675acdb8eecb7d8ff81758d67fccceb.tar.gz cgeo-3f7c3b39f675acdb8eecb7d8ff81758d67fccceb.tar.bz2 | |
Fix issue #90 - search for map file screen has wrong title
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | src/cgeo/geocaching/cgFileList.java | 7 | ||||
| -rw-r--r-- | src/cgeo/geocaching/cgSelectMapfile.java | 5 | ||||
| -rw-r--r-- | src/cgeo/geocaching/cgeogpxes.java | 5 |
4 files changed, 19 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 8334e4e..59b7dd7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -564,6 +564,9 @@ <string name="gpx_import_title_reading_file">Reading file</string> <string name="gpx_import_title_caches_imported">Result</string> + <!-- map file select --> + <string name="map_file_select_title">Select map file</string> + <!-- import --> <string name="import_title">Import...</string> <string name="web_import_title">Import from web</string> diff --git a/src/cgeo/geocaching/cgFileList.java b/src/cgeo/geocaching/cgFileList.java index e8768a8..2a5ea87 100644 --- a/src/cgeo/geocaching/cgFileList.java +++ b/src/cgeo/geocaching/cgFileList.java @@ -68,7 +68,7 @@ public abstract class cgFileList<T extends ArrayAdapter<File>> extends AbstractL setTheme(); setContentView(R.layout.gpx); - setTitle(res.getString(R.string.gpx_import_title)); + setTitle(); Bundle extras = getIntent().getExtras(); if (extras != null) { @@ -128,6 +128,11 @@ public abstract class cgFileList<T extends ArrayAdapter<File>> extends AbstractL * @return The folder to start the recursive search in */ protected abstract String[] getBaseFolders(); + + /** + * Triggers the deriving class to set the title + */ + protected abstract void setTitle(); private class loadFiles extends Thread { public void notifyEnd() { diff --git a/src/cgeo/geocaching/cgSelectMapfile.java b/src/cgeo/geocaching/cgSelectMapfile.java index b64148f..0d9e57c 100644 --- a/src/cgeo/geocaching/cgSelectMapfile.java +++ b/src/cgeo/geocaching/cgSelectMapfile.java @@ -44,6 +44,11 @@ public class cgSelectMapfile extends cgFileList<cgMapfileListAdapter> { return "map"; } + @Override + protected void setTitle() { + setTitle(res.getString(R.string.map_file_select_title)); + } + public String getCurrentMapfile() { return mapFile; } diff --git a/src/cgeo/geocaching/cgeogpxes.java b/src/cgeo/geocaching/cgeogpxes.java index 09a6052..772f268 100644 --- a/src/cgeo/geocaching/cgeogpxes.java +++ b/src/cgeo/geocaching/cgeogpxes.java @@ -72,6 +72,11 @@ public class cgeogpxes extends cgFileList<cgGPXListAdapter> { } } + + @Override + protected void setTitle() { + setTitle(res.getString(R.string.gpx_import_title)); + } public void loadGPX(File file) { |