tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-11-11 Miguel de Dios <miguel.dedios@artica.es> 

* src/pandroid_event_viewer/pandorafms/About.java,
	res/values-es/strings.xml, res/layout/info.xml,
	res/values-ja/strings.xml, res/values/strings.xml: added ok button
	in the about view.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9048 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-11-11 13:09:29 +00:00
parent 479b58e9d7
commit 710c28cbbd
6 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extras/pandroid_event_viewer/ChangeLog
View File

@ -1,3 +1,10 @@
2013-11-11 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/About.java,
res/values-es/strings.xml, res/layout/info.xml,
res/values-ja/strings.xml, res/values/strings.xml: added ok button
in the about view.
2013-11-11 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/EventList.java: changed the

26
extras/pandroid_event_viewer/res/layout/info.xml
View File

@ -14,10 +14,16 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="15dp" >
android:layout_margin="15dp"
android:orientation="vertical" >
<ScrollView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
>
<LinearLayout
android:layout_width="fill_parent"
@ -90,6 +96,20 @@
android:textColor="#a3a3a3" />
</LinearLayout>
</LinearLayout>
</ScrollView>
</ScrollView>
<Button
android:id="@+id/button_ok_about"
android:text="@string/text_ok_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:background="@drawable/pandora_button"
/>
</LinearLayout>

1
extras/pandroid_event_viewer/res/values-es/strings.xml
View File

@ -79,4 +79,5 @@
<string name="empty">- Vacia -</string>
<string name="timeout_connections_label_str">Tiempo de espera de las conexiones</string>
<string name="seconds_label_str">segundos</string>
<string name="text_ok_button">OK</string>
</resources>

1
extras/pandroid_event_viewer/res/values-ja/strings.xml
View File

@ -80,4 +80,5 @@
<string name="empty">- 空 -</string>
<string name="timeout_connections_label_str">Timeout connections</string>
<string name="seconds_label_str">seconds</string>
<string name="text_ok_button">OK</string>
</resources>

1
extras/pandroid_event_viewer/res/values/strings.xml
View File

@ -96,6 +96,7 @@
<string name="empty">- Empty -</string>
<string name="artica_copyright">Copyright (©) 2011 Artica</string>
<string name="dont_show_again">Don\'t show again</string>
<string name="text_ok_button">OK</string>
<string name="pandorafms_logo_description">PandoraFMS\'s logo</string>
<string name="description">Description</string>
<string name="title">Title</string>

12
extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/About.java
View File

@ -23,6 +23,7 @@ import android.os.Bundle;
import android.text.Html;
import android.text.method.LinkMovementMethod;
import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.TextView;
@ -70,5 +71,16 @@ public class About extends Activity {
}
}
});
Button button = (Button) findViewById(R.id.button_ok_about);
button.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
finish();
}
});
}
}