2012-08-10 Santiago Munín <burning1@gmail.com>

* 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.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6911 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

extras/pandroid_event_viewer/ChangeLog

@@ -1,3 +1,9 @@
+2012-08-10 Santiago Munín <burning1@gmail.com>
+	* 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 <burning1@gmail.com>
 	* 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).

extras/pandroid_event_viewer/res/layout/options.xml

@@ -111,7 +111,6 @@
                         <LinearLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:gravity="left"
                             android:orientation="vertical" >
 
                             <TextView
@@ -127,20 +126,14 @@
                                 android:layout_height="wrap_content" />
                         </LinearLayout>
 
-                        <LinearLayout
+                        <TextView
-                            android:layout_width="fill_parent"
+                            android:id="@+id/check_connection_status"
+                            android:layout_width="150dp"
                             android:layout_height="wrap_content"
-                            android:gravity="center_horizontal"
+                            android:layout_gravity="center_horizontal"
-                            android:orientation="vertical" >
+                            android:drawableBottom="@drawable/help"
-
+                            android:text="@string/check_connection"
-                            <TextView
+                            android:textColor="#ffffff" />
-                                android:id="@+id/check_connection_status"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:drawableBottom="@drawable/help"
-                                android:text="@string/check_connection"
-                                android:textColor="#ffffff" />
-                        </LinearLayout>
                     </TableRow>
 
                     <TableRow android:layout_marginTop="10dp" >
@@ -193,7 +186,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center" />
-
                 </TableRow>
 
                 <TableRow>
@@ -208,7 +200,6 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:layout_marginRight="63dp" />
-
                 </TableRow>
 
                 <TableRow>

extras/pandroid_event_viewer/res/values-es/strings.xml

@@ -74,5 +74,5 @@
     <string name="pandroid_event_viewer_description_str">Visor de eventos para Pandora FMS.</string>
     <string name="pandroid_info_txt"><b>Bienvenido al visor de eventos de Pandora FMS para Android</b></string>
     <string name="pandroid_info_long_txt"><p>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.</p><p>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.</p></string>
-
+<string name="connection_problems">Conexión fallida</string>
 </resources>

extras/pandroid_event_viewer/res/values/strings.xml

@@ -121,5 +121,6 @@
     <string name="unknown_version">Unknown version</string>
     <string name="enable_background_service">Check in background</string>
     <string name="default_profile_can_not_remove">Default profile can not be removed</string>
+    <string name="connection_problems">Connection failed</string>
 
 </resources>

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);
 			}