[NoContents & Progressbar] NBeat 1.0 Implementation.

Change-Id: Ib22542cd96224b564fde963d5d8fddbf3fe04227

diff --git a/themes/groups/nocontents.edc b/themes/groups/nocontents.edc
index 775f436..bb75527 100644 (file)
--- a/themes/groups/nocontents.edc
+++ b/themes/groups/nocontents.edc
@@ -26,6 +26,17 @@
    group {
       name: "elm/nocontents/base/default";
       alias: "elm/nocontents/base/full";
+      styles{
+         style { name: "nocontent_style";
+            base: "font=SLP:style=Roman font_size=26 \
+            align=center \
+            color=#ADAAA5 wrap=char";
+            tag:  "br" "\n";
+            tag:  "hilight" "+ font=SLP:style=Bold";
+            tag:  "b" "+ font=SLP:style=Bold";
+            tag:  "tab" "\t";
+         }
+      }
       images {
          image: "00_winset_NoContents_image.png" COMP;
       }
@@ -61,8 +72,8 @@
             type: RECT;
             description { state: "default" 0.0;
                visible: 0;
-               min: 1 30;
-               max: 1 30;
+               min: 1 34;
+               max: 1 34;
                align: 0.5 0.0;
                rel1 { relative: 0.0 1.0; to_y: "nocontents.image";}
                color: 0 0 0 0;
@@ -70,7 +81,7 @@
          }
          part { name: "elm.text";
             mouse_events: 0;
-            type: TEXT;
+            type: TEXTBLOCK;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 30;
@@ -79,12 +90,9 @@
                visible: 1;
                rel1 { relative: 0.0 1.0; to_y: "middle.padding";}
                rel2 { relative: 1.0 484/800; to:"bg";}
-               color: 173 170 165 255;
                text {
-                  font: "SLP:style=Roman";
-                  size: 30;
-                  text: "";
-                  align: 0.5 0.5;
+                  style: "nocontent_style";
+                  min: 1 0;
                }
             }
          }
@@ -128,8 +136,8 @@
             type: RECT;
             description { state: "default" 0.0;
                visible: 0;
-               min: 1 30;
-               max: 1 30;
+               min: 1 34;
+               max: 1 34;
                align: 0.5 0.0;
                rel1 { relative: 0.0 1.0; to_y: "nocontents.image";}
                color: 0 0 0 0;
@@ -137,7 +145,7 @@
          }
          part { name: "elm.text";
             mouse_events: 0;
-            type: TEXT;
+            type: TEXTBLOCK;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 30;
@@ -146,12 +154,9 @@
                visible: 1;
                rel1 { relative: 0.0 1.0; to_y: "middle.padding";}
                rel2 { relative: 1.0 484/800; to:"bg";}
-               color: 173 170 165 255;
                text {
-                  font: "SLP:style=Roman";
-                  size: 30;
-                  text: "";
-                  align: 0.5 0.5;
+                  style: "nocontent_style";
+                  min: 1 0;
                }
             }
          }
@@ -195,8 +200,8 @@
             type: RECT;
             description { state: "default" 0.0;
                visible: 0;
-               min: 1 30;
-               max: 1 30;
+               min: 1 34;
+               max: 1 34;
                align: 0.5 0.0;
                rel1 { relative: 0.0 1.0; to_y: "nocontents.image";}
                color: 0 0 0 0;
@@ -204,7 +209,7 @@
          }
          part { name: "elm.text";
             mouse_events: 0;
-            type: TEXT;
+            type: TEXTBLOCK;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 30;
@@ -213,12 +218,9 @@
                visible: 1;
                rel1 { relative: 0.0 1.0; to_y: "middle.padding";}
                rel2 { relative: 1.0 484/800; to:"bg";}
-               color: 173 170 165 255;
                text {
-                  font: "SLP:style=Roman";
-                  size: 30;
-                  text: "";
-                  align: 0.5 0.5;
+                  style: "nocontent_style";
+                  min: 1 0;
                }
             }
          }
@@ -262,8 +264,8 @@
             type: RECT;
             description { state: "default" 0.0;
                visible: 0;
-               min: 1 30;
-               max: 1 30;
+               min: 1 34;
+               max: 1 34;
                align: 0.5 0.0;
                rel1 { relative: 0.0 1.0; to_y: "nocontents.image";}
                color: 0 0 0 0;
@@ -271,7 +273,7 @@
          }
          part { name: "elm.text";
             mouse_events: 0;
-            type: TEXT;
+            type: TEXTBLOCK;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 30;
@@ -280,12 +282,9 @@
                visible: 1;
                rel1 { relative: 0.0 1.0; to_y: "middle.padding";}
                rel2 { relative: 1.0 484/800; to:"bg";}
-               color: 173 170 165 255;
                text {
-                  font: "SLP:style=Roman";
-                  size: 30;
-                  text: "";
-                  align: 0.5 0.5;
+                  style: "nocontent_style";
+                  min: 1 0;
                }
             }
          }

diff --git a/themes/groups/progressbar.edc b/themes/groups/progressbar.edc
index a3c355e..bc494f6 100644 (file)
--- a/themes/groups/progressbar.edc
+++ b/themes/groups/progressbar.edc
@@ -3228,6 +3228,7 @@
             type: RECT;
             description {
                state: "default" 0.0;
+               color: 0 0 0 0;
             }
          }
          part { name: "elm.swallow.bar";
@@ -3255,8 +3256,8 @@
             clip_to: "elm.background.progressbar";
             description {
                state: "default" 0.0;
-               min: 32 32;
-               max: 32 32;
+               min: 42 42;
+               max: 42 42;
                visible: 1;
                aspect: 1.0 1.0;
                aspect_preference: BOTH;