From 6da6a7b76b3d526b9a1c7d0b40a3d88851ae2186 Mon Sep 17 00:00:00 2001
From: Rey Rey <reyncor@gmail.com>
Date: Wed, 29 Jun 2011 22:09:32 -0400
Subject: [PATCH] =?UTF-8?q?Added=20large=20ime=20option,=20Extended=20Espa?=
 =?UTF-8?q?=C3=B1ol=20support,=20rephrased=20fullscreen=20methodology?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/res/layout/conversations.xml      |  2 +-
 application/res/values-es/strings.xml         | 21 ++++++++++++++++++-
 application/res/values/settings.xml           |  5 ++++-
 application/res/values/strings.xml            |  6 ++++--
 application/res/xml/preferences.xml           |  5 +++++
 .../yaaic/activity/ConversationActivity.java  |  4 ++++
 application/src/org/yaaic/model/Settings.java | 11 ++++++++++
 7 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/application/res/layout/conversations.xml b/application/res/layout/conversations.xml
index b9780a0..b235430 100644
--- a/application/res/layout/conversations.xml
+++ b/application/res/layout/conversations.xml
@@ -73,7 +73,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:inputType="textImeMultiLine"
-            android:imeOptions="actionSend|flagNoExtractUi" />
+            android:imeOptions="actionSend" />
         <Button
             android:id="@+id/speech"
             android:layout_width="wrap_content"
diff --git a/application/res/values-es/strings.xml b/application/res/values-es/strings.xml
index ca148c9..09e286b 100644
--- a/application/res/values-es/strings.xml
+++ b/application/res/values-es/strings.xml
@@ -172,7 +172,8 @@
     <string name="settings_timestamp_desc">Anteponer fecha y hora en todos los mensajes</string>
     <string name="settings_24h_title">Formato de 24 horas</string>
     <string name="settings_24h_desc">Usar formato de 24h para fecha y hora</string>
-    <string name="settings_misc">Misc</string>
+    
+    <string name="settings_misc">Miscelaneo</string>
     <string name="settings_quitmessage_title">Quitar mensaje</string>
     <string name="settings_quitmessage_desc">Mensaje para mostrar cuando te desconectas</string>
     <string name="settings_quitmessage_dialog_title">Mensaje de desconexión</string>
@@ -182,4 +183,22 @@
     <string name="settings_fontsize_dialog_title">Tamaño de la fuente</string>
     <string name="settings_voice_recognition_title">Reconocimiento de voz</string>
     <string name="settings_voice_recognition_desc">Mostrar boton para reconocimiento de voz</string>
+    <string name="settings_joinpartquit_title">Mostrar menjes de partida</string>
+    <string name="settings_joinpartquit_desc">Mostra mensajes cuando jente sale y entra</string>
+    <string name="settings_noticeserverwindow_title">Noticias en ventana del servidor</string>
+    <string name="settings_noticeserverwindow_desc">Muestra noticias del systema en la ventana del servidor</string>
+    <string name="settings_mirc_colors_title">Mostrar colores de mensajes</string>
+    <string name="settings_mirc_colors_desc">Mostrar mensajes mIRC con color</string>
+    <string name="settings_graphical_smilies_title">Mostrar esmilys graficos</string>
+    <string name="settings_graphical_smilies_desc">Esmilys seran convertidos a imagenes</string>
+    <string name="settings_autocorrect_text_title">Auto correjir entradas</string>
+    <string name="settings_autocorrect_text_desc">Usar un diccionario para autocorrejir texto</string>
+    <string name="settings_autocap_sentences_title">Auto-capitalizar mensajes</string>
+    <string name="settings_autocap_sentences_desc">Automaticamenta capitalizar la primera lentra en oraciones</string>
+    <string name="settings_ime_extract_title">Ingresos multilinia</string>
+    <string name="settings_ime_extract_desc">Hace la ventana de ingreso mas grande en modo paisaje</string>
+    <string name="settings_fullscreen_conversation_title">Maximizar chateo</string>
+    <string name="settings_fullscreen_conversation_desc">Maximiza la ventana de chateo</string>
+    <string name="settings_history_size_title">Tamaño de historial</string>
+    <string name="settings_history_size_desc">Numero de linias que debemos mandener en la ventana</string>
 </resources>
diff --git a/application/res/values/settings.xml b/application/res/values/settings.xml
index 2a20305..1fc1562 100644
--- a/application/res/values/settings.xml
+++ b/application/res/values/settings.xml
@@ -54,7 +54,10 @@
     <string name="key_autocap_sentences">autocap_sentences</string>
     <string name="default_autocap_sentences">false</string>
 
-    <string name="key_fullscreen_conversation">fullscreen conversation</string>
+	<string name="key_ime_extract">Large landscape input</string>
+    <string name="default_ime_extract">true</string>
+
+    <string name="key_fullscreen_conversation">Fullscreen chatting</string>
     <string name="default_fullscreen_conversation">false</string>
 
     <string name="key_history_size">history_size</string>
diff --git a/application/res/values/strings.xml b/application/res/values/strings.xml
index 71f7c01..9950785 100644
--- a/application/res/values/strings.xml
+++ b/application/res/values/strings.xml
@@ -220,8 +220,10 @@
     <string name="settings_autocorrect_text_desc">Use dictionary to autocorrect typed text in chat</string>
     <string name="settings_autocap_sentences_title">Auto-capitalize sentences</string>
     <string name="settings_autocap_sentences_desc">Automatically capitalize the first word of sentences</string>
-    <string name="settings_fullscreen_conversation_title">Fullscreen chat window</string>
-    <string name="settings_fullscreen_conversation_desc">Automatically fullscreen the conversation when focused</string>
+    <string name="settings_ime_extract_title">Large landscape input</string>
+    <string name="settings_ime_extract_desc">Makes the landscape input field multilined</string>
+    <string name="settings_fullscreen_conversation_title">Fullscreen chats</string>
+    <string name="settings_fullscreen_conversation_desc">Fullscreen the application when chatting</string>
     <string name="settings_history_size_title">History size</string>
     <string name="settings_history_size_desc">Number of lines of conversation history to keep</string>
 </resources>
diff --git a/application/res/xml/preferences.xml b/application/res/xml/preferences.xml
index d5081fb..d644d40 100644
--- a/application/res/xml/preferences.xml
+++ b/application/res/xml/preferences.xml
@@ -104,6 +104,11 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
             android:summary="@string/settings_autocap_sentences_desc"
             android:key="@string/key_autocap_sentences"
             android:defaultValue="@string/default_autocap_sentences" />
+        <CheckBoxPreference
+            android:title="@string/settings_ime_extract_title"
+            android:summary="@string/settings_ime_extract_desc"
+            android:key="@string/key_ime_extract"
+            android:defaultValue="@string/default_ime_extract" />
         <CheckBoxPreference
             android:title="@string/settings_fullscreen_conversation_title"
             android:summary="@string/settings_fullscreen_conversation_desc"
diff --git a/application/src/org/yaaic/activity/ConversationActivity.java b/application/src/org/yaaic/activity/ConversationActivity.java
index 86c3265..ae44036 100644
--- a/application/src/org/yaaic/activity/ConversationActivity.java
+++ b/application/src/org/yaaic/activity/ConversationActivity.java
@@ -78,6 +78,7 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.View.OnKeyListener;
+import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
@@ -200,6 +201,9 @@ public class ConversationActivity extends Activity implements ServiceConnection,
 
         EditText input = (EditText) findViewById(R.id.input);
         input.setOnKeyListener(inputKeyListener);
+        if (!settings.imeExtract()){
+            input.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
+        }
 
         switcher = (ViewSwitcher) findViewById(R.id.switcher);
 
diff --git a/application/src/org/yaaic/model/Settings.java b/application/src/org/yaaic/model/Settings.java
index f48d780..43448b3 100644
--- a/application/src/org/yaaic/model/Settings.java
+++ b/application/src/org/yaaic/model/Settings.java
@@ -283,6 +283,17 @@ public class Settings
         );
     }
 
+    /**
+     * Whether conversations should be viewed in Fullscreen glory
+     */
+    public boolean imeExtract()
+    {
+        return preferences.getBoolean(
+            resources.getString(R.string.key_ime_extract),
+            Boolean.parseBoolean(resources.getString(R.string.default_ime_extract))
+        );
+    }
+
     /**
      * Whether conversations should be viewed in Fullscreen glory
      */