Fix crash in setting font type

Change-Id: I7377f60805a3c6c3a66ea0ff8aff6366654f72d9
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

diff --git a/SettingMain/SettingContent_Display.cs b/SettingMain/SettingContent_Display.cs
index 3ce1589788e7b269821a6987ac4b03dddc180a36..52ac10621e998c95b7d549417c016d4f21cce847 100644 (file)
--- a/SettingMain/SettingContent_Display.cs
+++ b/SettingMain/SettingContent_Display.cs
@@ -144,7 +144,8 @@ namespace SettingMain
             }\r
 \r
 \r
-            item = SettingItemCreator.CreateItemWithCheck(Resources.IDS_ST_BODY_THEME, SettingContent_Theme.GetThemeName());\r
+            //item = SettingItemCreator.CreateItemWithCheck(Resources.IDS_ST_BODY_THEME, SettingContent_Theme.GetThemeName());\r
+            item = SettingItemCreator.CreateItemWithCheck(Resources.IDS_ST_BODY_THEME);\r
             if (item != null)\r
             {\r
                 item.Clicked += (o, e) =>\r

diff --git a/SettingMain/SettingContent_Fonttype.cs b/SettingMain/SettingContent_Fonttype.cs
index 7a883db983cb61e2e9b0808e1b208d5a513502e6..d7c0d1422229451f4893e00b89fc7850aabd2359 100644 (file)
--- a/SettingMain/SettingContent_Fonttype.cs
+++ b/SettingMain/SettingContent_Fonttype.cs
@@ -52,35 +52,9 @@ namespace SettingMain
         {\r
             FonttypeList = new ArrayList();\r
 \r
-\r
             FonttypeList.Add(SystemSettings.FontType);\r
-\r
-#if false\r
-            string sharedData = "/opt/usr/data";\r
-            string type = sharedData + "/settings/Alerts";\r
-\r
-            Tizen.Log.Debug("NUI", String.Format("fonttype type : {0}", type));\r
-\r
-            System.IO.DirectoryInfo d = new System.IO.DirectoryInfo(type);\r
-\r
-            int i = 0;\r
-\r
-            FileInfo[] wavFiles = d.GetFiles("*.wav");\r
-            foreach (FileInfo file in wavFiles)\r
-            {\r
-                Tizen.Log.Debug("NUI", String.Format("[{0}] {1}", i, file.Name));\r
-                FonttypeList.Add(type +"/"+ file.Name);\r
-                i++;\r
-            }\r
-\r
-            FileInfo[] mp3Files = d.GetFiles("*.mp3");\r
-            foreach (FileInfo file in mp3Files)\r
-            {\r
-                Tizen.Log.Debug("NUI", String.Format("[{0}] {1}", i, file.Name));\r
-                FonttypeList.Add(type + "/" + file.Name);\r
-                i++;\r
-            }\r
-#endif\r
+            Tizen.Log.Debug("NUI", "SystemSettings.DefaultFontType : "+ SystemSettings.DefaultFontType);\r
+            Tizen.Log.Debug("NUI", "SystemSettings.FontType : " + SystemSettings.FontType);\r
 \r
         }\r
 \r
@@ -178,7 +152,18 @@ namespace SettingMain
 \r
         private static void SetFonttype(string fonttype)\r
         {\r
-            SystemSettings.FontType = fonttype;\r
+            try\r
+            {\r
+                if (fonttype.Equals("Default")) {\r
+                    fonttype = SystemSettings.DefaultFontType;\r
+                }\r
+                SystemSettings.FontType = fonttype;\r
+            }\r
+            catch (Exception e)\r
+            {\r
+                Tizen.Log.Debug("NUI", string.Format("error :({0}) {1} ", e.GetType().ToString(), e.Message));\r
+            }\r
+\r
         }\r
 \r
         public static string GetFonttype()\r

diff --git a/packaging/org.tizen.cssettings-1.0.0.tpk b/packaging/org.tizen.cssettings-1.0.0.tpk
index d8d9a390987edc6e8eb67e5047351f1dabfdf97e..6e3fb578bc37186976cc2803ab4e736e0193198b 100644 (file)
Binary files a/packaging/org.tizen.cssettings-1.0.0.tpk and b/packaging/org.tizen.cssettings-1.0.0.tpk differ