[N_BEAT_HD Black] SegmentCOntrol, NoContents and selectioninfo: Images are updated...

for 1pxl line support in segmentcontrol.

Change-Id: I05b68508a940c1a1385490934c0c58873396ebaf

diff --git a/themes/groups/nocontents.edc b/themes/groups/nocontents.edc
index e17900f..a5442a1 100644 (file)
--- a/themes/groups/nocontents.edc
+++ b/themes/groups/nocontents.edc
@@ -27,7 +27,7 @@
       alias: "elm/nocontents/base/full";
       styles{
          style { name: "nocontent_style";
-            base: "font=SLP:style=Roman font_size=26 \
+            base: "font=SLP:style=Roman font_size="NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC" \
             align=center \
             color=#ffffff wrap=char";
             tag:  "br" "\n";
@@ -55,8 +55,8 @@
             description { state: "default" 0.0;
                visible: 1;
                align: 0.5 0.0;
-               rel1 { relative: 141/480 230/800; to: "bg";}
-               rel2 { relative: 339/480 424/800; to: "bg";}
+               rel1 { relative: 0.176 0.287; to: "bg";}
+               rel2 { relative: 0.706 0.53; to: "bg";}
                image {
                   normal: "00_winset_NoContents_image.png";
                   border: 1 1 1 1;
@@ -71,8 +71,8 @@
             type: RECT;
             description { state: "default" 0.0;
                visible: 0;
-               min: 1 34;
-               max: 1 34;
+               min: 1 NOCONTENT_MIDDLE_PADDING_INC;
+               max: 1 NOCONTENT_MIDDLE_PADDING_INC;
                align: 0.5 0.0;
                rel1 { relative: 0.0 1.0; to_y: "nocontents.image";}
             }
@@ -82,12 +82,12 @@
             type: TEXTBLOCK;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 29;
+               //min: 0 29;
                fixed: 0 1;
                align: 0.5 0.0;
                visible: 1;
                rel1 { relative: 0.0 1.0; to_y: "middle.padding";}
-               rel2 { relative: 1.0 484/800; to:"bg";}
+               rel2 { relative: 1.0 0.605; to:"bg";}
                color: NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC;
                text {
                   style: "nocontent_style";
@@ -109,8 +109,12 @@
             type: RECT;
             description { state: "default" 0.0;
                visible: 1;
-               rel1 { relative: 0.0 0.0;}
-               rel2 { relative: 1.0 1.0;}
+               rel1 {
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
                color: 0 0 0 0;
             }
          }
@@ -119,8 +123,14 @@
             description { state: "default" 0.0;
                visible: 1;
                align: 0.5 0.0;
-               rel1 { relative: 141/480 230/800; to: "bg";}
-               rel2 { relative: 339/480 424/800; to: "bg";}
+               rel1 {
+                  relative: 0.294 0.288;
+                  to: "bg";
+               }
+               rel2 {
+                  relative: 0.706 0.53;
+                  to: "bg";
+               }
                image {
                   normal: "00_winset_NoContents_multimedia.png";
                   border: 1 1 1 1;
@@ -135,11 +145,13 @@
             type: RECT;
             description { state: "default" 0.0;
                visible: 0;
-               min: 1 34;
-               max: 1 34;
+               min: 1 NOCONTENT_MIDDLE_PADDING_INC;
+               max: 1 NOCONTENT_MIDDLE_PADDING_INC;
                align: 0.5 0.0;
-               rel1 { relative: 0.0 1.0; to_y: "nocontents.image";}
-               color: 0 0 0 0;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "nocontents.image";
+               }
             }
          }
          part { name: "elm.text";
@@ -147,12 +159,17 @@
             type: TEXTBLOCK;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 30;
                fixed: 0 1;
                align: 0.5 0.0;
                visible: 1;
-               rel1 { relative: 0.0 1.0; to_y: "middle.padding";}
-               rel2 { relative: 1.0 484/800; to:"bg";}
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "middle.padding";
+               }
+               rel2 {
+                  relative: 1.0 0.605;
+                  to:"bg";
+               }
                color: NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC;
                text {
                   style: "nocontent_style";
@@ -174,8 +191,12 @@
             type: RECT;
             description { state: "default" 0.0;
                visible: 1;
-               rel1 { relative: 0.0 0.0;}
-               rel2 { relative: 1.0 1.0;}
+               rel1 {
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
                color: 0 0 0 0;
             }
          }
@@ -184,8 +205,14 @@
             description { state: "default" 0.0;
                visible: 1;
                align: 0.5 0.0;
-               rel1 { relative: 141/480 230/800; to: "bg";}
-               rel2 { relative: 339/480 424/800; to: "bg";}
+               rel1 {
+                  relative: 0.294 0.288;
+                  to: "bg";
+               }
+               rel2 {
+                  relative: 0.706 0.53;
+                  to: "bg";
+               }
                image {
                   normal: "00_winset_NoContents_text.png";
                   border: 1 1 1 1;
@@ -200,11 +227,13 @@
             type: RECT;
             description { state: "default" 0.0;
                visible: 0;
-               min: 1 34;
-               max: 1 34;
+               min: 1 NOCONTENT_MIDDLE_PADDING_INC;
+               max: 1 NOCONTENT_MIDDLE_PADDING_INC;
                align: 0.5 0.0;
-               rel1 { relative: 0.0 1.0; to_y: "nocontents.image";}
-               color: 0 0 0 0;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "nocontents.image";
+               }
             }
          }
          part { name: "elm.text";
@@ -212,12 +241,17 @@
             type: TEXTBLOCK;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 30;
                fixed: 0 1;
                align: 0.5 0.0;
                visible: 1;
-               rel1 { relative: 0.0 1.0; to_y: "middle.padding";}
-               rel2 { relative: 1.0 484/800; to:"bg";}
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "middle.padding";
+               }
+               rel2 {
+                  relative: 1.0 0.605;
+                  to:"bg";
+               }
                color: NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC;
                text {
                   style: "nocontent_style";
@@ -239,8 +273,12 @@
             type: RECT;
             description { state: "default" 0.0;
                visible: 1;
-               rel1 { relative: 0.0 0.0;}
-               rel2 { relative: 1.0 1.0;}
+               rel1 {
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
                color: 0 0 0 0;
             }
          }
@@ -249,8 +287,14 @@
             description { state: "default" 0.0;
                visible: 1;
                align: 0.5 0.0;
-               rel1 { relative: 141/480 230/800; to: "bg";}
-               rel2 { relative: 339/480 424/800; to: "bg";}
+               rel1 {
+                  relative: 0.294 0.288;
+                  to: "bg";
+               }
+               rel2 {
+                  relative: 0.706 0.53;
+                  to: "bg";
+               }
                image {
                   normal: "00_winset_NoContents_unnamed.png";
                   border: 1 1 1 1;
@@ -265,11 +309,13 @@
             type: RECT;
             description { state: "default" 0.0;
                visible: 0;
-               min: 1 34;
-               max: 1 34;
+               min: 1 NOCONTENT_MIDDLE_PADDING_INC;
+               max: 1 NOCONTENT_MIDDLE_PADDING_INC;
                align: 0.5 0.0;
-               rel1 { relative: 0.0 1.0; to_y: "nocontents.image";}
-               color: 0 0 0 0;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "nocontents.image";
+               }
             }
          }
          part { name: "elm.text";
@@ -277,12 +323,17 @@
             type: TEXTBLOCK;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 30;
                fixed: 0 1;
                align: 0.5 0.0;
                visible: 1;
-               rel1 { relative: 0.0 1.0; to_y: "middle.padding";}
-               rel2 { relative: 1.0 484/800; to:"bg";}
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_y: "middle.padding";
+               }
+               rel2 {
+                  relative: 1.0 0.605;
+                  to:"bg";
+               }
                color: NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC;
                text {
                   style: "nocontent_style";
@@ -301,8 +352,12 @@
             type: RECT;
             description { state: "default" 0.0;
                visible: 1;
-               rel1 { relative: 0.0 0.0;}
-               rel2 { relative: 1.0 1.0;}
+               rel1 {
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+               }
                color: 0 0 0 0;
             }
          }
@@ -311,12 +366,16 @@
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 25;
+               min: 0 NOCONTENT_BASE_SEARCH_PADDING_INC;
                fixed: 0 1;
                align: 0 0;
                visible: 1;
-               rel1 { relative: 0.0 0.0;}
-               rel2 { relative: 1.0 0.0;}
+               rel1 {
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+               }
                color: 0 0 0 0;
             }
          }
@@ -325,13 +384,19 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 30;
+               //min: 0 30;
                fixed: 0 1;
                align: 0 0;
                visible: 1;
-               rel1 { relative: 0.0 1.0; to:"top_padding";}
-               rel2 { relative: 1.0 1.0; to:"top_padding";}
-               color: 173 170 165 255;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to:"top_padding";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to:"top_padding";
+               }
+               color: NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: 30;
@@ -345,13 +410,18 @@
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 25;
+               min: 0 NOCONTENT_BASE_SEARCH_PADDING_INC;
                fixed: 0 1;
                align: 0 0;
-               visible: 1;
-               rel1 { relative: 0.0 1.0; to:"elm.text";}
-               rel2 { relative: 1.0 1.0; to:"elm.text";}
-               color: 0 0 0 0;
+               visible: 0;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to:"elm.text";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to:"elm.text";
+               }
             }
          }
          part { name: "custom";
@@ -363,8 +433,14 @@
                fixed: 0 1;
                align: 0 0;
                visible: 1;
-               rel1 { relative: 0.0 1.0; to:"text_bottom_padding";}
-               rel2 { relative: 1.0 1.0; to:"text_bottom_padding";}
+               rel1 {
+                  relative: 0.0 1.0;
+                  to:"text_bottom_padding";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to:"text_bottom_padding";
+               }
             }
          }
       }

diff --git a/themes/groups/segmentedcontrol.edc b/themes/groups/segmentedcontrol.edc
index 1f597b6..635af6a 100644 (file)
--- a/themes/groups/segmentedcontrol.edc
+++ b/themes/groups/segmentedcontrol.edc
@@ -27,6 +27,9 @@
 //################################################################
 
 group { name: "elm/segment_control/base/default";
+   images {
+      image: "00_winset_btn_sge_normal.png" COMP;
+   }
 #define SEGMENT_TYPE_SINGLE 1
 #define SEGMENT_TYPE_LEFT 2
 #define SEGMENT_TYPE_MIDDLE 3
@@ -38,13 +41,19 @@ group { name: "elm/segment_control/base/default";
 #define SEGMENT_STATUS_DISABLED 1
    parts {
       part { name: "bg";
-         type: RECT;
          mouse_events: 0;
          scale: 1;
          description {
             state: "default" 0.0;
-            color: 0 0 0 0;
             min: 100 40;
+            rel1.offset: 0 0;
+            rel2.offset: 0 0;
+            image {
+               normal: "00_winset_btn_sge_normal.png";
+               border: 5 5 5 5;
+               border_scale: 1;
+               middle: 1;
+            }
          }
       }
    }
@@ -56,18 +65,34 @@ group { name: "elm/segment_control/item/default";
       image: "00_winset_btn_sge_normal_centre.png" COMP;
       image: "00_winset_btn_sge_normal_right.png" COMP;
       image: "00_winset_btn_sge_press_normal.png" COMP;
-      image: "00_winset_btn_sge_press_left.png" COMP;
-      image: "00_winset_btn_sge_press_center.png" COMP;
-      image: "00_winset_btn_sge_press_right.png" COMP;
-      image: "00_button_02_normal.png" COMP ;
-      }
+      image: "00_winset_btn_sge_press_01.png" COMP;
+      image: "00_winset_btn_sge_press_02.png" COMP;
+      image: "00_winset_btn_sge_press_03.png" COMP;
+   }
    parts {
+      part { name: "base";
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+      }
       part { name: "segment";
-         mouse_events: 1;
          scale: 1;
          description { state: "default" 0.0;
             min: 1 1;
             visible: 0;
+            align: 0.0 0.5;
+            rel1 {
+               to: "base";
+               relative: 0.0 0.0;
+               offset: 0 0;
+            }
+            rel2 {
+               to: "base";
+               relative: 1.0 1.0;
+               offset: 0 0;
+            }
             image {
                normal: "00_winset_btn_sge_normal.png";
                border: 5 5 5 5;
@@ -86,6 +111,7 @@ group { name: "elm/segment_control/item/default";
          description { state: "default_left" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel2.offset: -1 0; // 1 pixel seperator
             image {
                normal: "00_winset_btn_sge_normal_left.png";
                border:  5 2 5 5;
@@ -94,6 +120,7 @@ group { name: "elm/segment_control/item/default";
          description { state: "default_right" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel1.offset: 1 0; // 1 pixel seperator
             image {
                normal: "00_winset_btn_sge_normal_right.png";
                border: 2 5 5 5;
@@ -102,9 +129,11 @@ group { name: "elm/segment_control/item/default";
          description { state: "default_middle" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel1.offset: 1 0; // 1 pixel seperator
+            rel2.offset: -1 0; // 1 pixel seperator
             image {
             normal: "00_winset_btn_sge_normal_centre.png";
-            border: 2 2 7 7;
+            border: 0 0 7 7;
             }
          }
          description { state: "pressed_single" 0.0;
@@ -118,25 +147,29 @@ group { name: "elm/segment_control/item/default";
          description { state: "pressed_left" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel2.offset: -1 0; // 1 pixel seperator
             image {
-               normal: "00_winset_btn_sge_press_left.png";
+               normal: "00_winset_btn_sge_press_01.png";
                border:  5 2 5 5;
             }
          }
          description { state: "pressed_right" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel1.offset: 1 0; // 1 pixel seperator
             image {
-               normal: "00_winset_btn_sge_press_right.png";
+               normal: "00_winset_btn_sge_press_03.png";
                border: 2 5 5 5;
             }
          }
          description { state: "pressed_middle" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel1.offset: 1 0; // 1 pixel seperator
+            rel2.offset: -1 0; // 1 pixel seperator
             image {
-               normal: "00_winset_btn_sge_press_center.png";
-               border: 2 2 7 7;
+               normal: "00_winset_btn_sge_press_02.png";
+               border: 0 0 7 7;
             }
          }
          description { state: "selected_single" 0.0;
@@ -150,26 +183,78 @@ group { name: "elm/segment_control/item/default";
          description { state: "selected_left" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel2.offset: -1 0; // 1 pixel seperator
             image {
-               normal: "00_winset_btn_sge_press_left.png";
+               normal: "00_winset_btn_sge_press_01.png";
                border:  5 2 5 5;
             }
          }
          description { state: "selected_right" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel1.offset: 1 0; // 1 pixel seperator
             image {
-               normal: "00_winset_btn_sge_press_right.png";
+               normal: "00_winset_btn_sge_press_03.png";
                border: 2 5 5 5;
             }
          }
          description { state: "selected_middle" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel1.offset: 1 0; // 1 pixel seperator
+            rel2.offset: -1 0; // 1 pixel seperator
             image {
-               normal: "00_winset_btn_sge_press_center.png";
-               border: 2 2 7 7;
+               normal: "00_winset_btn_sge_press_02.png";
+               border: 0 0 7 7;
+            }
+         }
+      }
+      part { name: "left_1pxl_padding";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            visible: 0;
+            align: 0.0 0.5;
+            min: 1 0;
+            fixed: 1 0;
+            rel1 {
+               to: "base";
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               to: "base";
+               relative: 0.0 1.0;
+            }
+            color: SEGMENT_CONTROL_ITEM_1PX_LEFT_PADDING_COLOR_INC;
+          }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+          }
+      }
+      part { name: "right_1pxl_padding";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            visible: 0;
+            align: 1.0 0.5;
+            min: 1 0;
+            fixed: 1 0;
+            rel1 {
+               to: "base";
+               relative: 1.0 0.0;
             }
+            rel2 {
+               to: "base";
+               relative: 1.0 1.0;
+            }
+            color: SEGMENT_CONTROL_ITEM_1PX_RIGHT_PADDING_COLOR_INC;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
          }
       }
       part { name: "padding_frame";
@@ -307,8 +392,8 @@ group { name: "elm/segment_control/item/default";
             inherit: "default" 0.0;
             visible: 1;
             image {
-               normal: "00_button_02_normal.png";
-               border: 7 7 7 7;
+               normal: "00_winset_btn_sge_body.png";
+               border: 5 5 5 5;
             }
          }
          description { state: "disabled_left" 0.0;
@@ -332,7 +417,7 @@ group { name: "elm/segment_control/item/default";
             visible: 1;
             image {
                normal: "00_winset_btn_sge_normal_centre.png";
-               border: 2 2 7 7;
+               border: 0 0 7 7;
             }
          }
       }
@@ -352,49 +437,111 @@ group { name: "elm/segment_control/item/default";
             if(state == SEGMENT_STATE_NORMAL)
               {
                  if(type == SEGMENT_TYPE_SINGLE)
-                   set_state(PART:"segment", "default_single", 0.0);
+                   {
+                      set_state(PART:"segment", "default_single", 0.0);
+                      set_state(PART:"left_1pxl_padding", "default", 0.0);
+                      set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_LEFT)
-                   set_state(PART:"segment", "default_left", 0.0);
+                   {
+                      set_state(PART:"segment", "default_left", 0.0);
+                      set_state(PART:"left_1pxl_padding", "default", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_MIDDLE)
-                   set_state(PART:"segment", "default_middle", 0.0);
+                   {
+                      set_state(PART:"segment", "default_middle", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_RIGHT)
-                   set_state(PART:"segment", "default_right", 0.0);
+                   {
+                      set_state(PART:"segment", "default_right", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  set_state(PART:"elm.text", "normal", 0.0);
               }
             else if(state == SEGMENT_STATE_PRESSED)
               {
                  if(type == SEGMENT_TYPE_SINGLE)
-                   set_state(PART:"segment", "pressed_single", 0.0);
+                   {
+                      set_state(PART:"segment", "pressed_single", 0.0);
+                      set_state(PART:"left_1pxl_padding", "default", 0.0);
+                      set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_LEFT)
-                   set_state(PART:"segment", "pressed_left", 0.0);
+                   {
+                      set_state(PART:"segment", "pressed_left", 0.0);
+                      set_state(PART:"left_1pxl_padding", "default", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_MIDDLE)
-                   set_state(PART:"segment", "pressed_middle", 0.0);
+                   {
+                      set_state(PART:"segment", "pressed_middle", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_RIGHT)
-                   set_state(PART:"segment", "pressed_right", 0.0);
+                   {
+                      set_state(PART:"segment", "pressed_right", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  set_state(PART:"elm.text", "pressed", 0.0);
               }
             else if(state == SEGMENT_STATE_SELECTED)
               {
                  if(type == SEGMENT_TYPE_SINGLE)
-                   set_state(PART:"segment", "selected_single", 0.0);
+                   {
+                      set_state(PART:"segment", "selected_single", 0.0);
+                      set_state(PART:"left_1pxl_padding", "default", 0.0);
+                      set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_LEFT)
-                   set_state(PART:"segment", "selected_left", 0.0);
+                   {
+                      set_state(PART:"segment", "selected_left", 0.0);
+                      set_state(PART:"left_1pxl_padding", "default", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_MIDDLE)
-                   set_state(PART:"segment", "selected_middle", 0.0);
+                   {
+                      set_state(PART:"segment", "selected_middle", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_RIGHT)
-                   set_state(PART:"segment", "selected_right", 0.0);
+                   {
+                      set_state(PART:"segment", "selected_right", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  set_state(PART:"elm.text", "selected", 0.0);
               }
             if(disabled == SEGMENT_STATUS_DISABLED)
               {
                  if(type == SEGMENT_TYPE_SINGLE)
-                   set_state(PART:"disabler", "disabled_single", 0.0);
+                   {
+                      set_state(PART:"disabler", "disabled_single", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_LEFT)
-                   set_state(PART:"disabler", "disabled_left", 0.0);
+                   {
+                      set_state(PART:"disabler", "disabled_left", 0.0);
+                      set_state(PART:"left_1pxl_padding", "default", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_MIDDLE)
-                   set_state(PART:"disabler", "disabled_middle", 0.0);
+                   {
+                      set_state(PART:"disabler", "disabled_middle", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_RIGHT)
-                   set_state(PART:"disabler", "disabled_right", 0.0);
+                   {
+                      set_state(PART:"disabler", "disabled_right", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  set_state(PART:"elm.text", "disabled", 0.0);
               }
             else
@@ -545,17 +692,24 @@ group { name: "elm/segment_control/item/default";
 }
 
 group { name: "elm/segment_control/base/body_style";
+   images {
+      image: "00_winset_btn_sge_body.png" COMP;
+   }
    parts {
       part { name: "bg";
-         type: RECT;
          mouse_events: 0;
          scale: 1;
          description {
             state: "default" 0.0;
-            color: 203 193 182 255;
-            rel1.offset: 5 0;
-            rel2.offset: -5 -1;
+            rel1.offset: 0 0;
+            rel2.offset: 0 1;
             min: 100 40;
+            image {
+               normal: "00_winset_btn_sge_body.png";
+               border: 5 5 5 5;
+               border_scale: 1;
+               middle: 1;
+            }
          }
       }
    }
@@ -569,18 +723,34 @@ group { name: "elm/segment_control/item/body_style";
       image: "00_winset_btn_sge_body_normal_centre.png" COMP;
       image: "00_winset_btn_sge_body_normal_right.png" COMP;
       image: "00_winset_btn_sge_body.png" COMP;
-      image: "00_winset_btn_sge_body_press_center.png" COMP;
       image: "00_winset_btn_sge_body_press_left.png" COMP;
+      image: "00_winset_btn_sge_body_press_center.png" COMP;
       image: "00_winset_btn_sge_body_press_right.png" COMP;
-      image: "00_button_02_normal.png" COMP;
-      }
+   }
    parts {
+      part { name: "base";
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+      }
       part { name: "segment";
          mouse_events: 1;
          scale: 1;
          description { state: "default" 0.0;
             min: 1 1;
             visible: 0;
+            rel1 {
+               to: "base";
+               relative: 0.0 0.0;
+               offset: 0 0;
+            }
+            rel2 {
+               to: "base";
+               relative: 1.0 1.0;
+               offset: 0 0;
+            }
             image {
                normal: "00_winset_btn_sge_body.png";
                border: 5 5 5 5;
@@ -599,6 +769,7 @@ group { name: "elm/segment_control/item/body_style";
          description { state: "default_left" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel2.offset: -1 0; // 1 pixel seperator
             image {
                normal: "00_winset_btn_sge_body_normal_left.png";
                border:  5 2 5 5;
@@ -607,6 +778,7 @@ group { name: "elm/segment_control/item/body_style";
          description { state: "default_right" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel1.offset: 1 0; // 1 pixel seperator
             image {
                normal: "00_winset_btn_sge_body_normal_right.png";
                border: 2 5 5 5;
@@ -615,9 +787,11 @@ group { name: "elm/segment_control/item/body_style";
          description { state: "default_middle" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel1.offset: 1 0; // 1 pixel seperator
+            rel2.offset: -1 0; // 1 pixel seperator
             image {
             normal: "00_winset_btn_sge_body_normal_centre.png";
-            border: 2 2 5 5;
+            border: 0 0 5 5;
             }
          }
          description { state: "pressed_single" 0.0;
@@ -631,6 +805,7 @@ group { name: "elm/segment_control/item/body_style";
          description { state: "pressed_left" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel2.offset: -1 0; // 1 pixel seperator
             image {
                normal: "00_winset_btn_sge_body_press_left.png";
                border:  5 2 5 5;
@@ -639,6 +814,7 @@ group { name: "elm/segment_control/item/body_style";
          description { state: "pressed_right" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel1.offset: 1 0; // 1 pixel seperator
             image {
                normal: "00_winset_btn_sge_body_press_right.png";
                border: 2 5 5 5;
@@ -647,9 +823,11 @@ group { name: "elm/segment_control/item/body_style";
          description { state: "pressed_middle" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel1.offset: 1 0; // 1 pixel seperator
+            rel2.offset: -1 0; // 1 pixel seperator
             image {
                normal: "00_winset_btn_sge_body_press_center.png";
-               border: 2 2 7 7;
+               border: 0 0 7 7;
             }
          }
          description { state: "selected_single" 0.0;
@@ -663,6 +841,7 @@ group { name: "elm/segment_control/item/body_style";
          description { state: "selected_left" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel2.offset: -1 0; // 1 pixel seperator
             image {
                normal: "00_winset_btn_sge_body_press_left.png";
                border:  5 2 5 5;
@@ -671,6 +850,7 @@ group { name: "elm/segment_control/item/body_style";
          description { state: "selected_right" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel1.offset: 1 0; // 1 pixel seperator
             image {
                normal: "00_winset_btn_sge_body_press_right.png";
                border: 2 5 5 5;
@@ -679,12 +859,62 @@ group { name: "elm/segment_control/item/body_style";
          description { state: "selected_middle" 0.0;
             inherit: "default" 0.0;
             visible: 1;
+            rel1.offset: 1 0; // 1 pixel seperator
+            rel2.offset: -1 0; // 1 pixel seperator
             image {
                normal: "00_winset_btn_sge_body_press_center.png";
-               border: 2 2 7 7;
+               border: 0 0 7 7;
             }
          }
       }
+      part { name: "left_1pxl_padding";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            visible: 0;
+            align: 0.0 0.5;
+            min: 1 0;
+            fixed: 1 0;
+            rel1 {
+               to: "base";
+               relative: 0.0 0.0;
+            }
+            rel2 {
+               to: "base";
+               relative: 0.0 1.0;
+            }
+            color: SEGMENT_CONTROL_BODY_ITEM_1PX_LEFT_PADDING_COLOR_INC;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "right_1pxl_padding";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            visible: 0;
+            align: 1.0 0.5;
+            min: 1 0;
+            fixed: 1 0;
+            rel1 {
+               to: "segment";
+               relative: 1.0 0.0;
+            }
+            rel2 {
+               to: "segment";
+               relative: 1.0 1.0;
+            }
+            color: SEGMENT_CONTROL_BODY_ITEM_1PX_RIGHT_PADDING_COLOR_INC;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
       part { name: "padding_frame";
          type: RECT;
          scale: 1;
@@ -820,15 +1050,15 @@ group { name: "elm/segment_control/item/body_style";
             inherit: "default" 0.0;
             visible: 1;
             image {
-               normal: "00_button_02_normal.png";
-               border: 7 7 7 7;
+               normal: "00_winset_btn_sge_body.png";
+               border: 5 5 5 5;
             }
          }
          description { state: "disabled_left" 0.0;
             inherit: "default" 0.0;
             visible: 1;
             image {
-               normal: "00_winset_btn_sge_normal_left.png";
+               normal: "00_winset_btn_sge_body_normal_left.png";
                border:  5 2 5 5;
             }
          }
@@ -836,7 +1066,7 @@ group { name: "elm/segment_control/item/body_style";
             inherit: "default" 0.0;
             visible: 1;
             image {
-               normal: "00_winset_btn_sge_normal_right.png";
+               normal: "00_winset_btn_sge_body_normal_right.png";
                border: 2 5 5 5;
             }
          }
@@ -844,8 +1074,8 @@ group { name: "elm/segment_control/item/body_style";
             inherit: "default" 0.0;
             visible: 1;
             image {
-               normal: "00_winset_btn_sge_normal_centre.png";
-               border: 2 2 7 7;
+               normal: "00_winset_btn_sge_body_normal_centre.png";
+               border: 0 0 7 7;
             }
          }
       }
@@ -865,49 +1095,113 @@ group { name: "elm/segment_control/item/body_style";
             if(state == SEGMENT_STATE_NORMAL)
               {
                  if(type == SEGMENT_TYPE_SINGLE)
-                   set_state(PART:"segment", "default_single", 0.0);
+                   {
+                      set_state(PART:"segment", "default_single", 0.0);
+                      set_state(PART:"left_1pxl_padding", "default", 0.0);
+                      set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_LEFT)
-                   set_state(PART:"segment", "default_left", 0.0);
+                   {
+                      set_state(PART:"segment", "default_left", 0.0);
+                      set_state(PART:"left_1pxl_padding", "default", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_MIDDLE)
-                   set_state(PART:"segment", "default_middle", 0.0);
+                   {
+                      set_state(PART:"segment", "default_middle", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_RIGHT)
-                   set_state(PART:"segment", "default_right", 0.0);
+                   {
+                      set_state(PART:"segment", "default_right", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  set_state(PART:"elm.text", "normal", 0.0);
               }
             else if(state == SEGMENT_STATE_PRESSED)
               {
                  if(type == SEGMENT_TYPE_SINGLE)
-                   set_state(PART:"segment", "pressed_single", 0.0);
+                   {
+                      set_state(PART:"segment", "pressed_single", 0.0);
+                      set_state(PART:"left_1pxl_padding", "default", 0.0);
+                      set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_LEFT)
-                   set_state(PART:"segment", "pressed_left", 0.0);
+                   {
+                      set_state(PART:"segment", "pressed_left", 0.0);
+                      set_state(PART:"left_1pxl_padding", "default", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_MIDDLE)
-                   set_state(PART:"segment", "pressed_middle", 0.0);
+                   {
+                      set_state(PART:"segment", "pressed_middle", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_RIGHT)
-                   set_state(PART:"segment", "pressed_right", 0.0);
+                   {
+                      set_state(PART:"segment", "pressed_right", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  set_state(PART:"elm.text", "pressed", 0.0);
               }
             else if(state == SEGMENT_STATE_SELECTED)
               {
                  if(type == SEGMENT_TYPE_SINGLE)
-                   set_state(PART:"segment", "selected_single", 0.0);
+                   {
+                      set_state(PART:"segment", "selected_single", 0.0);
+                      set_state(PART:"left_1pxl_padding", "default", 0.0);
+                      set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_LEFT)
-                   set_state(PART:"segment", "selected_left", 0.0);
+                   {
+                      set_state(PART:"segment", "selected_left", 0.0);
+                      set_state(PART:"left_1pxl_padding", "default", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_MIDDLE)
-                   set_state(PART:"segment", "selected_middle", 0.0);
+                   {
+                      set_state(PART:"segment", "selected_middle", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_RIGHT)
-                   set_state(PART:"segment", "selected_right", 0.0);
+                   {
+                      set_state(PART:"segment", "selected_right", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  set_state(PART:"elm.text", "selected", 0.0);
               }
             if(disabled == SEGMENT_STATUS_DISABLED)
               {
                  if(type == SEGMENT_TYPE_SINGLE)
-                   set_state(PART:"disabler", "disabled_single", 0.0);
+                   {
+                       set_state(PART:"disabler", "disabled_single", 0.0);
+                       set_state(PART:"left_1pxl_padding", "default", 0.0);
+                       set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_LEFT)
-                   set_state(PART:"disabler", "disabled_left", 0.0);
+                   {
+                      set_state(PART:"disabler", "disabled_left", 0.0);
+                      set_state(PART:"left_1pxl_padding", "default", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_MIDDLE)
-                   set_state(PART:"disabler", "disabled_middle", 0.0);
+                   {
+                      set_state(PART:"disabler", "disabled_middle", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "visible", 0.0);
+                   }
                  else if(type == SEGMENT_TYPE_RIGHT)
-                   set_state(PART:"disabler", "disabled_right", 0.0);
+                   {
+                      set_state(PART:"disabler", "disabled_right", 0.0);
+                      set_state(PART:"left_1pxl_padding", "visible", 0.0);
+                      set_state(PART:"right_1pxl_padding", "default", 0.0);
+                   }
                  set_state(PART:"elm.text", "disabled", 0.0);
               }
             else

diff --git a/themes/groups/selectioninfo.edc b/themes/groups/selectioninfo.edc
index 109bcc9..0da7299 100644 (file)
--- a/themes/groups/selectioninfo.edc
+++ b/themes/groups/selectioninfo.edc
@@ -30,7 +30,7 @@ group { name: "elm/standard/selectioninfo/vertical/bottom_12";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 480 30;
+            min: SELECTION_INFO_MIN_VER_W_INC SELECTION_INFO_VER_PADDING_INC;
             fixed: 1 1;
             align: 0.5 1.0;
             rel1.relative: 0.5 1.0;
@@ -43,7 +43,7 @@ group { name: "elm/standard/selectioninfo/vertical/bottom_12";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 10 30;
+            min: SELECTION_INFO_LEFT_PADDING_INC SELECTION_INFO_VER_PADDING_INC;
             fixed: 1 1;
             align: 0.5 0.0;
             rel1 { relative: 0.0 0.0; to: "bg"; }
@@ -64,7 +64,7 @@ group { name: "elm/standard/selectioninfo/vertical/bottom_12";
             color: SELECTION_INFO_TEXT_COLOR_INC;
             text {
                font: "SLP";
-               size: 20;
+               size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
                text: "";
                align: 0.0 0.5;
             }
@@ -90,7 +90,7 @@ group { name: "elm/standard/selectioninfo/vertical/bottom_64";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 480 94;
+            min: SELECTION_INFO_MIN_VER_W_INC SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC;
             fixed: 1 1;
             align: 0.5 1.0;
             rel1.relative: 0.5 1.0;
@@ -104,11 +104,11 @@ group { name: "elm/standard/selectioninfo/vertical/bottom_64";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 0 30;
+            min: 0 SELECTION_INFO_VER_PADDING_INC;
             fixed: 0 1;
             align: 0.5 0.0;
             rel1 { relative: 0.0 0.0; to: "bg"; }
-            rel2 { relative: 1.0 30/94; to: "bg"; }
+            rel2 { relative: 1.0 0.32; to: "bg"; }
             color: SELECTION_INFO_BACKGROUND_COLOR_INC;
          }
       }
@@ -117,7 +117,7 @@ group { name: "elm/standard/selectioninfo/vertical/bottom_64";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 10 30;
+            min: SELECTION_INFO_LEFT_PADDING_INC SELECTION_INFO_VER_PADDING_INC;
             fixed: 1 1;
             align: 0.5 0.0;
             rel1 { relative: 0.0 0.0; to: "base"; }
@@ -138,7 +138,7 @@ group { name: "elm/standard/selectioninfo/vertical/bottom_64";
             color: SELECTION_INFO_TEXT_COLOR_INC;
             text {
                font: "SLP";
-               size: 20;
+               size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
                text: "";
                align: 0.0 0.5;
             }
@@ -165,7 +165,7 @@ group { name: "elm/standard/selectioninfo/vertical/bottom_86";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 480 116;
+            min: SELECTION_INFO_MIN_VER_W_INC SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC;
             fixed: 1 1;
             align: 0.5 1.0;
             rel1.relative: 0.5 1.0;
@@ -180,11 +180,11 @@ group { name: "elm/standard/selectioninfo/vertical/bottom_86";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 0 30;
+            min: 0 SELECTION_INFO_VER_PADDING_INC;
             fixed: 0 1;
             align: 0.5 0.0;
             rel1 { relative: 0.0 0.0; to: "bg"; }
-            rel2 { relative: 1.0 30/116; to: "bg"; }
+            rel2 { relative: 1.0 0.258; to: "bg"; }
             color: SELECTION_INFO_BACKGROUND_COLOR_INC;
          }
       }
@@ -193,7 +193,7 @@ group { name: "elm/standard/selectioninfo/vertical/bottom_86";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 10 30;
+            min: SELECTION_INFO_LEFT_PADDING_INC SELECTION_INFO_VER_PADDING_INC;
             fixed: 1 1;
             align: 0.5 0.0;
             rel1 { relative: 0.0 0.0; to: "base"; }
@@ -214,7 +214,7 @@ group { name: "elm/standard/selectioninfo/vertical/bottom_86";
             color: SELECTION_INFO_TEXT_COLOR_INC;
             text {
                font: "SLP";
-               size: 20;
+               size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
                text: "";
                align: 0.0 0.5;
             }
@@ -240,7 +240,7 @@ group { name: "elm/standard/selectioninfo/horizontal/bottom_12";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 800 30;
+            min: SELECTION_INFO_MIN_HORZ_W_INC SELECTION_INFO_VER_PADDING_INC;
             fixed: 1 1;
             align: 0.5 1.0;
             rel1.relative: 0.5 1.0;
@@ -253,7 +253,7 @@ group { name: "elm/standard/selectioninfo/horizontal/bottom_12";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 10 30;
+            min: SELECTION_INFO_LEFT_PADDING_INC SELECTION_INFO_VER_PADDING_INC;
             fixed: 1 1;
             align: 0.5 0.0;
             rel1 { relative: 0.0 0.0; to: "bg"; }
@@ -274,7 +274,7 @@ group { name: "elm/standard/selectioninfo/horizontal/bottom_12";
             color: SELECTION_INFO_TEXT_COLOR_INC;
             text {
                font: "SLP";
-               size: 20;
+               size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
                text: "";
                align: 0.0 0.5;
             }
@@ -300,7 +300,7 @@ group { name: "elm/standard/selectioninfo/horizontal/bottom_64";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 800 94;
+            min: SELECTION_INFO_MIN_HORZ_W_INC SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC;
             fixed: 1 1;
             align: 0.5 1.0;
             rel1.relative: 0.5 1.0;
@@ -314,11 +314,11 @@ group { name: "elm/standard/selectioninfo/horizontal/bottom_64";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 0 30;
+            min: 0 SELECTION_INFO_VER_PADDING_INC;
             fixed: 0 1;
             align: 0.5 0.0;
             rel1 { relative: 0.0 0.0; to: "bg"; }
-            rel2 { relative: 1.0 30/94; to: "bg"; }
+            rel2 { relative: 1.0 0.32; to: "bg"; }
             color: SELECTION_INFO_BACKGROUND_COLOR_INC;
          }
       }
@@ -327,7 +327,7 @@ group { name: "elm/standard/selectioninfo/horizontal/bottom_64";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 10 30;
+            min: SELECTION_INFO_LEFT_PADDING_INC SELECTION_INFO_VER_PADDING_INC;
             fixed: 1 1;
             align: 0.5 0.0;
             rel1 { relative: 0.0 0.0; to: "base"; }
@@ -348,7 +348,7 @@ group { name: "elm/standard/selectioninfo/horizontal/bottom_64";
             color: SELECTION_INFO_TEXT_COLOR_INC;
             text {
                font: "SLP";
-               size: 20;
+               size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
                text: "";
                align: 0.0 0.5;
             }
@@ -375,7 +375,7 @@ group { name: "elm/standard/selectioninfo/horizontal/bottom_86";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 800 116;
+            min: SELECTION_INFO_MIN_HORZ_W_INC SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC;
             fixed: 1 1;
             align: 0.5 1.0;
             rel1.relative: 0.5 1.0;
@@ -390,11 +390,11 @@ group { name: "elm/standard/selectioninfo/horizontal/bottom_86";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 0 30;
+            min: 0 SELECTION_INFO_VER_PADDING_INC;
             fixed: 0 1;
             align: 0.5 0.0;
             rel1 { relative: 0.0 0.0; to: "bg"; }
-            rel2 { relative: 1.0 30/116; to: "bg"; }
+            rel2 { relative: 1.0 0.258; to: "bg"; }
             color: SELECTION_INFO_BACKGROUND_COLOR_INC;
          }
       }
@@ -403,7 +403,7 @@ group { name: "elm/standard/selectioninfo/horizontal/bottom_86";
          scale : 1;
          description {
             state: "default" 0.0;
-            min: 10 30;
+            min: SELECTION_INFO_LEFT_PADDING_INC SELECTION_INFO_VER_PADDING_INC;
             fixed: 1 1;
             align: 0.5 0.0;
             rel1 { relative: 0.0 0.0; to: "base"; }
@@ -424,7 +424,7 @@ group { name: "elm/standard/selectioninfo/horizontal/bottom_86";
             color: SELECTION_INFO_TEXT_COLOR_INC;
             text {
                font: "SLP";
-               size: 20;
+               size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
                text: "";
                align: 0.0 0.5;
             }

diff --git a/themes/images/nbeat-black-hd/00_winset_NoContents_image.png b/themes/images/nbeat-black-hd/00_winset_NoContents_image.png
index f35f8e2..8123ba6 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_NoContents_image.png and b/themes/images/nbeat-black-hd/00_winset_NoContents_image.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_NoContents_multimedia.png b/themes/images/nbeat-black-hd/00_winset_NoContents_multimedia.png
index d7dab9b..a59046f 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_NoContents_multimedia.png and b/themes/images/nbeat-black-hd/00_winset_NoContents_multimedia.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_NoContents_text.png b/themes/images/nbeat-black-hd/00_winset_NoContents_text.png
index e9b3f6e..0272309 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_NoContents_text.png and b/themes/images/nbeat-black-hd/00_winset_NoContents_text.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_NoContents_unnamed.png b/themes/images/nbeat-black-hd/00_winset_NoContents_unnamed.png
index 0b7cc33..2114d24 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_NoContents_unnamed.png and b/themes/images/nbeat-black-hd/00_winset_NoContents_unnamed.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_btn_sge_body_normal_centre.png b/themes/images/nbeat-black-hd/00_winset_btn_sge_body_normal_centre.png
index 46b037f..11d6eb2 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_btn_sge_body_normal_centre.png and b/themes/images/nbeat-black-hd/00_winset_btn_sge_body_normal_centre.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_btn_sge_body_normal_left.png b/themes/images/nbeat-black-hd/00_winset_btn_sge_body_normal_left.png
index ad7b6e4..79505bd 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_btn_sge_body_normal_left.png and b/themes/images/nbeat-black-hd/00_winset_btn_sge_body_normal_left.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_btn_sge_body_normal_right.png b/themes/images/nbeat-black-hd/00_winset_btn_sge_body_normal_right.png
index 1883a61..a6ef5e3 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_btn_sge_body_normal_right.png and b/themes/images/nbeat-black-hd/00_winset_btn_sge_body_normal_right.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_btn_sge_normal_centre.png b/themes/images/nbeat-black-hd/00_winset_btn_sge_normal_centre.png
index c3d1dab..541172e 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_btn_sge_normal_centre.png and b/themes/images/nbeat-black-hd/00_winset_btn_sge_normal_centre.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_btn_sge_normal_left.png b/themes/images/nbeat-black-hd/00_winset_btn_sge_normal_left.png
index 0a6b6f5..9d5e536 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_btn_sge_normal_left.png and b/themes/images/nbeat-black-hd/00_winset_btn_sge_normal_left.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_btn_sge_normal_right.png b/themes/images/nbeat-black-hd/00_winset_btn_sge_normal_right.png
index 4ef3af7..b0ff016 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_btn_sge_normal_right.png and b/themes/images/nbeat-black-hd/00_winset_btn_sge_normal_right.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_btn_sge_press_right.png b/themes/images/nbeat-black-hd/00_winset_btn_sge_press_01.png
similarity index 90%
rename from themes/images/nbeat-black-hd/00_winset_btn_sge_press_right.png
rename to themes/images/nbeat-black-hd/00_winset_btn_sge_press_01.png
index ead2660..478f480 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_btn_sge_press_right.png and b/themes/images/nbeat-black-hd/00_winset_btn_sge_press_01.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_btn_sge_press_center.png b/themes/images/nbeat-black-hd/00_winset_btn_sge_press_02.png
similarity index 93%
rename from themes/images/nbeat-black-hd/00_winset_btn_sge_press_center.png
rename to themes/images/nbeat-black-hd/00_winset_btn_sge_press_02.png
index 56e9ca4..913a996 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_btn_sge_press_center.png and b/themes/images/nbeat-black-hd/00_winset_btn_sge_press_02.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_btn_sge_press_normal.png b/themes/images/nbeat-black-hd/00_winset_btn_sge_press_normal.png
index b1638f9..20cd6d4 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_btn_sge_press_normal.png and b/themes/images/nbeat-black-hd/00_winset_btn_sge_press_normal.png differ

diff --git a/themes/images/nbeat-black/00_winset_btn_sge_body_normal_centre.png b/themes/images/nbeat-black/00_winset_btn_sge_body_normal_centre.png
index 41ee1bc..cb0eb42 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_btn_sge_body_normal_centre.png and b/themes/images/nbeat-black/00_winset_btn_sge_body_normal_centre.png differ

diff --git a/themes/images/nbeat-black/00_winset_btn_sge_body_normal_left.png b/themes/images/nbeat-black/00_winset_btn_sge_body_normal_left.png
index 49aac1f..571c3ad 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_btn_sge_body_normal_left.png and b/themes/images/nbeat-black/00_winset_btn_sge_body_normal_left.png differ

diff --git a/themes/images/nbeat-black/00_winset_btn_sge_body_normal_right.png b/themes/images/nbeat-black/00_winset_btn_sge_body_normal_right.png
index 0d528c5..1e89f50 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_btn_sge_body_normal_right.png and b/themes/images/nbeat-black/00_winset_btn_sge_body_normal_right.png differ

diff --git a/themes/images/nbeat-black/00_winset_btn_sge_body_press_center.png b/themes/images/nbeat-black/00_winset_btn_sge_body_press_center.png
index b364fb0..f65b13f 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_btn_sge_body_press_center.png and b/themes/images/nbeat-black/00_winset_btn_sge_body_press_center.png differ

diff --git a/themes/images/nbeat-black/00_winset_btn_sge_body_press_left.png b/themes/images/nbeat-black/00_winset_btn_sge_body_press_left.png
index 838f1db..5c7008f 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_btn_sge_body_press_left.png and b/themes/images/nbeat-black/00_winset_btn_sge_body_press_left.png differ

diff --git a/themes/images/nbeat-black/00_winset_btn_sge_body_press_right.png b/themes/images/nbeat-black/00_winset_btn_sge_body_press_right.png
index 16804e4..dc350bf 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_btn_sge_body_press_right.png and b/themes/images/nbeat-black/00_winset_btn_sge_body_press_right.png differ

diff --git a/themes/images/nbeat-black/00_winset_btn_sge_normal_centre.png b/themes/images/nbeat-black/00_winset_btn_sge_normal_centre.png
index 8ef2564..a8c2627 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_btn_sge_normal_centre.png and b/themes/images/nbeat-black/00_winset_btn_sge_normal_centre.png differ

diff --git a/themes/images/nbeat-black/00_winset_btn_sge_normal_left.png b/themes/images/nbeat-black/00_winset_btn_sge_normal_left.png
index a592e58..c541cf6 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_btn_sge_normal_left.png and b/themes/images/nbeat-black/00_winset_btn_sge_normal_left.png differ

diff --git a/themes/images/nbeat-black/00_winset_btn_sge_normal_right.png b/themes/images/nbeat-black/00_winset_btn_sge_normal_right.png
index ec31e05..e146732 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_btn_sge_normal_right.png and b/themes/images/nbeat-black/00_winset_btn_sge_normal_right.png differ

diff --git a/themes/images/nbeat-black/00_winset_btn_sge_press_01.png b/themes/images/nbeat-black/00_winset_btn_sge_press_01.png
new file mode 100644 (file)
index 0000000..c281c4e
Binary files /dev/null and b/themes/images/nbeat-black/00_winset_btn_sge_press_01.png differ

diff --git a/themes/images/nbeat-black/00_winset_btn_sge_press_center.png b/themes/images/nbeat-black/00_winset_btn_sge_press_02.png
similarity index 93%
rename from themes/images/nbeat-black/00_winset_btn_sge_press_center.png
rename to themes/images/nbeat-black/00_winset_btn_sge_press_02.png
index 6c76010..4fa1193 100644 (file)
Binary files a/themes/images/nbeat-black/00_winset_btn_sge_press_center.png and b/themes/images/nbeat-black/00_winset_btn_sge_press_02.png differ

diff --git a/themes/images/nbeat-black/00_winset_btn_sge_press_03.png b/themes/images/nbeat-black/00_winset_btn_sge_press_03.png
new file mode 100644 (file)
index 0000000..b41d5c9
Binary files /dev/null and b/themes/images/nbeat-black/00_winset_btn_sge_press_03.png differ

diff --git a/themes/images/nbeat-black/00_winset_btn_sge_press_left.png b/themes/images/nbeat-black/00_winset_btn_sge_press_left.png
deleted file mode 100644 (file)
index b4ae6ce..0000000
Binary files a/themes/images/nbeat-black/00_winset_btn_sge_press_left.png and /dev/null differ

diff --git a/themes/images/nbeat-black/00_winset_btn_sge_press_right.png b/themes/images/nbeat-black/00_winset_btn_sge_press_right.png
deleted file mode 100644 (file)
index 30a465f..0000000
Binary files a/themes/images/nbeat-black/00_winset_btn_sge_press_right.png and /dev/null differ

diff --git a/themes/images/nbeat-hd/00_winset_NoContents_image.png b/themes/images/nbeat-hd/00_winset_NoContents_image.png
index f35f8e2..0cf0a61 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_NoContents_image.png and b/themes/images/nbeat-hd/00_winset_NoContents_image.png differ

diff --git a/themes/images/nbeat-hd/00_winset_NoContents_multimedia.png b/themes/images/nbeat-hd/00_winset_NoContents_multimedia.png
index d7dab9b..25f9c4f 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_NoContents_multimedia.png and b/themes/images/nbeat-hd/00_winset_NoContents_multimedia.png differ

diff --git a/themes/images/nbeat-hd/00_winset_NoContents_text.png b/themes/images/nbeat-hd/00_winset_NoContents_text.png
index e9b3f6e..7bf9338 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_NoContents_text.png and b/themes/images/nbeat-hd/00_winset_NoContents_text.png differ

diff --git a/themes/images/nbeat-hd/00_winset_NoContents_unnamed.png b/themes/images/nbeat-hd/00_winset_NoContents_unnamed.png
index 0b7cc33..e3708d8 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_NoContents_unnamed.png and b/themes/images/nbeat-hd/00_winset_NoContents_unnamed.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_body.png b/themes/images/nbeat-hd/00_winset_btn_sge_body.png
index e072b6e..379b121 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_body.png and b/themes/images/nbeat-hd/00_winset_btn_sge_body.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_body_normal_centre.png b/themes/images/nbeat-hd/00_winset_btn_sge_body_normal_centre.png
index 46b037f..003600e 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_body_normal_centre.png and b/themes/images/nbeat-hd/00_winset_btn_sge_body_normal_centre.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_body_normal_left.png b/themes/images/nbeat-hd/00_winset_btn_sge_body_normal_left.png
index ad7b6e4..1e7b6af 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_body_normal_left.png and b/themes/images/nbeat-hd/00_winset_btn_sge_body_normal_left.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_body_normal_right.png b/themes/images/nbeat-hd/00_winset_btn_sge_body_normal_right.png
index 1883a61..f63af56 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_body_normal_right.png and b/themes/images/nbeat-hd/00_winset_btn_sge_body_normal_right.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_body_press_center.png b/themes/images/nbeat-hd/00_winset_btn_sge_body_press_center.png
index 35bb31b..a094cba 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_body_press_center.png and b/themes/images/nbeat-hd/00_winset_btn_sge_body_press_center.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_body_press_left.png b/themes/images/nbeat-hd/00_winset_btn_sge_body_press_left.png
index cbc5d15..b0013bd 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_body_press_left.png and b/themes/images/nbeat-hd/00_winset_btn_sge_body_press_left.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_body_press_right.png b/themes/images/nbeat-hd/00_winset_btn_sge_body_press_right.png
index df5dea3..afbe869 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_body_press_right.png and b/themes/images/nbeat-hd/00_winset_btn_sge_body_press_right.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_normal.png b/themes/images/nbeat-hd/00_winset_btn_sge_normal.png
index 1a6680a..da19eb4 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_normal.png and b/themes/images/nbeat-hd/00_winset_btn_sge_normal.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_normal_centre.png b/themes/images/nbeat-hd/00_winset_btn_sge_normal_centre.png
index c3d1dab..3c43a1e 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_normal_centre.png and b/themes/images/nbeat-hd/00_winset_btn_sge_normal_centre.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_normal_left.png b/themes/images/nbeat-hd/00_winset_btn_sge_normal_left.png
index 0a6b6f5..7fa610e 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_normal_left.png and b/themes/images/nbeat-hd/00_winset_btn_sge_normal_left.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_normal_right.png b/themes/images/nbeat-hd/00_winset_btn_sge_normal_right.png
index 4ef3af7..21993d6 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_normal_right.png and b/themes/images/nbeat-hd/00_winset_btn_sge_normal_right.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_press_01.png b/themes/images/nbeat-hd/00_winset_btn_sge_press_01.png
new file mode 100644 (file)
index 0000000..478f480
Binary files /dev/null and b/themes/images/nbeat-hd/00_winset_btn_sge_press_01.png differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_press_center.png b/themes/images/nbeat-hd/00_winset_btn_sge_press_02.png
similarity index 93%
rename from themes/images/nbeat/00_winset_btn_sge_press_center.png
rename to themes/images/nbeat-hd/00_winset_btn_sge_press_02.png
index 56e9ca4..913a996 100644 (file)
Binary files a/themes/images/nbeat/00_winset_btn_sge_press_center.png and b/themes/images/nbeat-hd/00_winset_btn_sge_press_02.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_press_03.png b/themes/images/nbeat-hd/00_winset_btn_sge_press_03.png
new file mode 100644 (file)
index 0000000..b7b005e
Binary files /dev/null and b/themes/images/nbeat-hd/00_winset_btn_sge_press_03.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_press_left.png b/themes/images/nbeat-hd/00_winset_btn_sge_press_left.png
deleted file mode 100644 (file)
index 4f5121e..0000000
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_press_left.png and /dev/null differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_press_normal.png b/themes/images/nbeat-hd/00_winset_btn_sge_press_normal.png
index b1638f9..4b95e6d 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_press_normal.png and b/themes/images/nbeat-hd/00_winset_btn_sge_press_normal.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_press_right.png b/themes/images/nbeat-hd/00_winset_btn_sge_press_right.png
deleted file mode 100644 (file)
index ead2660..0000000
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_press_right.png and /dev/null differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_body_normal_centre.png b/themes/images/nbeat/00_winset_btn_sge_body_normal_centre.png
index 46b037f..4f0ff01 100644 (file)
Binary files a/themes/images/nbeat/00_winset_btn_sge_body_normal_centre.png and b/themes/images/nbeat/00_winset_btn_sge_body_normal_centre.png differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_body_normal_left.png b/themes/images/nbeat/00_winset_btn_sge_body_normal_left.png
index ad7b6e4..ae08a4b 100644 (file)
Binary files a/themes/images/nbeat/00_winset_btn_sge_body_normal_left.png and b/themes/images/nbeat/00_winset_btn_sge_body_normal_left.png differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_body_normal_right.png b/themes/images/nbeat/00_winset_btn_sge_body_normal_right.png
index 1883a61..c3d29df 100644 (file)
Binary files a/themes/images/nbeat/00_winset_btn_sge_body_normal_right.png and b/themes/images/nbeat/00_winset_btn_sge_body_normal_right.png differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_body_press_center.png b/themes/images/nbeat/00_winset_btn_sge_body_press_center.png
index 35bb31b..28fe05b 100644 (file)
Binary files a/themes/images/nbeat/00_winset_btn_sge_body_press_center.png and b/themes/images/nbeat/00_winset_btn_sge_body_press_center.png differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_body_press_left.png b/themes/images/nbeat/00_winset_btn_sge_body_press_left.png
index cbc5d15..5ab65eb 100644 (file)
Binary files a/themes/images/nbeat/00_winset_btn_sge_body_press_left.png and b/themes/images/nbeat/00_winset_btn_sge_body_press_left.png differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_body_press_right.png b/themes/images/nbeat/00_winset_btn_sge_body_press_right.png
index df5dea3..1f02e57 100644 (file)
Binary files a/themes/images/nbeat/00_winset_btn_sge_body_press_right.png and b/themes/images/nbeat/00_winset_btn_sge_body_press_right.png differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_normal_centre.png b/themes/images/nbeat/00_winset_btn_sge_normal_centre.png
index c3d1dab..8b33691 100644 (file)
Binary files a/themes/images/nbeat/00_winset_btn_sge_normal_centre.png and b/themes/images/nbeat/00_winset_btn_sge_normal_centre.png differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_normal_left.png b/themes/images/nbeat/00_winset_btn_sge_normal_left.png
index 0a6b6f5..d342a95 100644 (file)
Binary files a/themes/images/nbeat/00_winset_btn_sge_normal_left.png and b/themes/images/nbeat/00_winset_btn_sge_normal_left.png differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_normal_right.png b/themes/images/nbeat/00_winset_btn_sge_normal_right.png
index 4ef3af7..b45dc03 100644 (file)
Binary files a/themes/images/nbeat/00_winset_btn_sge_normal_right.png and b/themes/images/nbeat/00_winset_btn_sge_normal_right.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_btn_sge_press_left.png b/themes/images/nbeat/00_winset_btn_sge_press_01.png
similarity index 90%
rename from themes/images/nbeat-black-hd/00_winset_btn_sge_press_left.png
rename to themes/images/nbeat/00_winset_btn_sge_press_01.png
index 4f5121e..6c77303 100644 (file)
Binary files a/themes/images/nbeat-black-hd/00_winset_btn_sge_press_left.png and b/themes/images/nbeat/00_winset_btn_sge_press_01.png differ

diff --git a/themes/images/nbeat-hd/00_winset_btn_sge_press_center.png b/themes/images/nbeat/00_winset_btn_sge_press_02.png
similarity index 93%
rename from themes/images/nbeat-hd/00_winset_btn_sge_press_center.png
rename to themes/images/nbeat/00_winset_btn_sge_press_02.png
index 56e9ca4..4fa1193 100644 (file)
Binary files a/themes/images/nbeat-hd/00_winset_btn_sge_press_center.png and b/themes/images/nbeat/00_winset_btn_sge_press_02.png differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_press_03.png b/themes/images/nbeat/00_winset_btn_sge_press_03.png
new file mode 100644 (file)
index 0000000..feae1a5
Binary files /dev/null and b/themes/images/nbeat/00_winset_btn_sge_press_03.png differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_press_left.png b/themes/images/nbeat/00_winset_btn_sge_press_left.png
deleted file mode 100644 (file)
index 4f5121e..0000000
Binary files a/themes/images/nbeat/00_winset_btn_sge_press_left.png and /dev/null differ

diff --git a/themes/images/nbeat/00_winset_btn_sge_press_right.png b/themes/images/nbeat/00_winset_btn_sge_press_right.png
deleted file mode 100644 (file)
index ead2660..0000000
Binary files a/themes/images/nbeat/00_winset_btn_sge_press_right.png and /dev/null differ

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index ac9acd2..3151912 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -510,11 +510,15 @@
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_PRESSED_INC 48 84 100 255
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_SELECTED_INC 48 84 100 255
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_DISABLED_INC 158 195 213 255
+#define SEGMENT_CONTROL_ITEM_1PX_LEFT_PADDING_COLOR_INC 26 54 67 255
+#define SEGMENT_CONTROL_ITEM_1PX_RIGHT_PADDING_COLOR_INC 47 92 113 255
 
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_NORMAL_INC 144 144 144 255
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_PRESSED_INC 249 249 249 255
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_SELECTED_INC 249 249 249 255
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_DISABLED_INC 144 144 144 255
+#define SEGMENT_CONTROL_BODY_ITEM_1PX_LEFT_PADDING_COLOR_INC 56 56 56 255
+#define SEGMENT_CONTROL_BODY_ITEM_1PX_RIGHT_PADDING_COLOR_INC 90 90 90 255
 
 #define SEGMENT_CONTROL_TEXT_SIZE_INC 28
 #define SEGMENT_CONTROL_TEXT_SIZE_RANGE_MIN_INC 12
@@ -617,7 +621,14 @@
 #define SEARCHBAR_H_INC 107
 
 #define SELECTION_INFO_BACKGROUND_COLOR_INC          52 74 85 255
-#define SELECTION_INFO_TEXT_COLOR_INC          249 249 249 255
+#define SELECTION_INFO_TEXT_COLOR_INC                249 249 249 255
+#define SELECTION_INFO_MIN_VER_W_INC                 720
+#define SELECTION_INFO_MIN_HORZ_W_INC                1280
+#define SELECTION_INFO_VER_PADDING_INC               48
+#define SELECTION_INFO_LEFT_PADDING_INC              16
+#define SELECTION_INFO_TEXT_FONT_SIZE_INC            32
+#define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC       150
+#define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC       186
 
 #define PROGRESSBAR_DEFAULT_STYLE_TEXT_COLOR_INC          249 249 249 255
 #define PROGRESSBAR_DEFAULT_STYLE_STATUS_TEXT_COLOR_INC          249 249 249 255
@@ -633,6 +644,9 @@
 #define PROGRESSBAR_LIST_PENDING_MIN_WIDTH_INC 500
 
 #define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 81 78 76 255
+#define NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC   42
+#define NOCONTENT_MIDDLE_PADDING_INC         54
+#define NOCONTENT_BASE_SEARCH_PADDING_INC    40
 
 #define ENTRY_TEXT_SIZE_INC 44
 #define ENTRY_TEXT_COLOR_INC "#FFFFFF"

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 71d4ea8..00a4597 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -495,11 +495,15 @@
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_PRESSED_INC 48 84 100 255
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_SELECTED_INC 48 84 100 255
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_DISABLED_INC 158 195 213 255
+#define SEGMENT_CONTROL_ITEM_1PX_LEFT_PADDING_COLOR_INC 26 54 67 255
+#define SEGMENT_CONTROL_ITEM_1PX_RIGHT_PADDING_COLOR_INC 47 92 113 255
 
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_NORMAL_INC 144 144 144 255
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_PRESSED_INC 249 249 249 255
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_SELECTED_INC 249 249 249 255
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_DISABLED_INC 144 144 144 255
+#define SEGMENT_CONTROL_BODY_ITEM_1PX_LEFT_PADDING_COLOR_INC 56 56 56 255
+#define SEGMENT_CONTROL_BODY_ITEM_1PX_RIGHT_PADDING_COLOR_INC 90 90 90 255
 
 #define SEGMENT_CONTROL_TEXT_SIZE_INC 18
 #define SEGMENT_CONTROL_TEXT_SIZE_RANGE_MIN_INC 12
@@ -604,6 +608,14 @@
 #define SELECTION_INFO_BACKGROUND_COLOR_INC          52 74 85 255
 #define SELECTION_INFO_TEXT_COLOR_INC          249 249 249 255
 
+#define SELECTION_INFO_MIN_VER_W_INC                 480
+#define SELECTION_INFO_MIN_HORZ_W_INC                800
+#define SELECTION_INFO_VER_PADDING_INC               30
+#define SELECTION_INFO_LEFT_PADDING_INC              10
+#define SELECTION_INFO_TEXT_FONT_SIZE_INC            20
+#define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC       94
+#define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC       116
+
 #define PROGRESSBAR_DEFAULT_STYLE_TEXT_COLOR_INC          249 249 249 255
 #define PROGRESSBAR_DEFAULT_STYLE_STATUS_TEXT_COLOR_INC          249 249 249 255
 #define PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC          249 249 249 255
@@ -620,6 +632,9 @@
 #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 10
 
 #define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 81 78 76 255
+#define NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC   26
+#define NOCONTENT_MIDDLE_PADDING_INC         34
+#define NOCONTENT_BASE_SEARCH_PADDING_INC    25
 
 #define ENTRY_TEXT_SIZE_INC 28
 #define ENTRY_TEXT_COLOR_INC "#FFFFFF"

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index 0812b4e..230157d 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -526,11 +526,15 @@
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_PRESSED_INC 0 0 0 255
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_SELECTED_INC 0 0 0 255
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_DISABLED_INC 244 212 174 255
+#define SEGMENT_CONTROL_ITEM_1PX_LEFT_PADDING_COLOR_INC 172 112 16 255
+#define SEGMENT_CONTROL_ITEM_1PX_RIGHT_PADDING_COLOR_INC 201 114 54 255
 
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_NORMAL_INC 149 145 136 255
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_PRESSED_INC 255 255 255 255
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_SELECTED_INC 255 255 255 255
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_DISABLED_INC 149 145 136 255
+#define SEGMENT_CONTROL_BODY_ITEM_1PX_LEFT_PADDING_COLOR_INC 203 193 182 255
+#define SEGMENT_CONTROL_BODY_ITEM_1PX_RIGHT_PADDING_COLOR_INC 255 250 239 255
 
 #define SEGMENT_CONTROL_TEXT_SIZE_INC 28
 #define SEGMENT_CONTROL_TEXT_SIZE_RANGE_MIN_INC 12
@@ -635,6 +639,14 @@
 #define SELECTION_INFO_BACKGROUND_COLOR_INC          217 147 26 255
 #define SELECTION_INFO_TEXT_COLOR_INC          255 255 255 255
 
+#define SELECTION_INFO_MIN_VER_W_INC                 720
+#define SELECTION_INFO_MIN_HORZ_W_INC                1280
+#define SELECTION_INFO_VER_PADDING_INC               48
+#define SELECTION_INFO_LEFT_PADDING_INC              16
+#define SELECTION_INFO_TEXT_FONT_SIZE_INC            32
+#define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC       150
+#define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC       186
+
 #define PROGRESSBAR_DEFAULT_STYLE_TEXT_COLOR_INC          224 224 224 255
 #define PROGRESSBAR_DEFAULT_STYLE_STATUS_TEXT_COLOR_INC          255 255 255 255
 #define PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC          0 0 0 255
@@ -648,7 +660,10 @@
 #define PROGRESSBAR_LIST_PENDING_HEIGHT_INC 16
 #define PROGRESSBAR_LIST_PENDING_MIN_WIDTH_INC 500
 
-#define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 173 170 165 255
+#define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC  173 170 165 255
+#define NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC    42
+#define NOCONTENT_MIDDLE_PADDING_INC          54
+#define NOCONTENT_BASE_SEARCH_PADDING_INC     40
 
 #define ENTRY_TEXT_SIZE_INC 44
 #define ENTRY_TEXT_COLOR_INC "#000000"

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index da28667..b57b48e 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -519,11 +519,15 @@
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_PRESSED_INC 0 0 0 255
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_SELECTED_INC 0 0 0 255
 #define SEGMENT_CONTROL_ITEM_TITLE_TEXT_COLOR_DISABLED_INC 244 212 174 255
+#define SEGMENT_CONTROL_ITEM_1PX_LEFT_PADDING_COLOR_INC 172 112 16 255
+#define SEGMENT_CONTROL_ITEM_1PX_RIGHT_PADDING_COLOR_INC 201 114 54 255
 
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_NORMAL_INC 149 145 136 255
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_PRESSED_INC 255 255 255 255
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_SELECTED_INC 255 255 255 255
 #define SEGMENT_CONTROL_BODY_STYLE_ITEM_TITLE_TEXT_COLOR_DISABLED_INC 149 145 136 255
+#define SEGMENT_CONTROL_BODY_ITEM_1PX_LEFT_PADDING_COLOR_INC 203 193 182 255
+#define SEGMENT_CONTROL_BODY_ITEM_1PX_RIGHT_PADDING_COLOR_INC 255 250 239 255
 
 #define SEGMENT_CONTROL_TEXT_SIZE_INC 18
 #define SEGMENT_CONTROL_TEXT_SIZE_RANGE_MIN_INC 12
@@ -626,7 +630,15 @@
 #define SEARCHBAR_H_INC 67
 
 #define SELECTION_INFO_BACKGROUND_COLOR_INC          217 147 26 255
-#define SELECTION_INFO_TEXT_COLOR_INC          255 255 255 255
+#define SELECTION_INFO_TEXT_COLOR_INC                255 255 255 255
+#define SELECTION_INFO_MIN_VER_W_INC                 480
+#define SELECTION_INFO_MIN_HORZ_W_INC                800
+#define SELECTION_INFO_VER_PADDING_INC               30
+#define SELECTION_INFO_LEFT_PADDING_INC              10
+#define SELECTION_INFO_TEXT_FONT_SIZE_INC            20
+#define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC       94
+#define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC       116
+
 #define PROGRESSBAR_DEFAULT_STYLE_TEXT_COLOR_INC          224 224 224 255
 #define PROGRESSBAR_DEFAULT_STYLE_STATUS_TEXT_COLOR_INC          255 255 255 255
 #define PROGRESSBAR_LIST_PROGRESS_STYLE_TEXT_COLOR_INC          0 0 0 255
@@ -643,6 +655,9 @@
 #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 10
 
 #define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 173 170 165 255
+#define NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC   26
+#define NOCONTENT_MIDDLE_PADDING_INC         34
+#define NOCONTENT_BASE_SEARCH_PADDING_INC    25
 
 #define ENTRY_TEXT_SIZE_INC 28
 #define ENTRY_TEXT_COLOR_INC "#000000"