From: Jinjin Shi Date: Sat, 29 Dec 2012 06:59:50 +0000 (+0800) Subject: [UI]Change font X-Git-Tag: 2.1b_release~2^2~21^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a3866fad97a4ebf5a173211f485e0d4d11583fc;p=apps%2Fcore%2Fpreloaded%2Flockscreen.git [UI]Change font Change-Id: I31b22cb77110cb7dfc365ed0dd804b6fc0883c5c --- diff --git a/data/groups/lock-complex-password.edc b/data/groups/lock-complex-password.edc index 7173288..bc07e49 100755 --- a/data/groups/lock-complex-password.edc +++ b/data/groups/lock-complex-password.edc @@ -154,8 +154,8 @@ align: 0.5 0.5; \ color: 255 255 255 255; \ text { \ - font: "SLP:style=Bold"; \ - text_class: "slp"; \ + font: "Tizen:style=Bold"; \ + text_class: "tizen"; \ text: ""; \ size: 48; \ min: 0 0; \ @@ -267,8 +267,8 @@ group{ rel1 {relative: 0.0 122/1280; to: "bg";} rel2 {relative: 1.0 (122+110)/1280; to: "bg";} text{ - font: "SLP:style=Medium"; - text_class: "slp"; + font: "Tizen:style=Medium"; + text_class: "tizen"; size: 36; align: 0.5 0.5; } @@ -323,8 +323,8 @@ group{ rel1 {relative: 42/720 1.0; to_x: "bg"; to_y: "rect.password"; offset: 0 40;} rel2 {relative: (720-42)/720 1.0; to_x: "bg"; to_y: "rect.password"; offset: 0 40;} text{ - font: "SLP:style=Medium"; - text_class: "slp"; + font: "Tizen:style=Medium"; + text_class: "tizen"; size: 36; align: 0.5 0.5; } @@ -895,8 +895,8 @@ group{ align: 0.5 0.5; color: 255 255 255 255; text { - font: "SLP:style=Bold"; - text_class: "slp"; + font: "Tizen:style=Bold"; + text_class: "tizen"; text: "?123"; size: 26; min: 0 0; @@ -986,8 +986,8 @@ group{ align: 0.5 0.5; color: 255 255 255 255; text { - font: "SLP:style=Bold"; - text_class: "slp"; + font: "Tizen:style=Bold"; + text_class: "tizen"; text: " "; size: 26; min: 0 0; diff --git a/data/groups/lock-info.edc b/data/groups/lock-info.edc index d8dd236..ba2a3ad 100755 --- a/data/groups/lock-info.edc +++ b/data/groups/lock-info.edc @@ -110,8 +110,8 @@ to: "rect.clock"; } text{ - font: "SLP:style=Medium"; - text_class: "slp"; + font: "Tizen:style=Medium"; + text_class: "tizen"; size: 130; align: 0.0 0.5; } @@ -132,8 +132,8 @@ to: "rect.clock.ampm"; } text{ - font: "SLP:style=Medium"; - text_class: "slp"; + font: "Tizen:style=Medium"; + text_class: "tizen"; size: 46; align: 0.0 0.5; } @@ -154,8 +154,8 @@ to: "rect.date"; } text{ - font: "SLP:style=Medium"; - text_class: "slp"; + font: "Tizen:style=Medium"; + text_class: "tizen"; size: 40; align: 0.0 0.5; } @@ -195,8 +195,8 @@ to: "rect.helptext"; } text{ - font: "SLP:style=Medium"; - text_class: "slp"; + font: "Tizen:style=Medium"; + text_class: "tizen"; size: 32; align: 0.5 1.0; } diff --git a/data/groups/lock-main.edc b/data/groups/lock-main.edc index a13397d..45a7949 100755 --- a/data/groups/lock-main.edc +++ b/data/groups/lock-main.edc @@ -95,8 +95,8 @@ to: "bg"; } text{ - font: "SLP:style=Medium"; - text_class: "slp"; + font: "Tizen:style=Medium"; + text_class: "tizen"; size: 100; align: 0.0 0.5; text: "Life Magazine"; @@ -146,8 +146,8 @@ to: "bg"; } text{ - font: "SLP:style=Bold"; - text_class: "slp"; + font: "Tizen:style=Bold"; + text_class: "tizen"; size: 26; align: 0.0 0.5; } diff --git a/data/groups/lock-noti.edc b/data/groups/lock-noti.edc index 1ca54ac..64e8354 100755 --- a/data/groups/lock-noti.edc +++ b/data/groups/lock-noti.edc @@ -25,8 +25,8 @@ rel2 { relative: 1.0 48*num/144; to: topart; }\ text {\ text: "";\ - font: "SLP:style=Medium";\ - text_class: "slp_medium";\ + font: "Tizen:style=Medium";\ + text_class: "tizen";\ size: 36;\ align: 0.0 0.5;\ }\ diff --git a/data/groups/lock-simple-password.edc b/data/groups/lock-simple-password.edc index 13da98e..8d422d0 100755 --- a/data/groups/lock-simple-password.edc +++ b/data/groups/lock-simple-password.edc @@ -125,7 +125,7 @@ font: button_text_font; \ text: button_text; \ size: button_text_size; \ - text_class: "slp";\ + text_class: "tizen";\ min: 0 0; \ align: 0.5 0.5; \ } \ @@ -201,8 +201,8 @@ group{ rel1 {relative: 0.0 122/1280; to: "bg";} rel2 {relative: 1.0 (122+110)/1280; to: "bg";} text{ - font: "SLP:style=Medium"; - text_class: "slp"; + font: "Tizen:style=Medium"; + text_class: "tizen"; size: 36; align: 0.5 0.5; } @@ -225,8 +225,8 @@ group{ rel1 {relative: 42/720 1.0; to_x: "bg"; to_y: "password_box1"; offset: 0 40;} rel2 {relative: (720-42)/720 1.0; to_x: "bg"; to_y: "password_box1"; offset: 0 40;} text{ - font: "SLP:style=Medium"; - text_class: "slp"; + font: "Tizen:style=Medium"; + text_class: "tizen"; size: 36; align: 0.5 0.5; } @@ -316,18 +316,18 @@ group{ } } - PART_KEYPAD_BUTTON_NUMBER("1", 0, 0, "ls_button_default.png", "ls_button_press.png", "1", "SLP:style=Roman", 60) - PART_KEYPAD_BUTTON_NUMBER("2", NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X, 0, "ls_button_default.png", "ls_button_press.png", "2", "SLP:style=Roman", 60) - PART_KEYPAD_BUTTON_NUMBER("3", 2*(NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X), 0, "ls_button_default.png", "ls_button_press.png", "3", "SLP:style=Roman", 60) - PART_KEYPAD_BUTTON_NUMBER("4", 0, NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y, "ls_button_default.png", "ls_button_press.png", "4", "SLP:style=Roman", 60) - PART_KEYPAD_BUTTON_NUMBER("5", NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X, NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y, "ls_button_default.png", "ls_button_press.png", "5", "SLP:style=Roman", 60) - PART_KEYPAD_BUTTON_NUMBER("6", 2*(NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X), NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y, "ls_button_default.png", "ls_button_press.png", "6", "SLP:style=Roman", 60) - PART_KEYPAD_BUTTON_NUMBER("7", 0, 2*(NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y), "ls_button_default.png", "ls_button_press.png", "7", "SLP:style=Roman", 60) - PART_KEYPAD_BUTTON_NUMBER("8", NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X, 2*(NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y), "ls_button_default.png", "ls_button_press.png", "8", "SLP:style=Roman", 60) - PART_KEYPAD_BUTTON_NUMBER("9", 2*(NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X), 2*(NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y), "ls_button_default.png", "ls_button_press.png", "9", "SLP:style=Roman", 60) - PART_KEYPAD_BUTTON_NUMBER("SOS", 0, 3*(NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y), "ls_button_default.png", "ls_button_press.png", "", "SLP:style=Roman", 60) - PART_KEYPAD_BUTTON_NUMBER("0", NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X, 3*(NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y), "ls_button_default.png", "ls_button_press.png", "0", "SLP:style=Roman", 60) - PART_KEYPAD_BUTTON_NUMBER("Backspace", 2*(NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X), 3*(NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y), "ls_button_default.png", "ls_button_press.png", "", "SLP:style=Roman", 60) + PART_KEYPAD_BUTTON_NUMBER("1", 0, 0, "ls_button_default.png", "ls_button_press.png", "1", "Tizen:style=Roman", 60) + PART_KEYPAD_BUTTON_NUMBER("2", NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X, 0, "ls_button_default.png", "ls_button_press.png", "2", "Tizen:style=Roman", 60) + PART_KEYPAD_BUTTON_NUMBER("3", 2*(NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X), 0, "ls_button_default.png", "ls_button_press.png", "3", "Tizen:style=Roman", 60) + PART_KEYPAD_BUTTON_NUMBER("4", 0, NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y, "ls_button_default.png", "ls_button_press.png", "4", "Tizen:style=Roman", 60) + PART_KEYPAD_BUTTON_NUMBER("5", NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X, NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y, "ls_button_default.png", "ls_button_press.png", "5", "Tizen:style=Roman", 60) + PART_KEYPAD_BUTTON_NUMBER("6", 2*(NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X), NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y, "ls_button_default.png", "ls_button_press.png", "6", "Tizen:style=Roman", 60) + PART_KEYPAD_BUTTON_NUMBER("7", 0, 2*(NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y), "ls_button_default.png", "ls_button_press.png", "7", "Tizen:style=Roman", 60) + PART_KEYPAD_BUTTON_NUMBER("8", NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X, 2*(NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y), "ls_button_default.png", "ls_button_press.png", "8", "Tizen:style=Roman", 60) + PART_KEYPAD_BUTTON_NUMBER("9", 2*(NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X), 2*(NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y), "ls_button_default.png", "ls_button_press.png", "9", "Tizen:style=Roman", 60) + PART_KEYPAD_BUTTON_NUMBER("SOS", 0, 3*(NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y), "ls_button_default.png", "ls_button_press.png", "", "Tizen:style=Roman", 60) + PART_KEYPAD_BUTTON_NUMBER("0", NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X, 3*(NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y), "ls_button_default.png", "ls_button_press.png", "0", "Tizen:style=Roman", 60) + PART_KEYPAD_BUTTON_NUMBER("Backspace", 2*(NUMBER_KEYPAD_BUTTON_WIDTH+NUMBER_KEYPAD_BUTTON_PAD_X), 3*(NUMBER_KEYPAD_BUTTON_HEIGHT-NUMBER_KEYPAD_BUTTON_PAD_Y), "ls_button_default.png", "ls_button_press.png", "", "Tizen:style=Roman", 60) part{ name: "img.sos"; type: IMAGE; diff --git a/data/lockscreen-entry.edc b/data/lockscreen-entry.edc index 4115a70..fb0c635 100755 --- a/data/lockscreen-entry.edc +++ b/data/lockscreen-entry.edc @@ -23,27 +23,27 @@ collections { styles { style { name: "entry_single_textblock_style"; - base: "font=SLP:style=Light text_class=slp font_size=88 color=#F9F9F9FF wrap=none"; + base: "font=Tizen:style=Light text_class=tizen font_size=88 color=#F9F9F9FF wrap=none"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; - tag: "em" "+ font=SLP:style=Oblique"; - tag: "b" "+ font=SLP:style=Bold"; + tag: "em" "+ font=Tizen:style=Oblique"; + tag: "b" "+ font=Tizen:style=Bold"; tag: "link" "+ color=#800 underline=on underline_color=#8008"; - tag: "hilight" "+ font=SLP:style=Bold"; + tag: "hilight" "+ font=Tizen:style=Bold"; tag: "preedit" "+ underline=on underline_color=#000000FF"; tag: "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF"; } style { name: "entry_single_textblock_disabled_style"; - base: "font=SLP:style=Light text_class=slp font_size=88 color=#00000080 wrap=none"; + base: "font=Tizen:style=Light text_class=tizen font_size=88 color=#00000080 wrap=none"; tag: "br" "\n"; tag: "ps" "ps"; tag: "tab" "\t"; - tag: "em" "+ font=SLP:style=Oblique"; - tag: "b" "+ font=SLP:style=Bold"; + tag: "em" "+ font=Tizen:style=Oblique"; + tag: "b" "+ font=Tizen:style=Bold"; tag: "link" "+ color=#00000080 underline=on underline_color=#00000080"; - tag: "hilight" "+ font=SLP:style=Bold"; + tag: "hilight" "+ font=Tizen:style=Bold"; tag: "preedit" "+ underline=on underline_color=#000000FF"; tag: "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF"; }