[Genlist] Edc refactorying. Separated textblock style files.

diff --git a/themes/groups/genlist/genlist.edc b/themes/groups/genlist/genlist.edc
index 3279422..1fddf7a 100644 (file)
--- a/themes/groups/genlist/genlist.edc
+++ b/themes/groups/genlist/genlist.edc
@@ -28,10 +28,10 @@
 #include "genlist_macro.edc"
 #include "genlist_textblock_style.edc"
 
-#include "genlist_styles.edc"
+#include "genlist_normal.edc"
 #include "genlist_sweep.edc"
-#include "genlist_group_title.edc"
-#include "genlist_expandable_list.edc"
+#include "genlist_group_index.edc"
+#include "genlist_expandable.edc"
 #include "genlist_edit.edc"
 
    group { name: "elm/list/base/matchlist";

diff --git a/themes/groups/genlist/genlist_expandable_list.edc b/themes/groups/genlist/genlist_expandable.edc
similarity index 100%
rename from themes/groups/genlist/genlist_expandable_list.edc
rename to themes/groups/genlist/genlist_expandable.edc

diff --git a/themes/groups/genlist/genlist_group_title.edc b/themes/groups/genlist/genlist_group_index.edc
similarity index 100%
rename from themes/groups/genlist/genlist_group_title.edc
rename to themes/groups/genlist/genlist_group_index.edc

diff --git a/themes/groups/genlist/genlist_styles.edc b/themes/groups/genlist/genlist_normal.edc
similarity index 99%
rename from themes/groups/genlist/genlist_styles.edc
rename to themes/groups/genlist/genlist_normal.edc
index 6161c3d..4ec6c35 100644 (file)
--- a/themes/groups/genlist/genlist_styles.edc
+++ b/themes/groups/genlist/genlist_normal.edc
@@ -36,16 +36,6 @@
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
-      styles {
-         style { name: "text_style";
-            base: "font=SLP:style=Roman font_size=28 color=#000000 wrap=char ellipsis=1.0";
-            tag:  "br" "\n";
-            tag:  "ps" "ps";
-            tag:  "tab" "\t";
-            tag:  "b" "+ font=SLP:style=Bold";
-            tag:  "match" "+ color=#E58616FF";
-         }
-      }
       parts {
          GENLIST_PART_BASE( GENLIST_HEIGHT_58_INC )
          GENLIST_PART_BG_IMAGE
@@ -409,18 +399,6 @@
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
-      styles {
-        style { name: "genlist_default_textblock_style";
-          base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_28_INC" color="GENLIST_PART_MULTILINE_TEXT_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
-          tag:  "match" GENLIST_PART_MATCH_TAG_COLOR_INC;
-          tag:  "b" "+ font=SLP:style=Bold";
-        }
-        style { name: "genlist_default_textblock_selected_style";
-          base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_28_INC" color="GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0";
-          tag:  "match" GENLIST_PART_MATCH_TAG_COLOR_INC;
-          tag:  "b" "+ font=SLP:style=Bold";
-        }
-      }
       parts {
          GENLIST_PART_BASE( GENLIST_HEIGHT_71_INC )
          GENLIST_PART_BG_IMAGE
@@ -3289,18 +3267,6 @@
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
-      styles {
-        style { name: "genlist_sub_textblock_style";
-          base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_20_INC" color="GENLIST_PART_MULTILINE_SUB_TEXT_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
-          tag:  "match" GENLIST_PART_MATCH_TAG_COLOR_INC;
-          tag:  "b" "+ font=SLP:style=Bold";
-        }
-        style { name: "genlist_sub_textblock_selected_style";
-          base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_20_INC" color="GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0";
-          tag:  "match" GENLIST_PART_MATCH_TAG_COLOR_INC;
-          tag:  "b" "+ font=SLP:style=Bold";
-        }
-      }
       parts {
          GENLIST_PART_BASE( GENLIST_HEIGHT_81_INC )
          GENLIST_PART_BG_IMAGE
@@ -9988,15 +9954,6 @@
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text.1";
-      styles {
-        style { name: "genlist_textblock_help_style";
-          base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_20_INC" color="GENLIST_PART_MULTILINE_HELP_STYLE_COLOR_INC" wrap=word text_class=list_item";
-          tag:  "br" "\n";
-          tag:  "ps" "ps";
-          tag:  "tab" "\t";
-          tag:  "b" "+ font=SLP:style=Bold";
-        }
-      }
       parts {
          part { name: "base";
             type: RECT;
@@ -10057,22 +10014,6 @@
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.text.1 elm.text.2";
-      styles {
-        style { name: "genlist_textblock_sub_style";
-          base: "font=SLP:style=Regular font_size=22 color="GENLIST_PART_MULTILINE_TITLE_STYLE_COLOR_INC" wrap=char text_class=list_item";
-          tag:  "br" "\n";
-          tag:  "ps" "ps";
-          tag:  "tab" "\t";
-          tag:  "b" "+ font=SLP:style=Bold";
-        }
-        style { name: "genlist_textblock_sub_selected_style";
-          base: "font=SLP:style=Regular font_size=22 color="GENLIST_PART_MULTILINE_TITLE_STYLE_SELECTED_COLOR_INC" wrap=char text_class=list_item";
-          tag:  "br" "\n";
-          tag:  "ps" "ps";
-          tag:  "tab" "\t";
-          tag:  "b" "+ font=SLP:style=Bold";
-        }
-      }
       parts {
          part { name: "base";
             type: RECT;
@@ -11290,22 +11231,6 @@
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "labels" "elm.title elm.text";
-      styles {
-        style { name: "genlist_textblock_style";
-          base: "font=SLP:style=Roman font_size=26 color="GENLIST_PART_MULTILINE_TEXT_STYLE_COLOR_INC" wrap=char text_class=list_item";
-          tag:  "br" "\n";
-          tag:  "ps" "ps";
-          tag:  "tab" "\t";
-          tag:  "b" "+ font=SLP:style=Bold";
-        }
-        style { name: "genlist_textblock_selected_style";
-          base: "font=SLP:style=Roman font_size=26 color="GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC" wrap=char text_class=list_item";
-          tag:  "br" "\n";
-          tag:  "ps" "ps";
-          tag:  "tab" "\t";
-          tag:  "b" "+ font=SLP:style=Bold";
-        }
-      }
       parts {
          part { name: "base";
             type: RECT;

diff --git a/themes/groups/genlist/genlist_textblock_style.edc b/themes/groups/genlist/genlist_textblock_style.edc
index 2236e4a..362394e 100644 (file)
--- a/themes/groups/genlist/genlist_textblock_style.edc
+++ b/themes/groups/genlist/genlist_textblock_style.edc
@@ -25,34 +25,86 @@
  * vim:ts=3
 */
 
+#define TEXTBLOCK_TAG \
+      tag:  "br" "\n";\
+      tag:  "ps" "ps";\
+      tag:  "tab" "\t";\
+      tag:  "b" "+ font=SLP:style=Bold";\
+      tag:  "match" GENLIST_PART_MATCH_TAG_COLOR_INC;
 
 styles {
+   style { name: "text_style"; // TODO: remove this later
+      base: "font=SLP:style=Roman font_size=28 color=#000000 wrap=char ellipsis=1.0";
+      tag:  "br" "\n";
+      tag:  "ps" "ps";
+      tag:  "tab" "\t";
+      tag:  "b" "+ font=SLP:style=Bold";
+      tag:  "match" "+ color=#E58616FF";
+   }
+   style { name: "genlist_default_textblock_style";
+      base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_28_INC" color="GENLIST_PART_MULTILINE_TEXT_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
+      TEXTBLOCK_TAG
+   }
+   style { name: "genlist_default_textblock_selected_style";
+      base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_28_INC" color="GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0";
+      TEXTBLOCK_TAG
+   }
+   style { name: "genlist_sub_textblock_style";
+      base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_20_INC" color="GENLIST_PART_MULTILINE_SUB_TEXT_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
+      TEXTBLOCK_TAG
+   }
+   style { name: "genlist_sub_textblock_selected_style";
+      base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_20_INC" color="GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0";
+      TEXTBLOCK_TAG
+   }
+   style { name: "genlist_textblock_sub_style";
+      base: "font=SLP:style=Regular font_size=22 color="GENLIST_PART_MULTILINE_TITLE_STYLE_COLOR_INC" wrap=char text_class=list_item";
+      TEXTBLOCK_TAG
+   }
+   style { name: "genlist_textblock_sub_selected_style";
+      base: "font=SLP:style=Regular font_size=22 color="GENLIST_PART_MULTILINE_TITLE_STYLE_SELECTED_COLOR_INC" wrap=char text_class=list_item";
+      TEXTBLOCK_TAG
+   }
+   style { name: "genlist_textblock_help_style";
+      base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_20_INC" color="GENLIST_PART_MULTILINE_HELP_STYLE_COLOR_INC" wrap=word text_class=list_item";
+      TEXTBLOCK_TAG
+   }
+   style { name: "genlist_textblock_style";
+      base: "font=SLP:style=Roman font_size=26 color="GENLIST_PART_MULTILINE_TEXT_STYLE_COLOR_INC" wrap=char text_class=list_item";
+      TEXTBLOCK_TAG
+   }
+   style { name: "genlist_textblock_selected_style";
+      base: "font=SLP:style=Roman font_size=26 color="GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC" wrap=char text_class=list_item";
+      TEXTBLOCK_TAG
+   }
+
+   /* email styles */
    style { name: "genlist_email_textblock_selected_style";
       base: "font=SLP:style=Roman font_size="GENLIST_FONT_28_INC" color="GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0";
-      tag:  "match" GENLIST_PART_MATCH_TAG_COLOR_INC;
+      TEXTBLOCK_TAG
    }
    style { name: "genlist_email_textblock_read_style";
       base: "font=SLP:style=Roman font_size="GENLIST_FONT_28_INC" color="GENLIST_PART_TEXTBLOCK_READ_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
-      tag:  "match" GENLIST_PART_MATCH_TAG_COLOR_INC;
+      TEXTBLOCK_TAG
    }
    style { name: "genlist_email_textblock_unread_style";
       base: "font=SLP:style=Roman font_size="GENLIST_FONT_28_INC" color="GENLIST_PART_TEXTBLOCK_UNREAD_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
-      tag:  "match" GENLIST_PART_MATCH_TAG_COLOR_INC;
+      TEXTBLOCK_TAG
    }
    style { name: "genlist_email_textblock_urgency_unread_style";
       base: "font=SLP:style=Roman font_size="GENLIST_FONT_28_INC" color="GENLIST_PART_TEXTBLOCK_URGENCY_UNREAD_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
-      tag:  "match" GENLIST_PART_MATCH_TAG_COLOR_INC;
+      TEXTBLOCK_TAG
    }
    style { name: "genlist_email_textblock_urgency_read_style";
       base: "font=SLP:style=Roman font_size="GENLIST_FONT_28_INC" color="GENLIST_PART_TEXTBLOCK_URGENCY_READ_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
-      tag:  "match" GENLIST_PART_MATCH_TAG_COLOR_INC;
+      TEXTBLOCK_TAG
    }
    style { name: "genlist_email_textblock2_style";
       base: "font=SLP:style=Medium font_size="GENLIST_FONT_20_INC" color="GENLIST_PART_TEXTBLOCK_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
-      tag:  "match" GENLIST_PART_MATCH_TAG_COLOR_INC;
+      TEXTBLOCK_TAG
    }
    style { name: "genlist_email_textblock2_selected_style";
       base: "font=SLP:style=Medium font_size="GENLIST_FONT_20_INC" color="GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0";
-      tag:  "match" GENLIST_PART_MATCH_TAG_COLOR_INC;
+      TEXTBLOCK_TAG
    }
 }