elm_entry: Do not paste multiple lines in single line entry

diff --git a/ChangeLog b/ChangeLog
index 98ddbef..3fb06bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1348,3 +1348,7 @@
 2013-05-14 Youngbok Shin
 
         * Fix ctxpopup can't be called again in the mobile mode entry.
+
+2013-05-16 Ryuan Choi (ryuan)
+
+        * Fix single line enty got multiple line when pasted multiple line.

diff --git a/data/themes/default-desktop.edc b/data/themes/default-desktop.edc
index 2560007..5abb768 100644 (file)
--- a/data/themes/default-desktop.edc
+++ b/data/themes/default-desktop.edc
@@ -1615,8 +1615,8 @@ collections {
       {
          style { name: "entry_single_textblock_style";
             base: "font=Sans font_size=10 color=#000 wrap=none text_class=entry";
-            tag:  "br" "\n";
-            tag:  "ps" "ps";
+            tag:  "br" "";
+            tag:  "ps" "";
             tag:  "tab" "\t";
             tag:  "em" "+ font=Sans:style=Oblique";
             tag:  "b" "+ font=Sans:style=Bold";
@@ -1625,8 +1625,8 @@ collections {
          }
          style { name: "entry_single_textblock_disabled_style";
             base: "font=Sans font_size=10 color=#00000080 wrap=none text_class=entry";
-            tag:  "br" "\n";
-            tag:  "ps" "ps";
+            tag:  "br" "";
+            tag:  "ps" "";
             tag:  "tab" "\t";
             tag:  "em" "+ font=Sans:style=Oblique";
             tag:  "b" "+ font=Sans:style=Bold";

diff --git a/data/themes/widgets/entry.edc b/data/themes/widgets/entry.edc
index 6f75bcf..bc51121 100644 (file)
--- a/data/themes/widgets/entry.edc
+++ b/data/themes/widgets/entry.edc
@@ -987,6 +987,8 @@ group { name: "elm/entry/base-single/default";
    {
       style { name: "entry_single_textblock_style";
          base: "font=Sans font_size=10 color=#000 wrap=none text_class=entry left_margin=2 right_margin=2";
+         tag:  "br" "";
+         tag:  "ps" "";
          tag:  "em" "+ font_style=Oblique";
          tag:  "link" "+ color=#800 underline=on underline_color=#8008";
          tag:  "hilight" "+ font_weight=Bold";
@@ -995,6 +997,8 @@ group { name: "elm/entry/base-single/default";
       }
       style { name: "entry_single_textblock_disabled_style";
          base: "font=Sans font_size=10 color=#00000080 wrap=none text_class=entry left_margin=2 right_margin=2";
+         tag:  "br" "";
+         tag:  "ps" "";
          tag:  "em" "+ font_style=Oblique";
          tag:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
          tag:  "hilight" "+ font_weight=Bold";
@@ -1003,6 +1007,8 @@ group { name: "elm/entry/base-single/default";
       }
       style { name: "entry_single_textblock_guide_style";
          base: "font=Sans font_size=10 color=#00000080 wrap=none text_class=entry left_margin=2 right_margin=2 ellipsis=0.0";
+         tag:  "br" "";
+         tag:  "ps" "";
          tag:  "em" "+ font_style=Oblique";
          tag:  "hilight" "+ font_weight=Bold";
       }