Enhance Entry widget

Signed-off-by: Seunghyun Choi <sh4682.choi@samsung.com>
Change-Id: I92e24bba3d5c3bedab8132152a00cb3847b90ad4

3 files changed, 194 insertions, 9 deletions

diff --git a/ElmSharp.Test/ElmSharp.Test.csproj b/ElmSharp.Test/ElmSharp.Test.csproj
index 9014a3e..31b0e5b 100755..100644
--- a/ElmSharp.Test/ElmSharp.Test.csproj
+++ b/ElmSharp.Test/ElmSharp.Test.csproj
@@ -46,6 +46,7 @@
     <Compile Include="TC\BackgroundTest2.cs" />
     <Compile Include="TC\BackgroundTest3.cs" />
     <Compile Include="TC\EcoreTimerTest1.cs" />
+    <Compile Include="TC\EntryTest3.cs" />
     <Compile Include="TC\EvasMapTest2.cs" />
     <Compile Include="TC\GenListTest10.cs" />
     <Compile Include="TC\ImageTest4.cs" />
@@ -126,12 +127,6 @@
     <None Include="test.sh" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ElmSharp\ElmSharp.csproj">
-      <Project>{7b15af72-70cc-11e6-ae37-eb727f0bd84e}</Project>
-      <Name>ElmSharp</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="res\btn_delete.png" />
     <Content Include="res\picture.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -184,6 +179,12 @@
     <Content Include="shared\res\ElmSharp.Test.png" />
     <Content Include="tizen-manifest.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="ElmSharp, Version=1.2.0.0, Culture=neutral, PublicKeyToken=3836ec6cd2c91e8b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\ElmSharp\bin\Debug\netstandard1.3\ElmSharp.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -214,4 +215,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/ElmSharp.Test/TC/EntryTest1.cs b/ElmSharp.Test/TC/EntryTest1.cs
index c77101a..2dc8437 100644
--- a/ElmSharp.Test/TC/EntryTest1.cs
+++ b/ElmSharp.Test/TC/EntryTest1.cs
@@ -65,18 +65,100 @@ namespace ElmSharp.Test
 
             Entry entry3 = new Entry(window)
             {
+                AlignmentX = -1,
+                AlignmentY = 0,
+                WeightX = 1,
+                WeightY = 1,
                 IsSingleLine = true,
                 Scrollable = true,
             };
             entry3.SetPartText("guide", "<span color=#808080FF font_size=28 align=left valign=top wrap=mixed>Enter a System.Double</span>");
-            entry3.Geometry = new Rect(0, 163, 720, 37);
+            //entry3.Geometry = new Rect(0, 163, 720, 37);
             entry3.Show();
 
+            var capital1 = new Entry(window)
+            {
+                AlignmentX = -1,
+                AlignmentY = 0,
+                WeightX = 1,
+                WeightY = 1,
+                Text = "Auto Capital : Word",
+                AutoCapital = AutoCapital.Word
+            };
+
+            var capital2 = new Entry(window)
+            {
+                AlignmentX = -1,
+                AlignmentY = 0,
+                WeightX = 1,
+                WeightY = 1,
+                Text = "Auto Capital : Sentence",
+                AutoCapital = AutoCapital.Sentence
+            };
+
+            var capital3 = new Entry(window)
+            {
+                AlignmentX = -1,
+                AlignmentY = 0,
+                WeightX = 1,
+                WeightY = 1,
+                Text = "Auto Capital : All",
+                AutoCapital = AutoCapital.All
+            };
+
+            var getText = new Entry(window)
+            {
+                AlignmentX = -1,
+                AlignmentY = 0,
+                WeightX = 1,
+                WeightY = 1,
+                Text = "get cursor content test",
+            };
+
+            var label = new Label(window)
+            {
+                AlignmentX = -1,
+                AlignmentY = 0,
+                WeightX = 1,
+                WeightY = 1,
+            };
+
+            getText.CursorChanged += (s, e) =>
+            {
+                label.Text = getText.GetCursorContent();
+            };
+
+            //var autoSave = new Entry(window)
+            //{
+            //    AlignmentX = -1,
+            //    AlignmentY = 0,
+            //    WeightX = 1,
+            //    WeightY = 1,
+            //    Text = "Auto Save",
+            //    IsAutoSave = true
+            //};
+
+            var btn = new Button(window)
+            {
+            };
+
             box.PackEnd(entry1);
             box.PackEnd(entry2);
+            box.PackEnd(entry3);
+            box.PackEnd(capital1);
+            box.PackEnd(capital2);
+            box.PackEnd(capital3);
+            box.PackEnd(getText);
+            box.PackEnd(label);
 
             entry1.Show();
             entry2.Show();
+            entry3.Show();
+            capital1.Show();
+            capital2.Show();
+            capital3.Show();
+            getText.Show();
+            label.Show();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/ElmSharp.Test/TC/EntryTest3.cs b/ElmSharp.Test/TC/EntryTest3.cs
new file mode 100644
index 0000000..755f887
--- /dev/null
+++ b/ElmSharp.Test/TC/EntryTest3.cs
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using ElmSharp;
+
+namespace ElmSharp.Test
+{
+    class EntryTest3 : TestCaseBase
+    {
+        public override string TestName => "EntryTest3";
+        public override string TestDescription => "To test basic operation of Entry";
+
+        public override void Run(Window window)
+        {
+            Background bg = new Background(window)
+            {
+                AlignmentX = -1,
+                AlignmentY = -1,
+                WeightX = 1,
+                WeightY = 1,
+                Color = Color.Yellow
+            };
+            bg.Show();
+            window.AddResizeObject(bg);
+
+            Conformant conformant = new Conformant(window);
+            conformant.Show();
+            Box box = new Box(window);
+            conformant.SetContent(box);
+            box.Show();
+
+            Entry entry = new Entry(window)
+            {
+                AlignmentX = -1,
+                AlignmentY = 1,
+                WeightX = 1,
+                WeightY = 1,
+                IsSingleLine = true,
+                Text = "Hello, Tizen"
+            };
+
+            var btn = new Button(window)
+            {
+                AlignmentX = -1,
+                AlignmentY = 1,
+                WeightX = 1,
+                WeightY = 1,
+                Text = "Set Filter"
+            };
+            btn.Show();
+
+            //var filter = new Entry.TextFilter(SetFilter);
+            btn.Clicked += (s, e) =>
+            {
+                entry.AppendMarkUpFilter(SetFilter);
+            };
+
+            var btn1 = new Button(window)
+            {
+                AlignmentX = -1,
+                AlignmentY = 1,
+                WeightX = 1,
+                WeightY = 1,
+                Text = "Remove Filter"
+            };
+            btn1.Show();
+            btn1.Clicked += (s, e) =>
+            {
+                entry.RemoveMarkUpFilter(SetFilter);
+            };
+
+            //entry.AppendMarkUpFilter(new Entry.Filter(SetFilter));
+
+            entry.Show();
+            box.PackEnd(entry);
+            box.PackEnd(btn);
+            box.PackEnd(btn1);
+        }
+
+        public string SetFilter(Entry entry, string text)
+        {
+            if (text.Equals("a") || text.Equals("b") || text.Equals("c") || text.Equals("d"))
+                return text;
+            else
+                return "Tizen";
+        }
+    }
+}
\ No newline at end of file