fix license install, change font name

Change-Id: If49813d66dd33497d9bf3e3e456a08d9b6884063

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dd8938..549031c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ ADD_SUBDIRECTORY(res)
 # Install manifest
 INSTALL(FILES ${IVUG_PACKAGE_NAME}.xml DESTINATION /usr/share/packages)
 
-INSTALL(FILES LICENSE DESTINATION /usr/share/license RENAME ${IVUG_PACKAGE_NAME})
+INSTALL(FILES LICENSE.Flora DESTINATION /usr/share/license RENAME ${IVUG_PACKAGE_NAME})
 
 IF (BUILD_TC)
        ADD_SUBDIRECTORY(TC)

diff --git a/main/layout/genlist/genlist_group_index.edc b/main/layout/genlist/genlist_group_index.edc
old mode 100644 (file)
new mode 100755 (executable)
index 0a7d820..6792a50
--- a/main/layout/genlist/genlist_group_index.edc
+++ b/main/layout/genlist/genlist_group_index.edc
@@ -253,7 +253,7 @@
                                }
                                color: GENLIST_TEXT_COLOR_BUBBLE_READ_MESSAGE;
                                text {
-                                  font: "SLP:style=Regular";
+                                  font: "Tizen:style=Regular";
                                   size: GENLIST_FONT_28_INC;
                                   min: 0 1;
                                   align: 0.0 0.5;
@@ -316,7 +316,7 @@
                                }
                                color: GENLIST_TEXT_COLOR_BUBBLE_READ_MESSAGE;
                                text {
-                                  font: "SLP:style=Regular";
+                                  font: "Tizen:style=Regular";
                                   size: GENLIST_FONT_28_INC;
                                   min: 0 1;
                                   align: 1.0 0.5;
@@ -363,7 +363,7 @@
                                }
                                color: GENLIST_DIALOGUE_GROUP_TITLE_COLOR;
                                text {
-                                  font: "SLP:style=Medium";
+                                  font: "Tizen:style=Medium";
                                   size: GENLIST_FONT_28_INC;
                                   min: 0 1;
                                   align: 0.0 0.0;

diff --git a/main/layout/genlist/genlist_macro.edc b/main/layout/genlist/genlist_macro.edc
old mode 100644 (file)
new mode 100755 (executable)
index 2fb9c06..44cbd24
--- a/main/layout/genlist/genlist_macro.edc
+++ b/main/layout/genlist/genlist_macro.edc
@@ -2010,7 +2010,7 @@
    text { \
       align: 0 0.5; \
       min: 0 1; \
-      font: "SLP:style=Bold"; \
+      font: "Tizen:style=Bold"; \
       size: GENLIST_GROUPINDEX_LIST_SIZE; \
       text_class: "list_item"; \
    }
@@ -2021,7 +2021,7 @@
    text { \
       align: 0.0 0.5; \
       min: 0 1; \
-      font: "SLP:style=Bold"; \
+      font: "Tizen:style=Bold"; \
       size: GENLIST_DIALOGUE_GROUP_TITLE_SIZE; \
       text_class: "list_item"; \
    }
@@ -2030,7 +2030,7 @@
 #define GENLIST_PARAM_PASSWORD_TITLE \
    color: DIALOGUE_PASSWORD_TITLE_COLOR; \
    text { \
-      font: "SLP:style=Bold"; \
+      font: "Tizen:style=Bold"; \
       size: DIALOGUE_PASSWORD_TITLE_SIZE; \
       min: 0 1; \
       align: 0 0.5; \
@@ -2043,7 +2043,7 @@
    text { \
       align: 0 0.5; \
       min: 0 1; \
-      font: "SLP:style=Regular"; \
+      font: "Tizen:style=Regular"; \
       size: GENLIST_LIST_MAIN_TEXT_SIZE; \
       text_class: "list_item"; \
    }
@@ -2066,9 +2066,9 @@
    text { \
       align: 0 0.5; \
       min: 0 1; \
-      font: "SLP:style=Medium"; \
+      font: "Tizen:style=Medium"; \
       size: GENLIST_LIST_SUB_TEXT_SIZE; \
-      text_class: "slp"; \
+      text_class: "tizen"; \
    }
 
 #define GENLIST_PARAM_SUBITEM_SETTINGS \
@@ -2076,9 +2076,9 @@
    text { \
       align: 0 0.5; \
       min: 0 1; \
-      font: "SLP:style=Medium"; \
+      font: "Tizen:style=Medium"; \
       size: GENLIST_LIST_SUB_TEXT_SIZE; \
-      text_class: "slp"; \
+      text_class: "tizen"; \
    }
 
 #define GENLIST_PARAM_SUBITEM_DEFAULT_TB \
@@ -2104,7 +2104,7 @@
    text { \
       align: 0 0.5; \
       min: 0 1; \
-      font: "SLP:style=Bold"; \
+      font: "Tizen:style=Bold"; \
       size: GENLIST_APPS_NAME_SIZE; \
       text_class: "list_item"; \
    }
@@ -2114,7 +2114,7 @@
    text { \
       align: 0 0.5; \
       min: 0 1; \
-      font: "SLP:style=Bold"; \
+      font: "Tizen:style=Bold"; \
       size: GENLIST_APPS_INC_SIZE; \
       text_class: "list_item"; \
    }
@@ -2124,7 +2124,7 @@
    text { \
       align: 0 0.5; \
       min: 0 1; \
-      font: "SLP:style=Bold"; \
+      font: "Tizen:style=Bold"; \
       size: GENLIST_APPS_RATING_SIZE; \
       text_class: "list_item"; \
    }
@@ -2134,7 +2134,7 @@
    text { \
       align: 0 0.5; \
       min: 0 1; \
-      font: "SLP:style=Bold"; \
+      font: "Tizen:style=Bold"; \
       size: GENLIST_APPS_PRICE_SIZE; \
       text_class: "list_item"; \
    }
@@ -2144,7 +2144,7 @@
    text { \
       align: 0 0.5; \
       min: 0 1; \
-      font: "SLP:style=Bold"; \
+      font: "Tizen:style=Bold"; \
       size: GENLIST_APPS_PRICE_SIZE; \
       text_class: "list_item"; \
    }
@@ -2154,9 +2154,9 @@
    text { \
       align: 0 0.5; \
       min: 0 1; \
-      font: "SLP:style=Regular"; \
+      font: "Tizen:style=Regular"; \
       size: GENLIST_CONTENTS_TEXT_SIZE; \
-      text_class: "slp"; \
+      text_class: "tizen"; \
    }
 
 /*************************** Descriptions **********************************/
@@ -2554,9 +2554,9 @@
    text { \
       align: 1 0.5; \
       min: 0 1; \
-      font: "SLP:style=Bold"; \
+      font: "Tizen:style=Bold"; \
       size: GENLIST_LIST_BUBBLE_TEXT_SIZE; \
-      text_class: "slp"; \
+      text_class: "tizen"; \
    }
 
 #define GENLIST_PART_LIST_BUBBLE_TEXT_RTB(NAME, HEIGHT, RIGHT, TOP, BOTTOM) \

diff --git a/main/layout/ivug-naviframe.edc b/main/layout/ivug-naviframe.edc
index cb7633c..cff998d 100755 (executable)
--- a/main/layout/ivug-naviframe.edc
+++ b/main/layout/ivug-naviframe.edc
@@ -219,12 +219,12 @@ collections {
             clip_to: "title_clip";
            effect: SHADOW BOTTOM;
             description { state: "default" 0.0;
-               text { font: "SLP:style=Medium";
+               text { font: "Tizen:style=Medium";
                   size: NAVIFRAME_TITLE_FONT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
                   align: 0.0 0.5;
-                  text_class: "slp";
+                  text_class: "tizen";
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
               color2: 0 0 0 128;
@@ -236,12 +236,12 @@ collections {
             }
             description { state: "subtitle_is_set" 0.0;
                inherit: "default" 0.0;
-               text { font: "SLP:style=Medium";
+               text { font: "Tizen:style=Medium";
                   size: NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
                   align: 0.0 0.2;
-                  text_class: "slp";
+                  text_class: "tizen";
                }
                align: 0.0 0.0;
                rel1 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "top_padding"; }
@@ -252,11 +252,11 @@ collections {
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               text { font: "SLP:style=Medium";
+               text { font: "Tizen:style=Medium";
                   size: NAVIFRAME_SUBTITLE_FONT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
-                  text_class: "slp";
+                  text_class: "tizen";
                   align: 0.0 1.0;
                }
                color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC;
@@ -981,12 +981,12 @@ collections {
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               text { font: "SLP:style=Medium";
+               text { font: "Tizen:style=Medium";
                   size: NAVIFRAME_TITLE_FONT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
                   align: 0.0 0.5;
-                  text_class: "slp";
+                  text_class: "tizen";
                }
                color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
                align: 0.0 0.5;
@@ -996,12 +996,12 @@ collections {
             }
             description { state: "subtitle_is_set" 0.0;
                inherit: "default" 0.0;
-               text { font: "SLP:style=Medium";
+               text { font: "Tizen:style=Medium";
                   size: NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
                   align: 0.0 0.2;
-                  text_class: "slp";
+                  text_class: "tizen";
                }
                align: 0.0 0.0;
                rel1 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "top_padding"; }
@@ -1012,11 +1012,11 @@ collections {
             scale: 1;
             clip_to: "title_clip";
             description { state: "default" 0.0;
-               text { font: "SLP:style=Medium";
+               text { font: "Tizen:style=Medium";
                   size: NAVIFRAME_SUBTITLE_FONT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
-                  text_class: "slp";
+                  text_class: "tizen";
                   align: 0.0 1.0;
                }
                color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC;

diff --git a/main/layout/ivug-popup.edc b/main/layout/ivug-popup.edc
old mode 100644 (file)
new mode 100755 (executable)
index e1412a9..8561c75
--- a/main/layout/ivug-popup.edc
+++ b/main/layout/ivug-popup.edc
@@ -130,7 +130,7 @@ collections {
                                mouse_events: 0;\r
                                description { state: "default" 0.0;\r
                                        text {\r
-                                               font: "SLP:style=Medium";\r
+                                               font: "Tizen:style=Medium";\r
                                                size: 36;\r
                                                min: 0 0;\r
                                                align: 0.5 0.5;\r

diff --git a/main/layout/ivug-selectioninfo.edc b/main/layout/ivug-selectioninfo.edc
old mode 100644 (file)
new mode 100755 (executable)
index eb5c757..a191418
--- a/main/layout/ivug-selectioninfo.edc
+++ b/main/layout/ivug-selectioninfo.edc
@@ -58,10 +58,10 @@ collections {
                    rel2 { to: "bg"; }
                    color: SELECTION_INFO_TEXT_COLOR_INC;
                    text {
-                      font: "SLP";
+                      font: "Tizen";
                           size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
                       text: "";
-                      text_class: "slp";
+                      text_class: "tizen";
                    }
                 }
              }
@@ -119,10 +119,10 @@ collections {
                    rel2 { to: "base"; }
                    color: SELECTION_INFO_TEXT_COLOR_INC;
                    text {
-                      font: "SLP";
+                      font: "Tizen";
                           size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
                       text: "";
-                      text_class: "slp";
+                      text_class: "tizen";
                    }
                 }
              }
@@ -182,10 +182,10 @@ collections {
                    rel2 { to: "base"; }
                    color: SELECTION_INFO_TEXT_COLOR_INC;
                    text {
-                      font: "SLP";
+                      font: "Tizen";
                           size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
                       text: "";
-                      text_class: "slp";
+                      text_class: "tizen";
                    }
                 }
              }
@@ -229,10 +229,10 @@ collections {
                    rel2 { to: "bg"; }
                    color: SELECTION_INFO_TEXT_COLOR_INC;
                    text {
-                      font: "SLP";
+                      font: "Tizen";
                           size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
                       text: "";
-                      text_class: "slp";
+                      text_class: "tizen";
                    }
                 }
              }
@@ -290,10 +290,10 @@ collections {
                    rel2 { to: "base"; }
                    color: SELECTION_INFO_TEXT_COLOR_INC;
                    text {
-                      font: "SLP";
+                      font: "Tizen";
                       size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
                       text: "";
-                      text_class: "slp";
+                      text_class: "tizen";
                    }
                 }
              }
@@ -353,10 +353,10 @@ collections {
                    rel2 { to: "base"; }
                    color: SELECTION_INFO_TEXT_COLOR_INC;
                    text {
-                      font: "SLP";
+                      font: "Tizen";
                       size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
                       text: "";
-                      text_class: "slp";
+                      text_class: "tizen";
                    }
                 }
              }