[bubble, multiline] GUI changes

diff --git a/themes/groups/entry.edc b/themes/groups/entry.edc
index 1526dc4..e51bb35 100644 (file)
--- a/themes/groups/entry.edc
+++ b/themes/groups/entry.edc
@@ -1325,7 +1325,8 @@
                }
        } 
 
-#define BUBBLE_X_PAD 15
+#define BUBBLE_EX_PAD 10
+#define BUBBLE_IX_PAD 14
 #define BUBBLE_Y_PAD 10
 
    group { name: "elm/entry/base/readmessage";
@@ -1342,7 +1343,7 @@
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_X_PAD 0;
+              min: BUBBLE_EX_PAD 0;
                fixed: 1 0;
               align: 0.0 0.0;
                color: 0 0 0 0;
@@ -1355,7 +1356,7 @@
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_X_PAD 0;
+              min: BUBBLE_IX_PAD 0;
               fixed: 1 0;
               align: 0.0 0.0;
                color: 0 0 0 0;
@@ -1472,7 +1473,7 @@
            scale: 1;
            description {
               state: "default" 0.0;
-               min: BUBBLE_X_PAD 0;
+               min: BUBBLE_EX_PAD 0;
                fixed: 1 0;
               align: 0.0 0.0;
                color: 0 0 0 0;
@@ -1485,7 +1486,7 @@
            scale: 1;
            description {
               state: "default" 0.0;
-               min: BUBBLE_X_PAD 0;
+               min: BUBBLE_IX_PAD 0;
               fixed: 1 0;
               align: 0.0 0.0;
                color: 0 0 0 0;
@@ -1600,7 +1601,7 @@
            scale: 1;
            description {
               state: "default" 0.0;
-               min: BUBBLE_X_PAD 0;
+               min: BUBBLE_EX_PAD 0;
                fixed: 1 0;
               align: 0.0 0.0;
                color: 0 0 0 0;
@@ -1613,7 +1614,7 @@
            scale: 1;
            description {
               state: "default" 0.0;
-               min: BUBBLE_X_PAD 0;
+               min: BUBBLE_IX_PAD 0;
                fixed: 1 0;
               align: 0.0 0.0;
                color: 0 0 0 0;
@@ -1728,7 +1729,7 @@
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_X_PAD 0;
+              min: BUBBLE_EX_PAD 0;
                fixed: 1 0;
               align: 1.0 0.0;
                color: 0 0 0 0;
@@ -1741,7 +1742,7 @@
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_X_PAD 0;
+              min: BUBBLE_IX_PAD 0;
               fixed: 1 0;
               align: 1.0 0.0;
                color: 0 0 0 0;
@@ -1858,7 +1859,7 @@
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_X_PAD 0;
+              min: BUBBLE_EX_PAD 0;
                fixed: 1 0;
               align: 1.0 0.0;
                color: 0 0 0 0;
@@ -1871,7 +1872,7 @@
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_X_PAD 0;
+              min: BUBBLE_IX_PAD 0;
               fixed: 1 0;
               align: 1.0 0.0;
                color: 0 0 0 0;
@@ -1986,7 +1987,7 @@
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_X_PAD 0;
+              min: BUBBLE_EX_PAD 0;
                fixed: 1 0;
               align: 1.0 0.0;
                color: 0 0 0 0;
@@ -1999,7 +2000,7 @@
            scale: 1;
            description {
               state: "default" 0.0;
-              min: BUBBLE_X_PAD 0;
+              min: BUBBLE_IX_PAD 0;
               fixed: 1 0;
               align: 1.0 0.0;
                color: 0 0 0 0;

diff --git a/themes/groups/genlist/genlist_group_title.edc b/themes/groups/genlist/genlist_group_title.edc
index 88932c7..b0b433f 100644 (file)
--- a/themes/groups/genlist/genlist_group_title.edc
+++ b/themes/groups/genlist/genlist_group_title.edc
@@ -191,10 +191,26 @@
       data.item: "treesize" "20";
    
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 30 )
+         part { name: "base";
+            type: RECT;
+            repeat_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 39;
+               color: 0 0 0 0;
+            }
+         }
          BEAT_GENLIST_PART_PADDING_LEFT( 15 )
-         BEAT_GENLIST_PART_DIALOGUE_PADDING_RIGHT( 15 )
-         
+         BEAT_GENLIST_PART_PADDING_RIGHT( 15 )
+         part { name: "text_base";
+            type: RECT;
+            repeat_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               color: 220 211 198 255;
+               rel2.relative: 1.0 0.62;
+            }
+         }
          part { name: "elm.text";
             type: TEXT;
             scale: 1;
@@ -202,14 +218,16 @@
                rel1 {
                   relative: 1.0 0.0;
                   to_x: "elm.padding.left";
+                  to_y: "text_base";
                }
                rel2 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
+                  to_y: "text_base";
                }
                color: 76 75 73 255;
                text {
-                  font: "SLP:style=Medium";
+                  font: "SLP:style=Regular";
                   size: 18;
                   min: 0 1;
                   align: 0.0 0.5;
@@ -231,10 +249,26 @@
       data.item: "treesize" "20";
    
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 30 )
+         part { name: "base";
+            type: RECT;
+            repeat_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 39;
+               color: 0 0 0 0;
+            }
+         }
          BEAT_GENLIST_PART_PADDING_LEFT( 15 )
-         BEAT_GENLIST_PART_DIALOGUE_PADDING_RIGHT( 15 )
-         
+         BEAT_GENLIST_PART_PADDING_RIGHT( 15 )
+         part { name: "text_base";
+            type: RECT;
+            repeat_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               color: 220 211 198 255;
+               rel2.relative: 1.0 0.62;
+            }
+         }
          part { name: "elm.text";
             type: TEXT;
             scale: 1;
@@ -242,14 +276,16 @@
                rel1 {
                   relative: 1.0 0.0;
                   to_x: "elm.padding.left";
+                  to_y: "text_base";
                }
                rel2 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
+                  to_y: "text_base";
                }
                color: 76 75 73 255;
                text {
-                  font: "SLP:style=Medium";
+                  font: "SLP:style=Regular";
                   size: 18;
                   min: 0 1;
                   align: 1.0 0.5;

diff --git a/themes/groups/genlist/genlist_styles.edc b/themes/groups/genlist/genlist_styles.edc
index 9be81da..18caf12 100644 (file)
--- a/themes/groups/genlist/genlist_styles.edc
+++ b/themes/groups/genlist/genlist_styles.edc
@@ -4608,24 +4608,30 @@
       data.item: "labels" "elm.text.1 elm.text.2";
       styles {
         style { name: "genlist_textblock_sub_style";
-          base: "font=SLP:style=Medium font_size=20 color=#6C6C6C wrap=char text_class=list_item";
+          base: "font=SLP:style=Regular font_size=22 color=#6C6C6C wrap=char text_class=list_item";
           tag:  "br" "\n";
           tag:  "ps" "ps";
           tag:  "tab" "\t";
         }
         style { name: "genlist_textblock_sub_selected_style";
-          base: "font=SLP:style=Medium font_size=20 color=#FFFFFF wrap=char text_class=list_item";
+          base: "font=SLP:style=Regular font_size=22 color=#FFFFFF wrap=char text_class=list_item";
           tag:  "br" "\n";
           tag:  "ps" "ps";
           tag:  "tab" "\t";
         }
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 80 )
+         part { name: "base";
+            type: RECT;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               color: 249 249 249 255;
+            }
+         }
          BEAT_GENLIST_PART_BG_IMAGE
          BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
+         BEAT_GENLIST_PART_PADDING_TOP( 10 )
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 11 )
          BEAT_GENLIST_PART_PADDING_LEFT( 10 )
          BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
 
@@ -4651,8 +4657,8 @@
                }
                color: GENLIST_PART_TEXT_COLOR_INC;
                text {
-                  font: "SLP:style=Roman";
-                  size: 28;
+                  font: "SLP:style=Regular";
+                  size: 26;
                   min: 0 1;
                   align: 0.0 0.5;
                }
@@ -4729,135 +4735,7 @@
          }
       }
    }
-   group { name: "elm/genlist/item_compress/multiline.2text.2/default";
-      alias: "elm/genlist/item_compress_odd/multiline.2text.2/default";
-
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "labels" "elm.text.1 elm.text.2";
-      styles {
-        style { name: "genlist_textblock_style";
-          base: "font=SLP:style=Roman font_size=28 color=#000000 wrap=char text_class=list_item";
-          tag:  "br" "\n";
-          tag:  "ps" "ps";
-          tag:  "tab" "\t";
-        }
-        style { name: "genlist_textblock_selected_style";
-          base: "font=SLP:style=Roman font_size=28 color=#FFFFFF wrap=char text_class=list_item";
-          tag:  "br" "\n";
-          tag:  "ps" "ps";
-          tag:  "tab" "\t";
-        }
-      }
-      parts {
-         BEAT_GENLIST_PART_BASE( 80 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
 
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.text.2";
-               }
-               text {
-                  style: "genlist_textblock_style";
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_textblock_selected_style";
-            }
-         }
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 27;
-               fixed: 0 1;
-               align: 0 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               color: GENLIST_PART_SUB_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: 20;
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
-            }
-         }
-         BEAT_GENLIST_PART_DISCLIP
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-      }
-   }
    group { name: "elm/genlist/item/readmessage/default";
       alias: "elm/genlist/item_odd/readmessage/default";
       alias: "elm/genlist/item_compress/readmessage/default";
@@ -4879,81 +4757,14 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 0.76 1.0;
-            }
-         }
-         BEAT_GENLIST_PART_DISCLIP
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         /*program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            transition: LINEAR 0.1;
-         }*/
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-      }
-   }
-   group { name: "elm/genlist/item/readmessage.withpad/default";
-      alias: "elm/genlist/item_odd/readmessage.withpad/default";
-      alias: "elm/genlist/item_compress/readmessage.withpad/default";
-      alias: "elm/genlist/item_compress_odd/readmessage.withpad/default";
-
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "icons" "elm.icon";
-      parts {
-         part { name: "base";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 242 238 233 255;
-            }
-         }
-         part { name: "elm.rect.top.pad";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 15;
-               fixed: 0 1;
-               align: 0.0 0.0;
-               color: 0 0 0 0;
-               rel2.relative: 1.0 0.0;
-            }
-         }
-         part { name: "elm.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 { relative: 0.0 1.0; to_y: "elm.rect.top.pad"; }
-               rel2.relative: 0.76 1.0;
+               //rel1 { relative: 0.0 1.0; to_y: "elm.rect.top.pad"; }
+               rel2 {
+                  relative: 0.76 0.0;
+                  to_y: "elm.padding.bottom";
+               }
             }
          }
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 15 )
          BEAT_GENLIST_PART_DISCLIP
       }
       programs {
@@ -5011,81 +4822,14 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               rel1.relative: 0.24 0.0;
-               rel2.relative: 1.0 1.0;
-            }
-         }
-         BEAT_GENLIST_PART_DISCLIP
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         /*program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            transition: LINEAR 0.1;
-         }*/
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-      }
-   }
-   group { name: "elm/genlist/item/sentmessage.withpad/default";
-      alias: "elm/genlist/item_odd/sentmessage.withpad/default";
-      alias: "elm/genlist/item_compress/sentmessage.withpad/default";
-      alias: "elm/genlist/item_compress_odd/sentmessage.withpad/default";
-
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "icons" "elm.icon";
-      parts {
-         part { name: "base";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 242 238 233 255;
-            }
-         }
-         part { name: "elm.rect.top.pad";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 15;
-               fixed: 0 1;
-               align: 0.0 0.0;
-               color: 0 0 0 0;
-               rel2.relative: 1.0 0.0;
-            }
-         }
-         part { name: "elm.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 { relative: 0.24 1.0; to_y: "elm.rect.top.pad"; }
-               rel2.relative: 1.0 1.0;
+               rel1.relative: 0.24 0.0; //to_y: "elm.rect.top.pad"; }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_y: "elm.padding.bottom";
+               }
             }
          }
+         BEAT_GENLIST_PART_PADDING_BOTTOM( 15 )
          BEAT_GENLIST_PART_DISCLIP
       }
       programs {