generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merging r9039-9040,9044 from trunk (warnings and message in Java)

Browse Source
This commit is contained in:
Andrey Pavlenko
2012-07-15 13:20:38 +00:00
parent fb3d6ecb98
commit 9f4c5afbbb
10 changed files with 143 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/java/generator/src/java/android+BaseLoaderCallback.java
View File

@@ -32,7 +32,7 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface {
RestartMessage.setTitle("OpenCV asks for restart");
RestartMessage.setMessage("Please, restart the application to finish installation.");
RestartMessage.setCancelable(false); // This blocks the 'BACK' button
RestartMessage.setButton("OK", new OnClickListener() {
RestartMessage.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
mAppContext.finish();
}
@@ -48,7 +48,7 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface {
MarketErrorMessage.setTitle("OpenCV Manager");
MarketErrorMessage.setMessage("Package installation failed!");
MarketErrorMessage.setCancelable(false); // This blocks the 'BACK' button
MarketErrorMessage.setButton("OK", new OnClickListener() {
MarketErrorMessage.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
mAppContext.finish();
}
@@ -69,7 +69,7 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface {
IncomatibilityMessage.setTitle("OpenCV Manager");
IncomatibilityMessage.setMessage("OpenCV Manager service is incompatible with this application. Update it!");
IncomatibilityMessage.setCancelable(false); // This blocks the 'BACK' button
IncomatibilityMessage.setButton("OK", new OnClickListener() {
IncomatibilityMessage.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
mAppContext.finish();
}
@@ -84,7 +84,7 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface {
InitFailedDialog.setTitle("OpenCV error");
InitFailedDialog.setMessage("OpenCV was not initialised correctly. Application will be shut down");
InitFailedDialog.setCancelable(false); // This blocks the 'BACK' button
InitFailedDialog.setButton("OK", new OnClickListener() {
InitFailedDialog.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
mAppContext.finish();
@@ -102,7 +102,7 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface {
InstallMessage.setTitle("Package not found");
InstallMessage.setMessage(callback.getPackageName() + " package was not found! Try to install it?");
InstallMessage.setCancelable(false); // This blocks the 'BACK' button
InstallMessage.setButton("Yes", new OnClickListener()
InstallMessage.setButton(AlertDialog.BUTTON_POSITIVE, "Yes", new OnClickListener()
{
public void onClick(DialogInterface dialog, int which)
{
@@ -110,7 +110,7 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface {
}
});
InstallMessage.setButton2("No", new OnClickListener() {
InstallMessage.setButton(AlertDialog.BUTTON_NEGATIVE, "No", new OnClickListener() {
public void onClick(DialogInterface dialog, int which)
{