From 40b026df4691aec7d8f92a5470c11205dc19d97e Mon Sep 17 00:00:00 2001 From: santimunin Date: Fri, 24 Aug 2012 19:58:28 +0000 Subject: [PATCH] =?UTF-8?q?2012-08-10=20Santiago=20Mun=C3=ADn=20=20=09*=20src/pandroid=5Fevent=5Fviewer/pandorafms/Op?= =?UTF-8?q?tions.java:=20Fixed=20a=20little=20bug=20with=20the=20connectio?= =?UTF-8?q?n=20status=20textview.=20=09*=20res/layout/options.xml:=20Conne?= =?UTF-8?q?ction=20status=20textview=20now=20has=20a=20fixed=20width.=20?= =?UTF-8?q?=09*=20res/values/strings.xml:=20Added=20an=20entry.=20=09*=20r?= =?UTF-8?q?es/values-es/strings.xml:=20Added=20an=20entry.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6911 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- extras/pandroid_event_viewer/ChangeLog | 6 +++++ .../res/layout/options.xml | 23 ++++++------------- .../res/values-es/strings.xml | 2 +- .../res/values/strings.xml | 1 + .../pandorafms/Options.java | 4 ++++ 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog index 3b004fb199..718951cbc7 100644 --- a/extras/pandroid_event_viewer/ChangeLog +++ b/extras/pandroid_event_viewer/ChangeLog @@ -1,3 +1,9 @@ +2012-08-10 Santiago Munín + * src/pandroid_event_viewer/pandorafms/Options.java: Fixed a little bug with the connection status textview. + * res/layout/options.xml: Connection status textview now has a fixed width. + * res/values/strings.xml: Added an entry. + * res/values-es/strings.xml: Added an entry. + 2012-08-10 Santiago Munín * src/pandroid_event_viewer/pandorafms/Options.java: Removed url_changed in SharedPreferences. * src/pandroid_event_viewer/pandorafms/Main.java: Tags and groups are loading onResume. Also, they are always loaded (url_changed isn't used anymore). diff --git a/extras/pandroid_event_viewer/res/layout/options.xml b/extras/pandroid_event_viewer/res/layout/options.xml index b89091d563..afad572ba3 100644 --- a/extras/pandroid_event_viewer/res/layout/options.xml +++ b/extras/pandroid_event_viewer/res/layout/options.xml @@ -111,7 +111,6 @@ - - - - + android:layout_gravity="center_horizontal" + android:drawableBottom="@drawable/help" + android:text="@string/check_connection" + android:textColor="#ffffff" /> @@ -193,7 +186,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" /> - @@ -208,7 +200,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginRight="63dp" /> - diff --git a/extras/pandroid_event_viewer/res/values-es/strings.xml b/extras/pandroid_event_viewer/res/values-es/strings.xml index cf2b84e926..3f2a378aa1 100644 --- a/extras/pandroid_event_viewer/res/values-es/strings.xml +++ b/extras/pandroid_event_viewer/res/values-es/strings.xml @@ -74,5 +74,5 @@ Visor de eventos para Pandora FMS. Bienvenido al visor de eventos de Pandora FMS para Android

Esta aplicación se usa para ver de forma autónoma y cómoda, el estado de los eventos resportados por un servidor de monitorización Pandora FMS. Desde esta aplicación podrá ver en tiempo real los eventos, e incluso validar o filtrarlos.

La configuración por defecto apunta al servidor de demo de Pandora FMS en firefly.artica.es. Cambie la configuración para que apunte a su propio servidor de Pandora FMS.

 - +Conexión fallida \ No newline at end of file diff --git a/extras/pandroid_event_viewer/res/values/strings.xml b/extras/pandroid_event_viewer/res/values/strings.xml index 4b6088006f..af5302d337 100644 --- a/extras/pandroid_event_viewer/res/values/strings.xml +++ b/extras/pandroid_event_viewer/res/values/strings.xml @@ -121,5 +121,6 @@ Unknown version Check in background Default profile can not be removed + Connection failed \ No newline at end of file diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Options.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Options.java index ad34560ac1..c8bee9c99d 100644 --- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Options.java +++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Options.java @@ -219,6 +219,9 @@ public class Options extends Activity { this.getString(R.string.config_update_succesful_str), Toast.LENGTH_SHORT); toast.show(); + connectionStatus.setText(R.string.check_connection); + connectionStatus.setCompoundDrawablesWithIntrinsicBounds(0, 0, + 0, R.drawable.help); new CheckConnectionAsyncTask().execute(); } else { Toast toast = Toast.makeText(context, @@ -320,6 +323,7 @@ public class Options extends Activity { connectionStatus.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, R.drawable.ok); } else { + connectionStatus.setText(getString(R.string.connection_problems)); connectionStatus.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, R.drawable.cross); }