From bf9662d775a9f16a7a525fcebf42d8e31fba3e81 Mon Sep 17 00:00:00 2001
From: Equip de Desenvolupadors de PBE <imanol@imanolbarba.net>
Date: Mon, 10 Dec 2012 14:10:37 +0000
Subject: [PATCH] 

---
 gen/com/upc/pbe/upcnews/R.java            | 45 ++++++++++++++++++++++++++-------------------
 res/values/strings.xml                    |  9 +++++----
 res/xml/prefs.xml                         |  2 +-
 src/com/upc/pbe/upcnews/MainActivity.java |  1 -
 4 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/gen/com/upc/pbe/upcnews/R.java b/gen/com/upc/pbe/upcnews/R.java
index 16e2edf..11ec840 100644
--- a/gen/com/upc/pbe/upcnews/R.java
+++ b/gen/com/upc/pbe/upcnews/R.java
@@ -8,6 +8,10 @@
 package com.upc.pbe.upcnews;
 
 public final class R {
+    public static final class array {
+        public static final int qualityNames=0x7f080000;
+        public static final int qualityValues=0x7f080001;
+    }
     public static final class attr {
     }
     public static final class color {
@@ -38,20 +42,20 @@ public final class R {
         public static final int startbuttontoggle=0x7f020007;
     }
     public static final class id {
-        public static final int LinearLayout1=0x7f0a0001;
-        public static final int RelativeLayout1=0x7f0a0006;
-        public static final int button=0x7f0a0007;
-        public static final int itemhelp=0x7f0a000d;
-        public static final int itemprefs=0x7f0a000c;
-        public static final int listView1=0x7f0a0003;
-        public static final int menu_settings=0x7f0a000b;
-        public static final int rowTextView=0x7f0a000a;
-        public static final int textView1=0x7f0a0004;
-        public static final int textView2=0x7f0a0005;
-        public static final int textViewTitle=0x7f0a0002;
-        public static final int textViewUrl=0x7f0a0009;
-        public static final int textViewXml=0x7f0a0008;
-        public static final int videoView1=0x7f0a0000;
+        public static final int LinearLayout1=0x7f0b0001;
+        public static final int RelativeLayout1=0x7f0b0006;
+        public static final int button=0x7f0b0007;
+        public static final int itemhelp=0x7f0b000d;
+        public static final int itemprefs=0x7f0b000c;
+        public static final int listView1=0x7f0b0003;
+        public static final int menu_settings=0x7f0b000b;
+        public static final int rowTextView=0x7f0b000a;
+        public static final int textView1=0x7f0b0004;
+        public static final int textView2=0x7f0b0005;
+        public static final int textViewTitle=0x7f0b0002;
+        public static final int textViewUrl=0x7f0b0009;
+        public static final int textViewXml=0x7f0b0008;
+        public static final int videoView1=0x7f0b0000;
     }
     public static final class layout {
         public static final int activity_video=0x7f030000;
@@ -61,14 +65,15 @@ public final class R {
         public static final int rowlayout=0x7f030004;
     }
     public static final class menu {
-        public static final int activity_main=0x7f090000;
-        public static final int activity_video=0x7f090001;
-        public static final int menu=0x7f090002;
+        public static final int activity_main=0x7f0a0000;
+        public static final int activity_video=0x7f0a0001;
+        public static final int menu=0x7f0a0002;
     }
     public static final class string {
         public static final int app_name=0x7f070000;
         public static final int button=0x7f07000c;
         public static final int button1=0x7f07000d;
+        public static final int defaultQuality=0x7f070016;
         public static final int defaultURL=0x7f070013;
         public static final int desc=0x7f070009;
         public static final int descarregar=0x7f070003;
@@ -80,6 +85,8 @@ public final class R {
         public static final int hint=0x7f070004;
         public static final int menu_settings=0x7f070001;
         public static final int prefs=0x7f070007;
+        public static final int qual=0x7f070014;
+        public static final int qual_hint=0x7f070015;
         public static final int startbuttondescription=0x7f07000f;
         public static final int title=0x7f07000e;
         public static final int title_activity_main=0x7f070002;
@@ -88,8 +95,8 @@ public final class R {
         public static final int urlhint=0x7f070006;
     }
     public static final class style {
-        public static final int AppTheme=0x7f080000;
-        public static final int leBoldText=0x7f080001;
+        public static final int AppTheme=0x7f090000;
+        public static final int leBoldText=0x7f090001;
     }
     public static final class xml {
         public static final int prefs=0x7f040000;
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 820bde0..c0c4a3f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5,8 +5,8 @@
     <string name="title_activity_main">UPC NEWS</string>
     <string name="descarregar">Start Application</string>
     <string name="hint">Touch to Start.</string>
-    <string name="url">Server URL</string>
-    <string name="urlhint">Set the server route (without http://)</string>
+    <string name="url">URL del Servidor</string>
+    <string name="urlhint">Direcció URL del servidor a connectarse (sense http://)</string>
     <string name="prefs">Preferences</string>
     <string name="help">Help</string>
     <string name="desc">Play</string>
@@ -27,8 +27,8 @@
         siusplau dirigeixi\'s a la Universitat o escrigui un mail als desenvolupadors.\n\n Necessària la instal·lació 
         de la llibreria Vitamio per reproduïr arxius .ts</string>
     <string name="defaultURL">imanolbarba.myftp.biz/PBE</string>
-    <string name="qual">Quality</string>
-    <string name="qual_hint">Which is the default quality?</string>
+    <string name="qual">Qualitat de reproducció</string>
+    <string name="qual_hint">Qualitat inicial de reproducció</string>
     <string-array name="qualityNames">
         <item >High Quality</item>
         <item >Medium Quality</item>
@@ -39,5 +39,6 @@
         <item >1</item>
         <item >2</item>
     </string-array>
+    <string name="defaultQuality">0</string>
 
 </resources>
\ No newline at end of file
diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
index b251b64..512ee15 100644
--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
     <EditTextPreference android:key="server" android:title="@string/url" android:summary="@string/urlhint" android:defaultValue="@string/defaultURL"/>
-    <ListPreference android:title="@string/qual" android:summary="@string/qual_hint" android:key="quality" android:entries="@array/qualityNames" android:entryValues="@array/qualityValues"/>
+    <ListPreference android:title="@string/qual" android:summary="@string/qual_hint" android:key="quality" android:entries="@array/qualityNames" android:entryValues="@array/qualityValues" android:defaultValue="@string/defaultQuality"/>
     </PreferenceScreen>
\ No newline at end of file
diff --git a/src/com/upc/pbe/upcnews/MainActivity.java b/src/com/upc/pbe/upcnews/MainActivity.java
index 5737718..979f81f 100644
--- a/src/com/upc/pbe/upcnews/MainActivity.java
+++ b/src/com/upc/pbe/upcnews/MainActivity.java
@@ -105,7 +105,6 @@ public class MainActivity extends Activity implements OnClickListener {
 	 * Que cojones pasa con los codecs -- Imanol
 	 * Descarga en segundo plano (Mejora dificil)
 	 * Lentitud descarga -- Todos (este miercoles)
-	 * Añadir selector de starting quality en preferencias (lo dijimos en el reqspec!)
 	 * Poner la defaultURL al server de PBE
 	 * Unificar la lengua de todo (WERT STYLE FUCK YES) y que cada uno documente minimamente su codigo
 	 * Borrar esta puta mierda
--
libgit2 0.22.2