Merge "[Check.edc]Resolving center align issue for check"

diff --git a/debian/changelog b/debian/changelog
index 4b652b3..fb93ef9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+nbeat-theme (0.1.1-59) unstable; urgency=low
+
+  * Package Upload
+  * Git: slp-scm.sec.samsung.net:slp/pkgs/n/nbeat-theme
+  * Tag: nbeat-theme_0.1.1-59
+
+ -- Jaehwan Kim <jae.hwan.kim@samsung.com>  Mon, 11 Jul 2011 16:25:15 +0900
+
+nbeat-theme (0.1.1-58) unstable; urgency=low
+
+  * Package Upload
+  * Git: slp-scm.sec.samsung.net:slp/pkgs/n/nbeat-theme
+  * Tag: nbeat-theme_0.1.1-58
+
+ -- Jaehwan Kim <jae.hwan.kim@samsung.com>  Thu, 07 Jul 2011 13:18:04 +0900
+
 nbeat-theme (0.1.1-57) unstable; urgency=low
 
   * [slider.edc] Slider indicator popup is removed in drag state.

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index c900e6f..b020455 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -8991,7 +8991,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
       }
       styles{
          style { name: "controlbar_style";
-            base: "font=SLP:style=Medium font_size=18 align=center color=BUTTON_CONTROLBAR_ITEM_BUTTON_TEXTBLOCK_COLOR_INC wrap=mixed ellipsis=1";
+            base: "font=SLP:style=Medium font_size=18 align=center color="BUTTON_CONTROLBAR_ITEM_BUTTON_TEXTBLOCK_COLOR_INC" wrap=mixed ellipsis=1";
             tag:  "br" "\n";
             tag:  "ps" "ps";
             tag:  "hilight" "+ font=SLP:style=Bold";

diff --git a/themes/groups/entry.edc b/themes/groups/entry.edc
index 16cc1b3..dcefcb0 100644 (file)
--- a/themes/groups/entry.edc
+++ b/themes/groups/entry.edc
@@ -1201,172 +1201,6 @@ group { name: "elm/entry/base-password/popup";
    }
 }
 
-  group { name: "elm/entry/custom-password/default";
-         data.item: "default_font_size" "24";
-      data.item: "min_font_size" "8";
-      data.item: "max_font_size" "60";
-      data {
-         item: context_menu_orientation "horizontal";
-      }
-      parts {
-         part { name: "elm.text";
-            type: TEXTBLOCK;
-            mouse_events: 1;
-            scale: 1;
-            entry_mode: PASSWORD_SHOW_LAST_CHARACTER;
-            select_mode: BLOCK_HANDLE;
-            multiline: 0;
-                       source: "elm/entry/selection/default"; // selection under
-                       source2: "elm/entry/selection/block_handle"; // block handle
-                       source3: "elm/entry/selection/block_handle_top"; // block handle
-            source4: "elm/entry/cursor/default"; // cursorover
-            source5: "elm/entry/anchor/default"; // anchor under
-            description { state: "default" 0.0;
-               text {
-                  style: "entry_single_textblock_style";
-                  repch: "*";
-                  min: 1 1;
-                  max: 0 1;
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               text {
-                  style: "entry_single_textblock_disabled_style";
-               }
-            }
-         }
-      }
-      programs {
-         program { name: "focus";
-            signal: "load";
-            source: "";
-            action: FOCUS_SET;
-            target: "elm.text";
-         }
-         program { name: "password_stop"; 
-            signal: "cursor,changed";
-            source: "elm.text";
-            action: ACTION_STOP;
-            target: "password_start";
-            after: "password_start";
-         }
-         program { name: "password_start";
-            in: 2.0 0.0;
-            action: HIDE_VISIBLE_PASSWORD;
-            target: "elm.text";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "elm.text";
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text";
-         }
-      }
-   }
-
-group { name: "elm/entry/custom-password/popup";
-   styles {
-      style { name: "entry_single_textblock_popup_style";
-         base: "font=SLP:style=Roman font_size=24 align=center color="ENTRY_TEXT_COLOR_INC" wrap=none";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "tab" "\t";
-         tag:  "em" "+ font=SLP:style=Oblique";
-         tag:  "b" "+ font=SLP:style=Bold";
-         tag:  "link" "+ color=#800 underline=on underline_color=#8008";
-         tag:  "hilight" "+ font=SLP:style=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
-      }
-      style { name: "entry_single_textblock_disabled_popup_style";
-         base: "font=SLP:style=Roman font_size=24 align=center 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:  "link" "+ color=#00000080 underline=on underline_color=#00000080";
-         tag:  "hilight" "+ font=SLP:style=Bold";
-         tag:  "preedit" "+ underline=on underline_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC"";
-         tag:  "preedit_sel" "+ backing=on backing_color="ENTRY_PREEDIT_BACKGROUND_COLOR_INC" color="ENTRY_PREEDIT_TEXT_COLOR_INC"";
-      }
-   }
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   parts {
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: PASSWORD_SHOW_LAST_CHARACTER;
-         select_mode: BLOCK_HANDLE;
-         multiline: 0;
-         source: "elm/entry/selection/default"; // selection under
-         source2: "elm/entry/selection/block_handle"; // block handle
-         source3: "elm/entry/selection/block_handle_top"; // block handle
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
-            text {
-               style: "entry_single_textblock_popup_style";
-               repch: "*";
-               min: 1 1;
-               max: 0 1;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_single_textblock_disabled_popup_style";
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "password_stop";
-         signal: "cursor,changed";
-         source: "elm.text";
-         action: ACTION_STOP;
-         target: "password_start";
-         after: "password_start";
-      }
-      program { name: "password_start";
-         in: 1.0 0.0;
-         action: HIDE_VISIBLE_PASSWORD;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-   }
-}
-
        group { name: "elm/entry/cursor/default";
                parts {
                        part { name: "clip2";
@@ -2909,7 +2743,7 @@ group { name: "elm/entry/base-single/font_color_black";
    }
 }
 
-group { name: "elm/entry/custom-password/font_color_black";
+group { name: "elm/entry/base-password/font_color_black";
    data.item: "default_font_size" "24";
    data.item: "min_font_size" "8";
    data.item: "max_font_size" "60";
@@ -2921,7 +2755,7 @@ group { name: "elm/entry/custom-password/font_color_black";
          type: TEXTBLOCK;
          mouse_events: 1;
          scale: 1;
-         entry_mode: PASSWORD_SHOW_LAST_CHARACTER;
+         entry_mode: PASSWORD;
          select_mode: BLOCK_HANDLE;
          multiline: 0;
          source: "elm/entry/selection/default"; // selection under
@@ -2952,18 +2786,6 @@ group { name: "elm/entry/custom-password/font_color_black";
          action: FOCUS_SET;
          target: "elm.text";
       }
-      program { name: "password_stop";
-         signal: "cursor,changed";
-         source: "elm.text";
-         action: ACTION_STOP;
-         target: "password_start";
-         after: "password_start";
-      }
-      program { name: "password_start";
-         in: 2.0 0.0;
-         action: HIDE_VISIBLE_PASSWORD;
-         target: "elm.text";
-      }
       program { name: "disable";
          signal: "elm,state,disabled";
          source: "elm";

diff --git a/themes/groups/genlist/genlist_styles.edc b/themes/groups/genlist/genlist_styles.edc
index 40357e7..9db1e2a 100644 (file)
--- a/themes/groups/genlist/genlist_styles.edc
+++ b/themes/groups/genlist/genlist_styles.edc
@@ -918,7 +918,7 @@
             scale: 1;
             description { state: "default" 0.0;
                min: 60 60;
-               min: 60 60;
+               max: 60 60;
                fixed: 1 1;
                rel1.to_x: "elm.padding.right";
                rel2 {