From d286128c36133b1e7c316365455e872878c200db Mon Sep 17 00:00:00 2001 From: kenstir Date: Sat, 2 Nov 2013 22:36:13 -0400 Subject: [PATCH] Minor tweaks of progress messages (that really should be in resources). --- .../evergreen/android/accountAccess/bookbags/BookBagDetails.java | 4 ++-- .../android/accountAccess/checkout/ItemsCheckOutListView.java | 6 +++--- .../Android/src/org/evergreen/android/globals/GlobalConfigs.java | 2 +- Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java | 1 - .../org/evergreen/android/searchCatalog/SearchCatalogListView.java | 2 +- .../src/org/evergreen/android/utils/ui/BasicDetailsFragment.java | 2 +- .../src/org/evergreen/android/views/ApplicationPreferences.java | 2 +- .../org/evergreen/android/views/ConfigureApplicationActivity.java | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java index 22b72a475d..3a137e8b92 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java @@ -251,7 +251,7 @@ public class BookBagDetails extends Activity { Thread getBookBags = new Thread(getBookBagsItemsRunnable); progressDialog = ProgressDialog.show(context, "Please wait", - "retrieving bookbag data"); + "Retrieving bookbag data"); getBookBags.start(); } @@ -359,7 +359,7 @@ public class BookBagDetails extends Activity { bookBag.items.remove(record); progressDialog = ProgressDialog.show( context, "Please wait", - "retrieving bookbag data"); + "Retrieving bookbag data"); getBookBags.start(); } diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java index a8bf5fb39e..d9e6525fb7 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java @@ -194,13 +194,13 @@ public class ItemsCheckOutListView extends Activity { if (accountAccess.isAuthenticated()) { progressDialog = new ProgressDialog(context); - progressDialog.setMessage("Please wait while retrieving circ data"); + progressDialog.setMessage("Retrieving circulation data..."); progressDialog.show(); getCirc.start(); } else Toast.makeText(context, - "You must be authenticated to retrieve circ records", + "You must be authenticated to retrieve circulation records", Toast.LENGTH_LONG); } @@ -298,7 +298,7 @@ public class ItemsCheckOutListView extends Activity { progressDialog = new ProgressDialog( context); progressDialog - .setMessage("Renew item please wait."); + .setMessage("Renewing item"); progressDialog.show(); } }); diff --git a/Open-ILS/src/Android/src/org/evergreen/android/globals/GlobalConfigs.java b/Open-ILS/src/Android/src/org/evergreen/android/globals/GlobalConfigs.java index 1a5ab14e0e..c9c49fa516 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/globals/GlobalConfigs.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/globals/GlobalConfigs.java @@ -43,7 +43,7 @@ import android.util.Log; public class GlobalConfigs { public static String IDL_FILE_FROM_ROOT = "/reports/fm_IDL.xml"; - public static String IDL_FILE_FROM_ASSETS = "fm_IDL.xml";///reports/fm_IDL.xml?class=acn&class=acp&class=au&class=ccs&class=circ&class=mbt&class=mbts&class=mus&class=mvr + public static String IDL_FILE_FROM_ASSETS = "fm_IDL.xml";///reports/fm_IDL.xml?class=x&class=y&... public static String httpAddress = ""; private boolean init = false; diff --git a/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java b/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java index e6edc28fc5..7c95c13d62 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java @@ -272,7 +272,6 @@ public class Utils { System.out.println(textcode); throw new SessionNotFoundException(); } - } return response; diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java index ccc55539ed..d5d38ced6d 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java @@ -678,7 +678,7 @@ public class SearchCatalogListView extends Activity { } }); progressDialog = ProgressDialog.show(context, - "Please wait", "Add to bookbag"); + "Please wait", "Adding to bookbag"); addtoBookbag.start(); } diff --git a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java b/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java index 9944c98b6b..81d1b8252f 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java @@ -245,7 +245,7 @@ public class BasicDetailsFragment extends Fragment { } }); progressDialog = ProgressDialog.show(getActivity(), - "Please wait", "Add to bookbag"); + "Please wait", "Adding to bookbag"); addtoBookbag.start(); } diff --git a/Open-ILS/src/Android/src/org/evergreen/android/views/ApplicationPreferences.java b/Open-ILS/src/Android/src/org/evergreen/android/views/ApplicationPreferences.java index 4273e31de9..ec2113d7bd 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/views/ApplicationPreferences.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/views/ApplicationPreferences.java @@ -312,7 +312,7 @@ public class ApplicationPreferences extends PreferenceActivity implements && checkConnection == true) { progressDialog = ProgressDialog .show(this, "Account login", - "Please wait while we test the new user account information"); + "Signing in with new credentials"); connectionThread.start(); } diff --git a/Open-ILS/src/Android/src/org/evergreen/android/views/ConfigureApplicationActivity.java b/Open-ILS/src/Android/src/org/evergreen/android/views/ConfigureApplicationActivity.java index eefdbe9c44..6ed59d9345 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/views/ConfigureApplicationActivity.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/views/ConfigureApplicationActivity.java @@ -171,7 +171,7 @@ public class ConfigureApplicationActivity extends Activity { }); progressDialog = ProgressDialog.show(context, "Please wait", - "Checking server and credentials"); + "Checking user credentials"); checkConn.start(); } -- 2.11.0