Disable some symbols in filename layout

Change-Id: I10d6f8d98a6304b471a73621bd0a416259d7222f
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/data/layout/mobile/LYT_LANDSCAPE_QTY_SYM_1.xml b/data/layout/mobile/LYT_LANDSCAPE_QTY_SYM_1.xml
index b6ad087..320e158 100644 (file)
--- a/data/layout/mobile/LYT_LANDSCAPE_QTY_SYM_1.xml
+++ b/data/layout/mobile/LYT_LANDSCAPE_QTY_SYM_1.xml
@@ -83,7 +83,7 @@
         <rec multi="1">}</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="[" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="multiply" longkey_magnifier="true" long_key_value="[" multitouch_type="settle_previous">
       <label>
         <rec multi="0">*</rec>
         <rec multi="1">[</rec>
@@ -95,7 +95,7 @@
         <rec multi="1">]</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="$" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="colon" longkey_magnifier="true" long_key_value="$" multitouch_type="settle_previous">
       <label>
         <rec multi="0">:</rec>
         <rec multi="1">$</rec>
@@ -140,7 +140,7 @@
         <rec>SYM_QTY_2</rec>
       </key_value>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_type="string" long_key_value="¢" multitouch_type="settle_previous">
+    <key use_magnifier="true"  custom_id="divide" longkey_magnifier="true" long_key_type="string" long_key_value="¢" multitouch_type="settle_previous">
       <label>
         <rec multi="0">/</rec>
         <rec multi="1">¢</rec>
@@ -152,7 +152,7 @@
         <rec multi="1">`</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_type="string" long_key_value="°" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="quotation" longkey_magnifier="true" long_key_type="string" long_key_value="°" multitouch_type="settle_previous">
       <label>
         <rec multi="0">"</rec>
         <rec multi="1">°</rec>
@@ -170,13 +170,13 @@
         <rec multi="1">®</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_type="string" long_key_value="©" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="question" longkey_magnifier="true" long_key_type="string" long_key_value="©" multitouch_type="settle_previous">
       <label>
         <rec multi="0">?</rec>
         <rec multi="1">©</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_type="string" long_key_value="¿" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="exclamation" longkey_magnifier="true" long_key_type="string" long_key_value="¿" multitouch_type="settle_previous">
       <label>
         <rec multi="0">!</rec>
         <rec multi="1">¿</rec>

diff --git a/data/layout/mobile/LYT_PORTRAIT_QTY_SYM_1.xml b/data/layout/mobile/LYT_PORTRAIT_QTY_SYM_1.xml
index 58e636c..2f5e53b 100644 (file)
--- a/data/layout/mobile/LYT_PORTRAIT_QTY_SYM_1.xml
+++ b/data/layout/mobile/LYT_PORTRAIT_QTY_SYM_1.xml
@@ -83,7 +83,7 @@
         <rec multi="1">}</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="[" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="multiply" longkey_magnifier="true" long_key_value="[" multitouch_type="settle_previous">
       <label>
         <rec multi="0">*</rec>
         <rec multi="1">[</rec>
@@ -95,7 +95,7 @@
         <rec multi="1">]</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="$" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="colon" longkey_magnifier="true" long_key_value="$" multitouch_type="settle_previous">
       <label>
         <rec multi="0">:</rec>
         <rec multi="1">$</rec>
@@ -140,7 +140,7 @@
         <rec>SYM_QTY_2</rec>
       </key_value>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_type="string" long_key_value="¢" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="divide" longkey_magnifier="true" long_key_type="string" long_key_value="¢" multitouch_type="settle_previous">
       <label>
         <rec multi="0">/</rec>
         <rec multi="1">¢</rec>
@@ -152,7 +152,7 @@
         <rec multi="1">`</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_type="string" long_key_value="°" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="quotation" longkey_magnifier="true" long_key_type="string" long_key_value="°" multitouch_type="settle_previous">
       <label>
         <rec multi="0">"</rec>
         <rec multi="1">°</rec>
@@ -170,13 +170,13 @@
         <rec multi="1">®</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_type="string" long_key_value="©" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="question" longkey_magnifier="true" long_key_type="string" long_key_value="©" multitouch_type="settle_previous">
       <label>
         <rec multi="0">?</rec>
         <rec multi="1">©</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_type="string" long_key_value="¿" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="exclamation" longkey_magnifier="true" long_key_type="string" long_key_value="¿" multitouch_type="settle_previous">
       <label>
         <rec multi="0">!</rec>
         <rec multi="1">¿</rec>

diff --git a/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml b/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml
index c7d5b23..21d3396 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml
@@ -83,7 +83,7 @@
         <rec multi="1">}</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="[" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="multiply" longkey_magnifier="true" long_key_value="[" multitouch_type="settle_previous">
       <label>
         <rec multi="0">*</rec>
         <rec multi="1">[</rec>
@@ -95,7 +95,7 @@
         <rec multi="1">]</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="$" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="colon" longkey_magnifier="true" long_key_value="$" multitouch_type="settle_previous">
       <label>
         <rec multi="0">:</rec>
         <rec multi="1">$</rec>
@@ -140,7 +140,7 @@
         <rec>SYM_QTY_2</rec>
       </key_value>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_type="string" long_key_value="¢" multitouch_type="settle_previous">
+    <key use_magnifier="true"  custom_id="divide" longkey_magnifier="true" long_key_type="string" long_key_value="¢" multitouch_type="settle_previous">
       <label>
         <rec multi="0">/</rec>
         <rec multi="1">¢</rec>
@@ -152,7 +152,7 @@
         <rec multi="1">`</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_type="string" long_key_value="°" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="quotation" longkey_magnifier="true" long_key_type="string" long_key_value="°" multitouch_type="settle_previous">
       <label>
         <rec multi="0">"</rec>
         <rec multi="1">°</rec>
@@ -170,13 +170,13 @@
         <rec multi="1">®</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_type="string" long_key_value="©" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="question" longkey_magnifier="true" long_key_type="string" long_key_value="©" multitouch_type="settle_previous">
       <label>
         <rec multi="0">?</rec>
         <rec multi="1">©</rec>
       </label>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_type="string" long_key_value="¿" multitouch_type="settle_previous">
+    <key use_magnifier="true" custom_id="exclamation" longkey_magnifier="true" long_key_type="string" long_key_value="¿" multitouch_type="settle_previous">
       <label>
         <rec multi="0">!</rec>
         <rec multi="1">¿</rec>

diff --git a/src/ise.cpp b/src/ise.cpp
index 863873d..b83c07c 100644 (file)
--- a/src/ise.cpp
+++ b/src/ise.cpp
@@ -1307,6 +1307,8 @@ ise_show(int ic)
         if (reset_inputmode) {
             ise_reset_context();
 
+            bool filename_layout = false;
+
             /* Turn the shift state off if we need to reset our input mode, only when auto-capitalization is not set  */
             if (!(g_keyboard_state.caps_mode)) {
                 g_ui->set_shift_state(SCL_SHIFT_STATE_OFF);
@@ -1321,6 +1323,19 @@ ise_show(int ic)
                     layout_index = ISE_LAYOUT_STYLE_PASSWD_3X4;
                 }
 
+                if (g_keyboard_state.layout == ISE_LAYOUT_STYLE_NORMAL &&
+                    g_keyboard_state.layout_variation == ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_FILENAME)
+                    filename_layout = true;
+                else
+                    filename_layout = false;
+
+                g_ui->enable_button("exclamation", !filename_layout);
+                g_ui->enable_button("question", !filename_layout);
+                g_ui->enable_button("divide", !filename_layout);
+                g_ui->enable_button("multiply", !filename_layout);
+                g_ui->enable_button("colon", !filename_layout);
+                g_ui->enable_button("quotation", !filename_layout);
+
                 LOGD("new layout index : %d\n", layout_index);
                 const sclchar *old_input_mode = g_ui->get_input_mode();
                 /* If this layout requires specific input mode, set it */