mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Issue 274, for consideration

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1129 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2009-11-26 02:47:44 +00:00
parent b93d81b9f0
commit 5199348cfd
13 changed files with 85 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/res/values-de/strings.xml
View file

@ -66,6 +66,7 @@
<string name="msg_encode_in_progress">Erzeuge Barcode\u2026</string>
<string name="msg_intent_failed">Die gewünschte Applikation kann nicht geöffnet werden. Der Barcode könnte ungültig sein.</string>
<string name="msg_loading_apps">Laden einer Liste von Anwendungen</string>
<string name="msg_not_our_results">Sie verlassen diese Anwendung. Die Suchergebnisse, die Sie sind nicht auf diese Anwendung in Zusammenhang stehen.</string>
<string name="msg_sbc_book_not_searchable">Das Buch kann nicht durchsucht werden.</string>
<string name="msg_sbc_failed">Bei der Suche ist ein Fehler aufgetreten.</string>
<string name="msg_sbc_no_page_returned">Keine Seite zurückgeliefert.</string>

1
android/res/values-es/strings.xml
View file

@ -66,6 +66,7 @@
<string name="msg_encode_in_progress">Generando un código de barras\u2026</string>
<string name="msg_intent_failed">Lo sentimos, la aplicación solicitada no pudo ser lanzada. El contenido de código de barras puede ser inválida.</string>
<string name="msg_loading_apps">Cargando una lista de aplicaciones</string>
<string name="msg_not_our_results">Usted está saliendo de esta aplicación. Los resultados de búsqueda que se ver, no están relacionados con esta aplicación.</string>
<string name="msg_sbc_book_not_searchable">Lo sentimos, no se puede buscar en este libro.</string>
<string name="msg_sbc_failed">Lo sentimos, la búsqueda ha detectado un problema.</string>
<string name="msg_sbc_no_page_returned">Página no encontrada</string>

1
android/res/values-fr/strings.xml
View file

@ -66,6 +66,7 @@
<string name="msg_encode_in_progress">Génération du code barre\u2026</string>
<string name="msg_intent_failed">Désolé, l\'application demandée n\'a pas pu être lancé. Le contenu du code barre peut être invalide.</string>
<string name="msg_loading_apps">Chargement d'une liste d'applications</string>
<string name="msg_not_our_results">Vous quittez cette application. Les résultats de recherche qui vous voir ne sont pas liées à cette application.</string>
<string name="msg_sbc_book_not_searchable">Désolé, ce livre n\'est pas trouvable.</string>
<string name="msg_sbc_failed">Désolé, la recherche a rencontrée un problème.</string>
<string name="msg_sbc_no_page_returned">Page non trouvée</string>

1
android/res/values-it/strings.xml
View file

@ -66,6 +66,7 @@
<string name="msg_encode_in_progress">Generazione codice a barre\u2026</string>
<string name="msg_intent_failed">Spiacenti, l\'applicazione richiesta non può essere avviata. Il contenuto del codice a barre può essere non valido.</string>
<string name="msg_loading_apps">Carico della lista delle applicazioni</string>
<string name="msg_not_our_results">Si sta lasciando questa applicazione. I risultati della ricerca che verrà vedi non sono collegati a questa domanda.</string>
<string name="msg_sbc_book_not_searchable">Spiacenti, questo libro non è ricercabile.</string>
<string name="msg_sbc_failed">Spiacenti, la ricerca ha avuto un problema.</string>
<string name="msg_sbc_no_page_returned">Nessuna pagina restitiuta</string>

1
android/res/values-ja-rJP/strings.xml
View file

@ -66,6 +66,7 @@
<string name="msg_encode_in_progress">バーコード作成中\u2026</string>
<string name="msg_intent_failed">指定されたアプリケーションを起動できませんでした。バーコードの内容が無効である可能性があります。</string>
<string name="msg_loading_apps">適用のリストの負荷</string>
<string name="msg_not_our_results">このアプリケーションを残している。検索結果が必要になります。このアプリケーションに関連していないことがわかります。</string>
<string name="msg_sbc_book_not_searchable">この書籍は検索できません。</string>
<string name="msg_sbc_failed">検索中に問題が発生しました。</string>
<string name="msg_sbc_no_page_returned">検索結果はありません</string>

1
android/res/values-ru/strings.xml
View file

@ -66,6 +66,7 @@
<string name="msg_encode_in_progress">Генерация штрих-кода\u2026</string>
<string name="msg_intent_failed">К сожалению, запрошенное приложение не может быть запущенно. Содержимое штрих-кода может быть повреждено.</string>
<string name="msg_loading_apps">Нагружать список применений</string>
<string name="msg_not_our_results">Вы покидаете это приложение. Результаты поиска, которую вы видите, не связанным с этим приложением.</string>
<string name="msg_sbc_book_not_searchable">К сожалению, поиск книги не удался.</string>
<string name="msg_sbc_failed">К сожалению, у поиска возникли проблемы.</string>
<string name="msg_sbc_no_page_returned">Ни одна страница не возвращена</string>

1
android/res/values-zh-rCN/strings.xml
View file

@ -66,6 +66,7 @@
<string name="msg_encode_in_progress">正在生成条码\u2026</string>
<string name="msg_intent_failed">抱歉，无法打开所需软件。 条码内容可能无效。</string>
<string name="msg_loading_apps">装载应用名单</string>
<string name="msg_not_our_results">你离开此应用程序。搜索结果，您会看到的都没有涉及这个应用程序</string>
<string name="msg_sbc_book_not_searchable">抱歉，无法找到此图书。</string>
<string name="msg_sbc_failed">抱歉，搜索时遇到错误。</string>
<string name="msg_sbc_no_page_returned">没有返回页面</string>

1
android/res/values-zh-rTW/strings.xml
View file

@ -66,6 +66,7 @@
<string name="msg_encode_in_progress">正在生成條碼\u2026</string>
<string name="msg_intent_failed">抱歉，無法打開所需軟件。 條碼內容可能無效。</string>
<string name="msg_loading_apps">裝載應用名單</string>
<string name="msg_not_our_results">你離開此應用程序。搜索結果，您會看到的都沒有涉及這個應用程序。</string>
<string name="msg_sbc_book_not_searchable">抱歉，無法找到此圖書。</string>
<string name="msg_sbc_failed">抱歉，搜索時遇到錯誤。</string>
<string name="msg_sbc_no_page_returned">沒有返回頁面</string>

1
android/res/values/strings.xml
View file

@ -66,6 +66,7 @@
<string name="msg_encode_in_progress">Generating a barcode\u2026</string>
<string name="msg_intent_failed">Sorry, the requested application could not be launched. The barcode contents may be invalid.</string>
<string name="msg_loading_apps">Loading list of applications</string>
<string name="msg_not_our_results">You are leaving this application. The search results you will see are not related to this application.</string>
<string name="msg_sbc_book_not_searchable">Sorry, this book is not searchable.</string>
<string name="msg_sbc_failed">Sorry, the search encountered a problem.</string>
<string name="msg_sbc_no_page_returned">No page returned</string>

1
android/src/com/google/zxing/client/android/PreferencesActivity.java
View file

@ -40,6 +40,7 @@ public final class PreferencesActivity extends PreferenceActivity
static final String KEY_COPY_TO_CLIPBOARD = "preferences_copy_to_clipboard";
static final String KEY_HELP_VERSION_SHOWN = "preferences_help_version_shown";
public static final String KEY_NOT_OUR_RESULTS_SHOWN = "preferences_not_out_results_shown";
private CheckBoxPreference decode1D;
private CheckBoxPreference decodeQR;

15
android/src/com/google/zxing/client/android/result/ISBNResultHandler.java
View file

@ -16,15 +16,16 @@
package com.google.zxing.client.android.result;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import com.google.zxing.client.android.PreferencesActivity;
import com.google.zxing.client.android.R;
import com.google.zxing.client.result.ISBNParsedResult;
import com.google.zxing.client.result.ParsedResult;
import android.app.Activity;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
/**
* Handles books encoded by their ISBN values.
*
@ -58,7 +59,9 @@ public final class ISBNResultHandler extends ResultHandler {
}
@Override
public void handleButtonPress(int index) {
public void handleButtonPress(final int index) {
showNotOurResults(index, new AlertDialog.OnClickListener() {
public void onClick(DialogInterface dialogInterface, int i) {
ISBNParsedResult isbnResult = (ISBNParsedResult) getResult();
switch (index) {
case 0:
@ -76,6 +79,8 @@ public final class ISBNResultHandler extends ResultHandler {
break;
}
}
});
}
@Override
public int getDisplayTitle() {

15
android/src/com/google/zxing/client/android/result/ProductResultHandler.java
View file

@ -16,15 +16,16 @@
package com.google.zxing.client.android.result;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import com.google.zxing.client.android.PreferencesActivity;
import com.google.zxing.client.android.R;
import com.google.zxing.client.result.ParsedResult;
import com.google.zxing.client.result.ProductParsedResult;
import android.app.Activity;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
/**
* Handles generic products which are not books.
*
@ -56,7 +57,9 @@ public final class ProductResultHandler extends ResultHandler {
}
@Override
public void handleButtonPress(int index) {
public void handleButtonPress(final int index) {
showNotOurResults(index, new AlertDialog.OnClickListener() {
public void onClick(DialogInterface dialogInterface, int i) {
ProductParsedResult productResult = (ProductParsedResult) getResult();
switch (index) {
case 0:
@ -71,6 +74,8 @@ public final class ProductResultHandler extends ResultHandler {
break;
}
}
});
}
@Override
public int getDisplayTitle() {

34
android/src/com/google/zxing/client/android/result/ResultHandler.java
View file

@ -16,20 +16,22 @@
package com.google.zxing.client.android.result;
import com.google.zxing.client.android.Contents;
import com.google.zxing.client.android.Intents;
import com.google.zxing.client.android.LocaleManager;
import com.google.zxing.client.android.R;
import com.google.zxing.client.android.book.SearchBookContentsActivity;
import com.google.zxing.client.result.ParsedResult;
import com.google.zxing.client.result.ParsedResultType;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.preference.PreferenceManager;
import android.provider.Contacts;
import com.google.zxing.client.android.Contents;
import com.google.zxing.client.android.Intents;
import com.google.zxing.client.android.LocaleManager;
import com.google.zxing.client.android.PreferencesActivity;
import com.google.zxing.client.android.R;
import com.google.zxing.client.android.book.SearchBookContentsActivity;
import com.google.zxing.client.result.ParsedResult;
import com.google.zxing.client.result.ParsedResultType;
import java.text.DateFormat;
import java.text.ParsePosition;
@ -315,4 +317,20 @@ public abstract class ResultHandler {
intent.putExtra(key, value);
}
}
protected void showNotOurResults(int index, AlertDialog.OnClickListener proceedListener) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
if (prefs.getBoolean(PreferencesActivity.KEY_NOT_OUR_RESULTS_SHOWN, false)) {
// already seen it, just proceed
proceedListener.onClick(null, index);
} else {
// note the user has seen it
prefs.edit().putBoolean(PreferencesActivity.KEY_NOT_OUR_RESULTS_SHOWN, true);
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setMessage(R.string.msg_not_our_results);
builder.setPositiveButton(R.string.button_ok, proceedListener);
builder.show();
}
}
}