[Merge conflict fixed]

[Indentation fixed for popup, entry[only popup style]]
[elm_popup]: Nbeat 1.1 implementation for popup, changes include new custom style addition in entry.edc as well.

Change-Id: I9ecd36cb0e1199deeb12677341c21da29ee87682

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index 5148768..7e8aefc 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -3106,6 +3106,7 @@
       alias: "elm/button/base/popup_button/liststyle";
       alias: "elm/button/base/popup_button/volumebarstyle";
       alias: "elm/button/base/popup_button/customstyle";
+      alias: "elm/button/base/popup_button/verticalbuttonstyle";
       images {
          image: "00_button_popup_normal.png" COMP;
          image: "00_button_popup_press.png" COMP;

diff --git a/themes/groups/entry.edc b/themes/groups/entry.edc
index 6b179e4..8cc1cb9 100644 (file)
--- a/themes/groups/entry.edc
+++ b/themes/groups/entry.edc
@@ -1132,6 +1132,75 @@
       }
    }
 
+group { name: "elm/entry/base-password/popup";
+   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: "entry.swallow.background";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            visible: 1;
+            rel1 { relative: 0 0; to: "elm.text"; }
+            rel2 { relative: 1 1; to: "elm.text"; }
+         }
+      }
+   }
+   parts {
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         mouse_events: 1;
+         scale: 1;
+         entry_mode: PASSWORD;
+         select_mode: BLOCK_HANDLE;
+         //cursor_mode: BEFORE;
+         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: "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/default";
          data.item: "default_font_size" "24";
       data.item: "min_font_size" "8";
@@ -1202,6 +1271,102 @@
       }
    }
 
+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=#000000 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=#000000FF";
+         tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+      }
+      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=#000000FF";
+         tag:  "preedit_sel" "+ backing=on backing_color=#000000FF color=#FFFFFFFF";
+      }
+   }
+   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";

diff --git a/themes/groups/popup.edc b/themes/groups/popup.edc
index 0a0f3d8..9e59aa4 100644 (file)
--- a/themes/groups/popup.edc
+++ b/themes/groups/popup.edc
@@ -46,6 +46,7 @@ group { name: "elm/notify/block_events/popup";
 }
 
 group { name: "elm/label/base/popup_description/default";
+   alias: "elm/label/base/popup_description/verticalbuttonstyle";
    styles
      {
         style { name: "popup_desc_style";
@@ -101,6 +102,7 @@ group { name: "elm/label/base/popup_description/default";
 }
 
 group { name: "elm/label/base_wrap/popup_description/default";
+   alias: "elm/label/base_wrap/popup_description/verticalbuttonstyle";
    parts {
       part { name: "left_padding";
          type: RECT;
@@ -505,6 +507,353 @@ group { name: "elm/popup/content/default";
    }
 }
 
+group { name: "elm/popup/base/verticalbuttonstyle";
+   parts {
+      images {
+         image: "00_popup_title_bg.png" COMP;
+         image: "00_popup_bottom_bg.png" COMP;
+         image: "00_popup_bg.png" COMP;
+      }
+      part { name: "base";
+         type: RECT;
+         scale : 1;
+         mouse_events: 0;
+         repeat_events: 1;
+         description { state: "default" 0.0;
+            min: 400 0;
+            max: 400 730;
+            color: 0 0 0 0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 1.0;
+            align: 0.0 0.0;
+         }
+      }
+      part { name: "background";
+         scale : 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            image {
+               normal: "00_popup_bg.png";
+               border: 3 3 3 3;
+               border_scale: 1;
+            }
+         }
+      }
+      part { name: "elm.rect.title";
+         type: IMAGE;
+         scale : 1;
+         description { state: "default" 0.0;
+            min: 400 50;
+            fixed : 1 1;
+            align: 0.5 0.0;
+            visible: 0;
+            image.normal: "00_popup_title_bg.png";
+            image.border: 3 3 3 0;
+            image.border_scale: 1;
+            rel1 {
+               relative: 0.5 0.0;
+               to: "base";
+            }
+            rel2 {
+               relative: 0.5 0.0;
+               to: "base";
+            }
+         }
+         description { state: "show_title" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.swallow.title.icon";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 48 48;
+            max: 48 48;
+            fixed: 1 1;
+            align: 0.0 0.5;
+            rel1 {
+               to: "elm.rect.title";
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               to: "elm.rect.title";
+               relative: 1.0 1.0;
+            }
+            visible: 0;
+         }
+         description { state: "show_title_icon" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part {
+         name: "elm.swallow.title";
+         type: TEXTBLOCK;
+         scale:1;
+         description {
+            state: "default" 0.0;
+            text
+              {
+                 style: "popup_title_style";
+                 min: 0 0;
+                 max: 0 1;
+              }
+            visible:0;
+            rel1 { relative: 0.0 0.0; to: "elm.rect.title"; }
+            rel2 { relative: 1.0 1.0; to: "elm.rect.title"; }
+            align: 0.5 0.5;
+         }
+         description { state: "show_title" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         description { state: "show_title_icon" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.swallow.content";
+         type: SWALLOW;
+         scale : 1;
+         description { state: "default" 0.0;
+            min: 400 0;
+            align: 0.5 0.5;
+            fixed: 1 0;
+            rel1 {
+               relative: 0.5 0.0;
+               to: "base";
+            }
+            rel2 {
+               relative: 0.5 1.0;
+               to: "base";
+            }
+         }
+         description { state: "show_title" 0.0;
+            inherit: "default" 0.0;
+            rel1 {
+               relative: 0.5 1.0;
+               to: "elm.rect.title";
+            }
+         }
+         description { state: "show_button_area" 0.0;
+            inherit: "default" 0.0;
+            rel2 {
+               relative: 0.5 0.0;
+               to: ""elm.swallow.buttonArea"";
+            }
+         }
+         description { state: "show_button_title_area" 0.0;
+            inherit: "default" 0.0;
+            rel1 {
+               relative: 0.5 1.0;
+               to: "elm.rect.title";
+            }
+            rel2 {
+               relative: 0.5 0.0;
+               to: ""elm.swallow.buttonArea"";
+            }
+         }
+      }
+      part { name: "elm.swallow.buttonArea";
+         type: SWALLOW;
+         scale : 1;
+         description { state: "default" 0.0;
+            min: 400 178;
+            fixed : 1 1;
+            align: 0.5 1.0;
+            visible: 0;
+            rel1 {
+               relative: 0.0 1.0;
+               to: "base";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to: "base";
+            }
+         }
+         description { state: "show_button_area" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program { name: show_title;
+         signal: "elm,state,title,visible";
+         source: "elm";
+         action: STATE_SET "show_title" 0.0;
+         target: "elm.swallow.title";
+         target: "elm.rect.title";
+         target: "elm.swallow.content";
+         target: "base";
+      }
+      program { name: hide_title;
+         signal: "elm,state,title,hidden";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.swallow.title";
+         target: "elm.rect.title";
+         target: "elm.swallow.content";
+         target: "base";
+      }
+      program { name: show_title_icon;
+         signal: "elm,state,title,icon,visible";
+         source: "elm";
+         action: STATE_SET "show_title_icon" 0.0;
+         target: "elm.swallow.title";
+         target: "elm.swallow.title.icon";
+      }
+      program { name: hide_title_icon;
+         signal: "elm,state,title,icon,hidden";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.swallow.title";
+         target: "elm.swallow.title.icon";
+      }
+      program { name: show_button_area;
+         signal: "elm,state,button,visible";
+         source: "elm";
+         action: STATE_SET "show_button_area" 0.0;
+         target: "elm.swallow.buttonArea";
+         target: "elm.swallow.content";
+         target: "base";
+      }
+      program { name: hide_button_area;
+         signal: "elm,state,button,hidden";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.swallow.buttonArea";
+         target: "elm.swallow.content";
+         target: "base";
+      }
+      program { name: show_button_title_area;
+         signal: "elm,state,button,title,visible";
+         source: "elm";
+         action: STATE_SET "show_button_title_area" 0.0;
+         target: "elm.swallow.content";
+         target: "base";
+      }
+      program { name: hide_button_title_area;
+         signal: "elm,state,button,title,hidden";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.swallow.content";
+         target: "base";
+      }
+   } /* end of programs */
+}
+
+group { name: "elm/popup/buttons3/verticalbuttonstyle";
+   parts{
+      part { name: "elm.swallow.buttonArea.Background";
+         type: IMAGE;
+         scale : 1;
+         description { state: "default" 0.0;
+            align: 0.5 0.0;
+            image.normal: "00_popup_bottom_bg.png";
+            image.border: 3 3 0 3;
+            image.border_scale: 1;
+            rel1 {
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               relative: 1.0 1.0;
+            }
+         }
+      }
+      part { name: "elm.rect.pad_btn_top";
+         type: RECT;
+         scale : 1;
+         description { state: "default" 0.0;
+            min: 0 10;
+            fixed : 0 1;
+            align: 0.0 0.0;
+            color: 0 0 0 0;
+            rel1 {
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               relative: 1.0 0.0;
+            }
+         }
+      }
+      part{ name:"actionbtn1";
+         type: SWALLOW;
+         scale : 1;
+         description { state: "default" 0.0;
+            min: 222 46;
+            max: 222 46;
+            fixed : 1 1;
+            align: 0.5 0.0;
+            rel1 {
+               relative: 0.0 1.0; to_y: "elm.rect.pad_btn_top";
+            }
+         }
+      }
+      part { name: "elm.rect.pad_btn";
+         type: RECT;
+         scale : 1;
+         description { state: "default" 0.0;
+            min: 0 10;
+            max: 9999 10;
+            fixed : 1 1;
+            align: 0.5 0.0;
+            color: 0 0 0 0;
+            rel1 {
+               relative: 0.0 1.0; to: "actionbtn1";
+            }
+            rel2 {
+               relative: 1.0 1.0; to: "actionbtn1";
+            }
+         }
+      }
+      part{ name:"actionbtn2";
+         type: SWALLOW;
+         scale : 1;
+         description { state: "default" 0.0;
+            min: 222 46;
+            max: 222 46;
+            fixed : 1 1;
+            align: 0.5 0.0;
+            rel1 { relative: 0 1.0; to_y: "elm.rect.pad_btn"; }
+         }
+      }
+      part { name: "elm.rect.pad_btn2";
+         type: RECT;
+         scale : 1;
+         description { state: "default" 0.0;
+            min: 0 10;
+            max: 9999 10;
+            fixed : 1 1;
+            align: 0.5 0.0;
+            color: 0 0 0 0;
+            rel1 {
+               relative: 0.0 1.0; to: "actionbtn2";
+            }
+            rel2 {
+               relative: 1.0 1.0; to: "actionbtn2";
+            }
+         }
+      }
+      part{ name:"actionbtn3";
+         type: SWALLOW;
+         scale : 1;
+         description { state: "default" 0.0;
+            min: 222 46;
+            max: 222 46;
+            fixed : 1 1;
+            align: 0.5 0.0;
+            rel1 {
+               relative: 0.0 1.0; to_y: "elm.rect.pad_btn2";
+            }
+         }
+      }
+   }
+}
+
 group { name: "elm/popup/content/menustyle";
    parts{
       part{ name:"elm.swallow.content";