From 74c0e8502c86cd3f791e79539064650c3edc0dc0 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Wed, 30 Oct 2013 16:14:36 +0000
Subject: [PATCH] 2012-10-30  Miguel de Dios  <miguel.dedios@artica.es>

	* res/layout/options.xml, res/values-ja/strings.xml,
	res/values/strings.xml, res/values-es/strings.xml: changed the
	style of app, wip.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8985 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 extras/pandroid_event_viewer/ChangeLog        |  6 +++
 .../res/layout/options.xml                    | 48 ++++++++++++-------
 .../res/values-es/strings.xml                 |  3 +-
 .../res/values-ja/strings.xml                 |  3 +-
 .../res/values/strings.xml                    |  3 +-
 5 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog
index 972de7467c..d4091379b8 100644
--- a/extras/pandroid_event_viewer/ChangeLog
+++ b/extras/pandroid_event_viewer/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-30  Miguel de Dios  <miguel.dedios@artica.es>
+	
+	* res/layout/options.xml, res/values-ja/strings.xml,
+	res/values/strings.xml, res/values-es/strings.xml: changed the
+	style of app, wip.
+
 2012-10-30  Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* res/values/styles.xml, res/layout/options.xml: I have started to
diff --git a/extras/pandroid_event_viewer/res/layout/options.xml b/extras/pandroid_event_viewer/res/layout/options.xml
index 8d6da530f1..56dc6dea8f 100644
--- a/extras/pandroid_event_viewer/res/layout/options.xml
+++ b/extras/pandroid_event_viewer/res/layout/options.xml
@@ -118,7 +118,36 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1" />
-
+                
+				<TextView
+			          android:layout_width="wrap_content"
+			          android:layout_height="wrap_content"
+			          android:paddingLeft="2dp"
+			          android:text="@string/timeout_connections_label_str"
+			          style="@style/options_label"
+			     />
+				<LinearLayout
+				    android:layout_width="fill_parent"
+		            android:layout_height="wrap_content"
+		            android:orientation="horizontal"
+				>
+					<EditText
+						android:id="@+id/timeout_connections"
+						android:layout_height="wrap_content"
+						android:layout_width="wrap_content"
+						android:ems="3"
+						android:inputType="number"
+						android:singleLine="true"
+						android:gravity="right" />
+					<TextView
+			          android:layout_width="wrap_content"
+			          android:layout_height="wrap_content"
+			          android:text="@string/seconds_label_str"
+			          style="@style/options_label"
+			          android:paddingLeft="5dp"
+			          android:layout_gravity="center_vertical"
+			     	  />
+				</LinearLayout>
                 <TableLayout
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -161,20 +190,6 @@
             
             
         </LinearLayout>
-		<TextView
-	          android:layout_width="wrap_content"
-	          android:layout_height="wrap_content"
-	          android:paddingLeft="2dp"
-	          android:text="@string/timeout_connections_label_str"
-	          style="@style/options_label"
-	     />
-		<EditText
-			android:id="@+id/timeout_connections"
-			android:layout_height="wrap_content"
-			android:layout_width="wrap_content"
-			android:ems="3"
-			android:inputType="number"
-			android:singleLine="true" />
         <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -192,7 +207,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_margin="5dp"
-                android:stretchColumns="0,1" >
+                android:stretchColumns="0,1"
+                android:padding="10dp">
 
                 <TableRow>
 
diff --git a/extras/pandroid_event_viewer/res/values-es/strings.xml b/extras/pandroid_event_viewer/res/values-es/strings.xml
index 567d619d3b..f02b97b8d7 100644
--- a/extras/pandroid_event_viewer/res/values-es/strings.xml
+++ b/extras/pandroid_event_viewer/res/values-es/strings.xml
@@ -75,5 +75,6 @@
 	<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>
 	<string name="empty">- Vacia -</string>
-	<string name="timeout_connections_label_str">Tiempo de espera de las conexiones (en segundos)</string>
+	<string name="timeout_connections_label_str">Tiempo de espera de las conexiones</string>
+	<string name="seconds_label_str">segundos</string>
 </resources>
\ No newline at end of file
diff --git a/extras/pandroid_event_viewer/res/values-ja/strings.xml b/extras/pandroid_event_viewer/res/values-ja/strings.xml
index 1bf3580fca..cbb05f33d6 100644
--- a/extras/pandroid_event_viewer/res/values-ja/strings.xml
+++ b/extras/pandroid_event_viewer/res/values-ja/strings.xml
@@ -76,5 +76,6 @@
 	<string name="validate_event_label_str">承諾済イベント</string>
 	<string name="pandroid_event_viewer_description_str">Pandora FMS リアルタイムイベントビューワ</string>
 	<string name="empty">- 空 -</string>
-	<string name="timeout_connections_label_str">Timeout connections (in seconds)</string>
+	<string name="timeout_connections_label_str">Timeout connections</string>
+	<string name="seconds_label_str">seconds</string>
 </resources>
\ 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 59fee665d4..4367026255 100644
--- a/extras/pandroid_event_viewer/res/values/strings.xml
+++ b/extras/pandroid_event_viewer/res/values/strings.xml
@@ -122,6 +122,7 @@
     <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>
-    <string name="timeout_connections_label_str">Timeout connections (in seconds)</string>
+    <string name="timeout_connections_label_str">Timeout connections</string>
+    <string name="seconds_label_str">seconds</string>
 
 </resources>
\ No newline at end of file