From: Rajeev Ranjan Date: Fri, 30 Sep 2011 11:08:22 +0000 (+0900) Subject: [Popup] NBeat HD UX 0.2 Implementation X-Git-Tag: 2.0_alpha~515 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90530c834671376425d3718f1bf2cd2b030b0e5a;p=framework%2Fuifw%2Fefl-theme-tizen.git [Popup] NBeat HD UX 0.2 Implementation Change-Id: I7cf7fc7da84f407566dbc776dba243217c1e85c8 --- diff --git a/themes/groups/button.edc b/themes/groups/button.edc index 203072b..16970e9 100644 --- a/themes/groups/button.edc +++ b/themes/groups/button.edc @@ -1757,6 +1757,9 @@ alias: "elm/button/base/popup_button/volumebarstyle"; alias: "elm/button/base/popup_button/customstyle"; alias: "elm/button/base/popup_button/verticalbuttonstyle"; + alias: "elm/button/base/popup_button/image_scroll"; + alias: "elm/button/base/popup_button/image_slider"; + alias: "elm/button/base/popup_button/image_list"; images { image: "00_button_popup_normal.png" COMP; image: "00_button_popup_press.png" COMP; diff --git a/themes/groups/popup.edc b/themes/groups/popup.edc index c7428af..7caa879 100644 --- a/themes/groups/popup.edc +++ b/themes/groups/popup.edc @@ -69,7 +69,7 @@ group { name: "elm/label/base/popup_description/default"; styles { style { name: "popup_desc_style"; - base: "font=SLP:style=Roman font_size=26 align=center color="POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC" wrap=mixed"; + base: "font=SLP:style=Roman font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=center color="POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC" wrap=mixed"; tag: "br" "\n"; tag: "ps" "ps"; tag: "hilight" "+ font=SLP:style=Bold"; @@ -86,7 +86,7 @@ group { name: "elm/label/base/popup_description/default"; fixed: 1 1; visible: 0; align: 0.0 0.0; - min: 10 0; + min: POPUP_DESCRIPTION_DEFAULT_PADDING_INC; rel1 { relative: 0 0; } @@ -102,7 +102,7 @@ group { name: "elm/label/base/popup_description/default"; fixed: 1 1; visible: 0; align: 1.0 1.0; - min: 10 0; + min: POPUP_DESCRIPTION_DEFAULT_PADDING_INC; rel1 { relative: 1 1; } @@ -118,7 +118,7 @@ group { name: "elm/label/base/popup_description/default"; scale: 1; description { state: "default" 0.0; align: 0.5 0.5; - min: 380 0; + min: POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC; text { style: "popup_desc_style"; min: 0 1; @@ -147,7 +147,7 @@ group { name: "elm/popup/base/default"; styles { style { name: "popup_title_style"; - base: "font=SLP:style=Medium font_size=24 align=center color=#ffffff wrap=mixed ellipsis=1.0"; + base: "font=SLP:style=Medium font_size="POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipsis=1.0"; tag: "br" "\n"; tag: "ps" "ps"; tag: "whitecolor" "+ color=#ffffff"; @@ -161,8 +161,8 @@ group { name: "elm/popup/base/default"; mouse_events: 0; repeat_events: 1; description { state: "default" 0.0; - min: 400 0; - max: 400 730; + min: POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC; + max: POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC; color: 0 0 0 0; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; @@ -177,7 +177,7 @@ group { name: "elm/popup/base/default"; rel2.to: "base"; image { normal: "00_popup_bg.png"; - border: 3 3 3 3; + border: POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC; border_scale: 1; } } @@ -186,12 +186,12 @@ group { name: "elm/popup/base/default"; type: IMAGE; scale : 1; description { state: "default" 0.0; - min: 400 50; + min: POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC; fixed : 1 1; align: 0.5 0.0; visible: 0; image.normal: "00_popup_title_bg.png"; - image.border: 3 3 3 3; + image.border: POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC; image.border_scale: 1; rel1 { relative: 0.5 0.0; @@ -211,8 +211,8 @@ group { name: "elm/popup/base/default"; type: RECT; scale : 1; description { state: "default" 0.0; - min: 10 0; - max: 10 0; + min: POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC; + max: POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC; fixed : 1 1; align: 0.0 0.0; visible: 0; @@ -223,8 +223,8 @@ group { name: "elm/popup/base/default"; type: RECT; scale : 1; description { state: "default" 0.0; - min: 10 0; - max: 10 0; + min: POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC; + max: POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC; fixed : 1 1; align: 1.0 1.0; visible: 0; @@ -235,8 +235,8 @@ group { name: "elm/popup/base/default"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 48 48; - max: 48 48; + min: POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC; + max: POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC; fixed: 1 1; align: 0.0 0.5; rel1 { relative: 1.0 0.0; to: "left_pad"; } @@ -279,7 +279,7 @@ group { name: "elm/popup/base/default"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 400 0; + min: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC; align: 0.5 0.5; fixed: 1 0; rel1 { @@ -321,12 +321,12 @@ group { name: "elm/popup/base/default"; type: IMAGE; scale : 1; description { state: "default" 0.0; - min: 400 60; + min: POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC; fixed : 1 1; align: 0.5 1.0; visible: 0; image.normal: "00_popup_bottom_bg.png"; - image.border: 3 3 3 3; + image.border: POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC; image.border_scale: 1; rel1 { relative: 0.0 1.0; @@ -440,7 +440,7 @@ group { name: "elm/popup/content/default"; repeat_events: 1; description { state: "default" 0.0; align: 0.5 0.0; - min: 0 14; + min: POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC; fixed: 0 1; color: 0 0 0 0; rel1 { @@ -455,7 +455,7 @@ group { name: "elm/popup/content/default"; type: RECT; scale: 1; description { state: "default" 0.0; - min : 10 0; + min : POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC; fixed: 1 0; rel1 { relative: 0.0 0.0; @@ -471,7 +471,7 @@ group { name: "elm/popup/content/default"; type: RECT; scale: 1; description { state: "default" 0.0; - min : 10 0; + min : POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC; fixed: 1 0; rel1 { relative: 1.0 0.0; @@ -487,7 +487,7 @@ group { name: "elm/popup/content/default"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 380 0; + min: POPUP_CONTENT_DEFAULT_CONTENT_DEFAULT_MIN_INC; align: 0.5 0.5; fixed: 1 0; rel1 { @@ -507,7 +507,7 @@ group { name: "elm/popup/content/default"; repeat_events: 1; description { state: "default" 0.0; align: 0.5 1.0; - min: 0 14; + min: POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC; fixed: 0 1; color: 0 0 0 0; rel1 { @@ -534,8 +534,8 @@ group { name: "elm/popup/base/verticalbuttonstyle"; mouse_events: 0; repeat_events: 1; description { state: "default" 0.0; - min: 400 0; - max: 400 730; + min: POPUP_BASE_VERTICAL_BUTTON_BASE_MIN_INC; + max: POPUP_BASE_VERTICAL_BUTTON_BASE_MAX_INC; color: 0 0 0 0; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; @@ -550,7 +550,7 @@ group { name: "elm/popup/base/verticalbuttonstyle"; rel2.to: "base"; image { normal: "00_popup_bg.png"; - border: 3 3 3 3; + border: POPUP_BASE_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC; border_scale: 1; } } @@ -559,12 +559,12 @@ group { name: "elm/popup/base/verticalbuttonstyle"; type: IMAGE; scale : 1; description { state: "default" 0.0; - min: 400 50; + min: POPUP_BASE_VERTICAL_BUTTON_TITLE_DEFAULT_MIN_INC; fixed : 1 1; align: 0.5 0.0; visible: 0; image.normal: "00_popup_title_bg.png"; - image.border: 3 3 3 3; + image.border: POPUP_BASE_VERTICAL_BUTTON_TITLE_IMAGE_BORDER_MIN_INC; image.border_scale: 1; rel1 { relative: 0.5 0.0; @@ -584,8 +584,8 @@ group { name: "elm/popup/base/verticalbuttonstyle"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 48 48; - max: 48 48; + min: POPUP_BASE_VERTICAL_BUTTON_TITLE_ICON_MIN_MAX_INC; + max: POPUP_BASE_VERTICAL_BUTTON_TITLE_ICON_MIN_MAX_INC; fixed: 1 1; align: 0.0 0.5; rel1 { @@ -634,7 +634,7 @@ group { name: "elm/popup/base/verticalbuttonstyle"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 400 0; + min: POPUP_BASE_VERTICAL_BUTTON_CONTENT_DEFAULT_MIN_INC; align: 0.5 0.5; fixed: 1 0; rel1 { @@ -676,7 +676,7 @@ group { name: "elm/popup/base/verticalbuttonstyle"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 400 178; + min: POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC; fixed : 1 1; align: 0.5 1.0; visible: 0; @@ -769,7 +769,7 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; description { state: "default" 0.0; align: 0.5 0.0; image.normal: "00_popup_bottom_bg.png"; - image.border: 3 3 3 3; + image.border: POPUP_BUTTON3_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC; image.border_scale: 1; rel1 { relative: 0.0 0.0; @@ -783,7 +783,7 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; type: RECT; scale : 1; description { state: "default" 0.0; - min: 0 10; + min: POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC; fixed : 0 1; align: 0.0 0.0; color: 0 0 0 0; @@ -799,8 +799,8 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 222 46; - max: 222 46; + min: POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC; + max: POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC; fixed : 1 1; align: 0.5 0.0; rel1 { @@ -812,8 +812,8 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; type: RECT; scale : 1; description { state: "default" 0.0; - min: 0 10; - max: 9999 10; + min: POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC; + max: POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC; fixed : 1 1; align: 0.5 0.0; color: 0 0 0 0; @@ -829,8 +829,8 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 222 46; - max: 222 46; + min: POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC; + max: POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC; fixed : 1 1; align: 0.5 0.0; rel1 { relative: 0 1.0; to_y: "elm.rect.pad_btn"; } @@ -840,8 +840,8 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; type: RECT; scale : 1; description { state: "default" 0.0; - min: 0 10; - max: 9999 10; + min: POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC; + max: POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC; fixed : 1 1; align: 0.5 0.0; color: 0 0 0 0; @@ -857,8 +857,8 @@ group { name: "elm/popup/buttons3/verticalbuttonstyle"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 222 46; - max: 222 46; + min: POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC; + max: POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC; fixed : 1 1; align: 0.5 0.0; rel1 { @@ -932,15 +932,15 @@ group { name: "elm/popup/content/liststyle"; fixed: 1 1; visible: 0; align: 0.0 0.0; - min: 3 3; - max: 3 3; + min: POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC; + max: POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC; } } part{ name:"elm.swallow.content"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 394 320; + min: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC; align: 0.5 0.5; fixed: 1 0; rel1 { @@ -960,7 +960,7 @@ group { name: "elm/popup/content/liststyle"; fixed: 1 0; visible: 0; align: 1.0 0.5; - min: 3 0; + min: POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC; rel1 { relative: 1.0 0.0; } @@ -981,7 +981,7 @@ group { name: "elm/popup/base/customstyle"; styles { style { name: "popup_title_custom_style"; - base: "font=SLP:style=Medium font_size=24 align=center color=#ffffff wrap=mixed ellipsis=1.0"; + base: "font=SLP:style=Medium font_size="POPUP_BASE_CUSTOMSTYLE_TEXT_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipsis=1.0"; tag: "br" "\n"; tag: "ps" "ps"; tag: "hilight" "+ font=SLP:style=Bold"; @@ -997,8 +997,8 @@ group { name: "elm/popup/base/customstyle"; mouse_events: 0; repeat_events: 1; description { state: "default" 0.0; - min: 400 0; - max: 400 730; + min: POPUP_BASE_CUSTOMSTYLE_BASE_DEFAULT_MIN_INC; + max: POPUP_BASE_CUSTOMSTYLE_BASE_DEFAULT_MAX_INC; color: 0 0 0 0; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; @@ -1013,7 +1013,7 @@ group { name: "elm/popup/base/customstyle"; rel2.to: "base"; image { normal: "00_popup_bg02.png"; - border: 3 3 3 3; + border: POPUP_BASE_CUSTOMSTYLE_BG_DEFAULT_IMAGE_BORDER_INC; border_scale: 1; } } @@ -1022,7 +1022,7 @@ group { name: "elm/popup/base/customstyle"; type: IMAGE; scale : 1; description { state: "default" 0.0; - min: 400 50; + min: POPUP_BASE_CUSTOMSTYLE_TITLE_DEFAULT_MIN_INC; fixed : 1 1; align: 0.5 0.0; visible: 0; @@ -1043,7 +1043,7 @@ group { name: "elm/popup/base/customstyle"; part { name: "elm.rect.title.bottom.line"; type: RECT; description { state: "default" 0.0; - min: 400 1; + min: POPUP_BASE_CUSTOMSTYLE_TITLE_BOTTOM_LINE_MIN_INC; fixed : 1 1; align: 0.5 0.0; visible: 0; @@ -1066,8 +1066,8 @@ group { name: "elm/popup/base/customstyle"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 48 48; - max: 48 48; + min: POPUP_BASE_CUSTOMSTYLE_TITLE_ICON_DEFAULT_MIN_MAX_INC; + max: POPUP_BASE_CUSTOMSTYLE_TITLE_ICON_DEFAULT_MIN_MAX_INC; fixed: 1 1; align: 0.0 0.5; rel1 { @@ -1116,7 +1116,7 @@ group { name: "elm/popup/base/customstyle"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 400 0; + min: POPUP_BASE_CUSTOMSTYLE_CONTENT_DEFAULT_MIN_INC; align: 0.5 0.5; fixed: 1 0; rel1 { @@ -1158,12 +1158,12 @@ group { name: "elm/popup/base/customstyle"; type: IMAGE; scale : 1; description { state: "default" 0.0; - min: 400 60; + min: POPUP_BASE_CUSTOMSTYLE_BUTTONAREA_BG_DEFAULT_MIN_INC; fixed : 1 1; align: 0.5 1.0; visible: 0; image.normal: "00_popup_bottom_bg.png"; - image.border: 3 3 3 3; + image.border: POPUP_BASE_CUSTOMSTYLE_BUTTONAREA_BG_IMAGE_BORDER_INC; image.border_scale: 1; rel1 { relative: 0.0 1.0; @@ -1276,7 +1276,7 @@ group { name: "elm/popup/content/customstyle"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 400 0; + min: POPUP_CONTENT_CUSTOMSTYLE_DEFAULT_MIN_INC; align: 0.0 0.0; fixed: 1 0; rel1 { @@ -1296,8 +1296,8 @@ group { name: "elm/popup/buttons1/default"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 252 46; - max: 252 46; + min: POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_MAX_INC; fixed : 1 1; align: 0.5 0.5; rel1 { @@ -1317,8 +1317,8 @@ group { name: "elm/popup/buttons2/default"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 172 46; - max: 172 46; + min: POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; fixed : 1 1; align: 1.0 0.5; rel1 { @@ -1335,8 +1335,8 @@ group { name: "elm/popup/buttons2/default"; type: RECT; scale : 1; description { state: "default" 0.0; - min: 6 46; - max: 6 46; + min: POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC; + max: POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC; fixed : 1 1; align: 0.5 0.5; color: 0 0 0 0; @@ -1352,8 +1352,8 @@ group { name: "elm/popup/buttons2/default"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 172 46; - max: 172 46; + min: POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; fixed : 1 1; align: 0.0 0.5; rel1 { @@ -1376,8 +1376,8 @@ group { name: "elm/popup/buttons3/default"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 120 46; - max: 120 46; + min: POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; fixed : 1 1; align: 1.0 0.5; rel1 { @@ -1394,8 +1394,8 @@ group { name: "elm/popup/buttons3/default"; type: RECT; scale : 1; description { state: "default" 0.0; - min: 6 46; - max: 6 46; + min: POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC; + max: POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC; fixed : 1 1; align: 0.5 0.5; color: 0 0 0 0; @@ -1413,8 +1413,8 @@ group { name: "elm/popup/buttons3/default"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 120 46; - max: 120 46; + min: POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; fixed : 1 1; align: 0.5 0.5; rel1 { @@ -1429,8 +1429,8 @@ group { name: "elm/popup/buttons3/default"; type: RECT; scale : 1; description { state: "default" 0.0; - min: 6 46; - max: 6 46; + min: POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC; + max: POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC; fixed : 1 1; align: 0.5 0.5; color: 0 0 0 0; @@ -1448,8 +1448,8 @@ group { name: "elm/popup/buttons3/default"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 120 46; - max: 120 46; + min: POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC; fixed : 1 1; align: 0.0 0.5; rel1 { @@ -1473,7 +1473,7 @@ group { name: "elm/popup/base/volumebarstyle"; styles { style { name: "popup_title_volumebarstyle"; - base: "font=SLP:style=Medium font_size=28 align=center color=#ffffff wrap=mixed ellipsis=1.0"; + base: "font=SLP:style=Medium font_size="POPUP_BASE_VOLUMEBAR_STYLE_TEXT_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipsis=1.0"; tag: "br" "\n"; tag: "ps" "ps"; tag: "hilight" "+ font=SLP:style=Bold"; @@ -1489,8 +1489,8 @@ group { name: "elm/popup/base/volumebarstyle"; mouse_events: 0; repeat_events: 1; description { state: "default" 0.0; - min: 262 0; - max: 262 424; + min: POPUP_BASE_VOLUMEBAR_STYLE_BASE_DEFAULT_MIN_INC; + max: POPUP_BASE_VOLUMEBAR_STYLE_BASE_DEFAULT_MAX_INC; color: 0 0 0 0; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; @@ -1505,7 +1505,7 @@ group { name: "elm/popup/base/volumebarstyle"; rel2.to: "base"; image { normal: "00_volume_popup_bg.png"; - border: 11 11 15 19; + border: POPUP_BASE_VOLUMEBAR_STYLE_BG_IMAGE_BORDER_INC; middle: DEFAULT; border_scale: 1; } @@ -1516,8 +1516,8 @@ group { name: "elm/popup/base/volumebarstyle"; scale : 1; description { state: "default" 0.0; color: 0 0 0 0; - min: 262 137; - max: 262 137; + min: POPUP_BASE_VOLUMEBAR_STYLE_TITLE_DEFAULT_MIN_MAX_INC; + max: POPUP_BASE_VOLUMEBAR_STYLE_TITLE_DEFAULT_MIN_MAX_INC; fixed : 1 1; align: 0.5 0.0; visible: 0; @@ -1568,8 +1568,8 @@ group { name: "elm/popup/base/volumebarstyle"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 54 54; - max: 54 54; + min: POPUP_BASE_VOLUMEBAR_STYLE_TITLE_ICON_DEFAULT_MIN_MAX_INC; + max: POPUP_BASE_VOLUMEBAR_STYLE_TITLE_ICON_DEFAULT_MIN_MAX_INC; fixed: 1 1; align: 0.5 0.9; rel1 { @@ -1591,7 +1591,7 @@ group { name: "elm/popup/base/volumebarstyle"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 262 0; + min: POPUP_BASE_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC; align: 0.5 0.5; fixed: 1 0; rel1 { @@ -1633,7 +1633,7 @@ group { name: "elm/popup/base/volumebarstyle"; type: RECT; scale : 1; description { state: "default" 0.0; - min: 262 90; + min: POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC; fixed : 1 1; align: 0.5 1.0; color: 0 0 0 0; @@ -1656,8 +1656,8 @@ group { name: "elm/popup/base/volumebarstyle"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 262 70; - max: 262 70; + min: POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_DEFAULT_MIN_MAX_INC; + max: POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_DEFAULT_MIN_MAX_INC; fixed : 1 1; align: 0.5 0.5; visible: 0; @@ -1682,7 +1682,7 @@ group { name: "elm/popup/base/volumebarstyle"; repeat_events: 1; description { state: "default" 0.0; align: 0.5 1.0; - min: 0 5; + min: POPUP_BASE_VOLUMEBAR_STYLE_PADDING_BOTTOM_MIN_INC; fixed: 0 1; color: 0 0 0 0; rel1 { @@ -1773,7 +1773,7 @@ group { name: "elm/popup/content/volumebarstyle"; repeat_events: 1; description { state: "default" 0.0; align: 0.5 0.0; - min: 0 2; + min: POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_TOP_MIN_INC; fixed: 0 1; color: 0 0 0 0; rel1 { @@ -1788,7 +1788,7 @@ group { name: "elm/popup/content/volumebarstyle"; type: RECT; scale: 1; description { state: "default" 0.0; - min : 43 0; + min : POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_LEFT_MIN_INC; fixed: 1 0; rel1 { relative: 0.0 0.0; @@ -1804,7 +1804,7 @@ group { name: "elm/popup/content/volumebarstyle"; type: RECT; scale: 1; description { state: "default" 0.0; - min : 44 0; + min : POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_RIGHT_MIN_INC; fixed: 1 0; rel1 { relative: 1.0 0.0; @@ -1820,7 +1820,7 @@ group { name: "elm/popup/content/volumebarstyle"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 175 263; + min: POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC; align: 0.5 0.5; fixed: 1 0; rel1 { @@ -1840,7 +1840,7 @@ group { name: "elm/popup/content/volumebarstyle"; repeat_events: 1; description { state: "default" 0.0; align: 0.5 1.0; - min: 0 2; + min: POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_BOTTOM_MIN_INC; fixed: 0 1; color: 0 0 0 0; rel1 { @@ -1860,8 +1860,8 @@ group { name: "elm/popup/buttons2/volumebarstyle"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 172 46; - max: 172 46; + min: POPUP_BUTTON2_VOLUMEBAR_STYLE_BUTTON_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTON2_VOLUMEBAR_STYLE_BUTTON_DEFAULT_MIN_MAX_INC; fixed : 1 1; align: 1.0 1.0; rel1 { @@ -1878,8 +1878,8 @@ group { name: "elm/popup/buttons2/volumebarstyle"; type: RECT; scale : 1; description { state: "default" 0.0; - min: 6 46; - max: 6 46; + min: POPUP_BUTTON2_VOLUMEBAR_STYLE_PADDING_BUTTON_MIN_MAX_INC; + max: POPUP_BUTTON2_VOLUMEBAR_STYLE_PADDING_BUTTON_MIN_MAX_INC; fixed : 1 1; align: 0.5 1.0; color: 0 0 0 0; @@ -1895,8 +1895,8 @@ group { name: "elm/popup/buttons2/volumebarstyle"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 172 46; - max: 172 46; + min: POPUP_BUTTON2_VOLUMEBAR_STYLE_BUTTON_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTON2_VOLUMEBAR_STYLE_BUTTON_DEFAULT_MIN_MAX_INC; fixed : 1 1; align: 0.0 1.0; rel1 { @@ -1918,8 +1918,8 @@ group { name: "elm/popup/buttons1/volumebarstyle"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 252 46; - max: 252 46; + min: POPUP_BUTTON1_VOLUMEBAR_STYLE_BUTTON_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTON1_VOLUMEBAR_STYLE_BUTTON_DEFAULT_MIN_MAX_INC; fixed : 1 1; align: 0.5 1.0; rel1 { @@ -1942,7 +1942,7 @@ group { name: "elm/popup/base/image_scroll"; styles { style { name: "popup_image_title_style"; - base: "font=SLP:style=Medium font_size=20 align=center color=#ffffff wrap=mixed ellipsis=1.0"; + base: "font=SLP:style=Medium font_size="POPUP_BASE_IMAGE_SCROLL_TEXT_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipsis=1.0"; tag: "br" "\n"; tag: "ps" "ps"; tag: "hilight" "+ font=SLP:style=Bold"; @@ -1957,19 +1957,13 @@ group { name: "elm/popup/base/image_scroll"; mouse_events: 0; repeat_events: 1; description { state: "default" 0.0; - min: 780 460; - max: 780 460; - color: 255 0 0 0; + min: POPUP_BASE_IMAGE_SCROLL_BG_DEFAULT_MIN_MAX_INC; + max: POPUP_BASE_IMAGE_SCROLL_BG_DEFAULT_MIN_MAX_INC; + visible: 0; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; align: 0.0 0.0; } - description { state: "portrait" 0.0; - inherit: "default" 0.0; - min: 460 780; - max: 460 780; - color: 255 0 0 100; - } } part { name: "base"; type: RECT; @@ -1977,34 +1971,26 @@ group { name: "elm/popup/base/image_scroll"; mouse_events: 0; repeat_events: 1; description { state: "default" 0.0; - min: 440 165; - // max: 684 165; fixed: 1 1; color: 255 0 0 0; rel1 { - relative: 0.0 0.6; to: "bg"; + relative: 0.042 0.6; to: "bg"; } rel2 { relative: 0.88 0.94; to: "bg";} align: 0.0 0.0; } - description { state: "portrait" 0.0; - inherit: "default" 0.0; - min: 440 165; - max: 440 165; - color: 255 0 0 100; - } } part { name: "elm.rect.title"; type: IMAGE; scale : 1; description { state: "default" 0.0; - min: 200 37; + min: POPUP_BASE_IMAGE_SCROLL_TITLE_DEFAULT_MIN_INC; fixed : 1 1; align: 0.5 0.0; visible: 0; image.normal: "00_popup_title_middle.png"; - image.border: 9 9 9 1; + image.border: POPUP_BASE_IMAGE_SCROLL_TITLE_IMAGE_BORDER_INC; image.border_scale: 1; rel1 { relative: 0.0 0.0; to: "base"; @@ -2022,14 +2008,14 @@ group { name: "elm/popup/base/image_scroll"; scale : 1; mouse_events: 0; description { state: "default" 0.0; - min: 200 128; + min: POPUP_BASE_IMAGE_SCROLL_BACKGROUND_DEFAULT_MIN_INC; rel1.to: "elm.rect.title"; rel2.to: "base"; rel1.relative: 0.0 1.0; rel2.relative: 1.0 1.0; image { normal: "00_popup_bottom.png"; - border: 9 9 0 9; + border: POPUP_BASE_IMAGE_SCROLL_BACKGROUND_IMAGE_BORDER_INC; middle: DEFAULT; border_scale: 1; } @@ -2039,8 +2025,8 @@ group { name: "elm/popup/base/image_scroll"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 48 48; - max: 48 48; + min: POPUP_BASE_IMAGE_SCROLL_TITLE_ICON_MIN_MAX_INC; + max: POPUP_BASE_IMAGE_SCROLL_TITLE_ICON_MIN_MAX_INC; fixed: 1 1; align: 0.0 0.5; rel1 { @@ -2091,7 +2077,7 @@ group { name: "elm/popup/base/image_scroll"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 426 0; + min: POPUP_BASE_IMAGE_SCROLL_CONTENT_DEFAULT_MIN_INC; align: 0.0 0.0; fixed: 1 0; rel1 { @@ -2129,10 +2115,10 @@ group { name: "elm/popup/base/image_scroll"; type: RECT; scale : 1; description { state: "default" 0.0; - min: 64 436; - max: 64 436; + min: POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_BG_DEFAULT_MIN_MAX_INC; + max: POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_BG_DEFAULT_MIN_MAX_INC; fixed : 1 1; - align: 1.0 0.5; + align: 0.0 0.5; visible: 1; rel1 { relative: 0.92 0.04; @@ -2143,7 +2129,7 @@ group { name: "elm/popup/base/image_scroll"; to_x: "bg"; to_y: "base"; } - color: 0 255 0 0; + color: 0 0 0 0; } description { state: "show_button_area" 0.0; inherit: "default" 0.0; @@ -2154,17 +2140,17 @@ group { name: "elm/popup/base/image_scroll"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 40 70; - max: 60 436; + min: POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_DEFAULT_MIN_INC; + max: POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_DEFAULT_MAX_INC; fixed : 1 1; - align: 0.5 0.5; + align: 0.0 0.5; visible: 0; rel1 { relative: 0.0 0.0; to: "elm.swallow.buttonArea.Background"; } rel2 { - relative: 1.0 1.0; + relative: 0.0 1.0; to: "elm.swallow.buttonArea.Background"; } } @@ -2180,7 +2166,7 @@ group { name: "elm/popup/base/image_scroll"; repeat_events: 1; description { state: "default" 0.0; align: 0.5 1.0; - min: 0 15; + min: POPUP_BASE_IMAGE_SCROLL_PADDING_BOTTOM_MIN_INC; fixed: 0 1; color: 0 0 0 0; rel1 { @@ -2287,7 +2273,7 @@ group { name: "elm/popup/content/image_scroll"; repeat_events: 1; description { state: "default" 0.0; align: 0.5 0.0; - min: 0 9; + min: POPUP_CONTENT_IMAGE_SCROLL_PADDING_TOP_MIN_INC; fixed: 0 1; color: 0 0 0 0; rel1 { @@ -2302,7 +2288,7 @@ group { name: "elm/popup/content/image_scroll"; type: RECT; scale: 1; description { state: "default" 0.0; - min : 15 0; + min : POPUP_CONTENT_IMAGE_SCROLL_PADDING_LEFT_MIN_INC; fixed: 1 0; rel1 { relative: 0.0 0.0; @@ -2318,7 +2304,7 @@ group { name: "elm/popup/content/image_scroll"; type: RECT; scale: 1; description { state: "default" 0.0; - min : 15 0; + min : POPUP_CONTENT_IMAGE_SCROLL_PADDING_RIGHT_MIN_INC; fixed: 1 0; rel1 { relative: 1.0 0.0; @@ -2334,16 +2320,16 @@ group { name: "elm/popup/content/image_scroll"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 654 0; + min: POPUP_CONTENT_IMAGE_SCROLL_CONTENT_DEFAULT_MIN_INC; align: 0.5 0.5; fixed: 1 0; rel1 { - relative: 0.5 1.0; + relative: 1.0 1.0; to: "pad_t"; } rel2 { - relative: 0.5 0.0; - to: "pad_b"; + relative: 0.0 0.0; + to: "pad_b"; } } } @@ -2354,14 +2340,14 @@ group { name: "elm/popup/content/image_scroll"; repeat_events: 1; description { state: "default" 0.0; align: 0.5 1.0; - min: 0 5; + min: POPUP_CONTENT_IMAGE_SCROLL_PADDING_BOTTOM_MIN_INC; fixed: 0 1; color: 0 0 0 0; rel1 { - relative: 0.0 1.0;to_x: "pad_l"; + relative: 1.0 1.0;to_x: "pad_l"; } rel2 { - relative: 1.0 1.0;to_x: "pad_r"; + relative: 0.0 1.0;to_x: "pad_r"; } } } @@ -2373,8 +2359,8 @@ group { name: "elm/popup/buttons2/image_scroll"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 60 60; - max: 60 60; + min: POPUP_BUTTONS2_IMAGE_SCROLL_BUTTON_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTONS2_IMAGE_SCROLL_BUTTON_DEFAULT_MIN_MAX_INC; fixed : 1 1; align: 0.0 0.0; rel1 { @@ -2382,31 +2368,14 @@ group { name: "elm/popup/buttons2/image_scroll"; } } } - part { name: "elm.rect.pad_btn"; - type: RECT; - scale : 1; - description { state: "default" 0.0; - min: 6 60; - max: 6 60; - fixed : 1 1; - align: 0.5 1.0; - color: 0 0 0 0; - rel1 { - relative: 0.5 0.0; - } - rel2 { - relative: 0.5 1.0; - } - } - } part{ name:"actionbtn2"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 60 60; - max: 60 60; + min: POPUP_BUTTONS2_IMAGE_SCROLL_BUTTON_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTONS2_IMAGE_SCROLL_BUTTON_DEFAULT_MIN_MAX_INC; fixed : 1 1; - align: 1.0 1.0; + align: 0.0 1.0; rel2 { relative: 1.0 1.0; } @@ -2427,19 +2396,13 @@ group { name: "elm/popup/base/image_slider"; mouse_events: 0; repeat_events: 1; description { state: "default" 0.0; - min: 780 460; - max: 780 460; - color: 255 0 0 0; + min: POPUP_BASE_IMAGE_SLIDER_BG_DEFAULT_MIN_MAX_INC; + max: POPUP_BASE_IMAGE_SLIDER_BG_DEFAULT_MIN_MAX_INC; + color: 0 0 0 0; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; align: 0.0 0.0; } - description { state: "portrait" 0.0; - inherit: "default" 0.0; - min: 460 780; - max: 460 780; - color: 255 0 0 0; - } } part { name: "base"; type: RECT; @@ -2447,15 +2410,12 @@ group { name: "elm/popup/base/image_slider"; mouse_events: 0; repeat_events: 1; description { state: "default" 0.0; - min: 440 325; - max: 460 325; - fixed: 1 1; - color: 255 0 0 0; + color: 0 0 0 0; rel1 { - relative: 0.2 0.3; to: "bg"; + relative: 0.23 0.3; to: "bg"; } rel2 { - relative: 0.88 0.94; to: "bg";} + relative: 0.77 0.94; to: "bg";} align: 0.0 0.0; } } @@ -2463,12 +2423,12 @@ group { name: "elm/popup/base/image_slider"; type: IMAGE; scale : 1; description { state: "default" 0.0; - min: 200 35; + min: POPUP_BASE_IMAGE_SLIDER_TITLE_DEFAULT_MIN_INC; fixed : 1 1; align: 0.5 0.0; visible: 0; image.normal: "00_popup_title_middle.png"; - image.border: 9 9 9 1; + image.border: POPUP_BASE_IMAGE_SLIDER_TITLE_DEFAULT_IMAGE_BORDER_INC; image.border_scale: 1; rel1 { relative: 0.0 0.0; to: "base"; @@ -2486,16 +2446,14 @@ group { name: "elm/popup/base/image_slider"; scale : 1; mouse_events: 0; description { state: "default" 0.0; - min: 200 128; - fixed : 1 1; align: 0.5 0.0; rel1.to: "elm.rect.title"; rel2.to: "base"; rel1.relative: 0.0 1.0; - rel2.relative: 1.0 0.94; + rel2.relative: 1.0 1.0; image { normal: "00_popup_content.png"; - border: 9 9 1 8; + border: POPUP_BASE_IMAGE_SLIDER_BACKGROUND_DEFAULT_IMAGE_BORDER_INC; middle: DEFAULT; border_scale: 1; } @@ -2505,8 +2463,8 @@ group { name: "elm/popup/base/image_slider"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 48 48; - max: 48 48; + min: POPUP_BASE_IMAGE_SLIDER_TITLE_ICON_DEFAULT_MIN_MAX_INC; + max: POPUP_BASE_IMAGE_SLIDER_TITLE_ICON_DEFAULT_MIN_MAX_INC; fixed: 1 1; align: 0.0 0.5; rel1 { @@ -2557,9 +2515,7 @@ group { name: "elm/popup/base/image_slider"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 430 0; align: 0.0 0.0; - fixed: 1 0; rel1 { relative: 0.03 0.05; to: "background"; @@ -2595,10 +2551,7 @@ group { name: "elm/popup/base/image_slider"; type: RECT; scale : 1; description { state: "default" 0.0; - min: 64 436; - max: 64 436; - fixed : 1 1; - align: 1.0 0.5; + align: 0.0 0.0; visible: 1; rel1 { relative: 0.92 0.04; @@ -2609,7 +2562,7 @@ group { name: "elm/popup/base/image_slider"; to_x: "bg"; to_y: "base"; } - color: 0 255 0 0; + color: 0 0 0 0; } description { state: "show_button_area" 0.0; inherit: "default" 0.0; @@ -2620,9 +2573,6 @@ group { name: "elm/popup/base/image_slider"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 40 70; - max: 60 436; - fixed : 1 1; align: 0.5 0.5; visible: 0; rel1 { @@ -2733,7 +2683,7 @@ group { name: "elm/popup/content/image_slider"; repeat_events: 1; description { state: "default" 0.0; align: 0.5 0.0; - min: 0 9; + min: POPUP_CONTENT_IMAGE_SLIDER_PADDING_TOP_DEFAULT_MIN_INC; fixed: 0 1; color: 0 0 0 0; rel1 { @@ -2748,7 +2698,7 @@ group { name: "elm/popup/content/image_slider"; type: RECT; scale: 1; description { state: "default" 0.0; - min : 15 0; + min : POPUP_CONTENT_IMAGE_SLIDER_PADDING_LEFT_DEFAULT_MIN_INC; fixed: 1 0; rel1 { relative: 0.0 0.0; @@ -2764,7 +2714,7 @@ group { name: "elm/popup/content/image_slider"; type: RECT; scale: 1; description { state: "default" 0.0; - min : 15 0; + min : POPUP_CONTENT_IMAGE_SLIDER_PADDING_RIGHT_DEFAULT_MIN_INC; fixed: 1 0; rel1 { relative: 1.0 0.0; @@ -2780,15 +2730,15 @@ group { name: "elm/popup/content/image_slider"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 430 0; + min: POPUP_CONTENT_IMAGE_SLIDER_CONTENT_DEFAULT_MIN_INC; align: 0.5 0.5; fixed: 1 0; rel1 { - relative: 0.5 1.0; + relative: 1.0 1.0; to: "pad_t"; } rel2 { - relative: 0.5 0.0; + relative: 0.0 0.0; to: "pad_b"; } } @@ -2800,14 +2750,14 @@ group { name: "elm/popup/content/image_slider"; repeat_events: 1; description { state: "default" 0.0; align: 0.5 1.0; - min: 0 5; + min: POPUP_CONTENT_IMAGE_SLIDER_PADDING_BOTTOM_DEFAULT_MIN_INC; fixed: 0 1; color: 0 0 0 0; rel1 { - relative: 0.0 1.0;to_x: "pad_l"; + relative: 1.0 1.0;to_x: "pad_l"; } rel2 { - relative: 1.0 1.0;to_x: "pad_r"; + relative: 0.0 1.0;to_x: "pad_r"; } } } @@ -2819,8 +2769,8 @@ group { name: "elm/popup/buttons2/image_slider"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 60 60; - max: 60 60; + min: POPUP_BUTTONS2_IMAGE_SLIDER_BUTTON_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTONS2_IMAGE_SLIDER_BUTTON_DEFAULT_MIN_MAX_INC; fixed : 1 1; align: 0.0 0.0; rel1 { @@ -2828,31 +2778,14 @@ group { name: "elm/popup/buttons2/image_slider"; } } } - part { name: "elm.rect.pad_btn"; - type: RECT; - scale : 1; - description { state: "default" 0.0; - min: 6 60; - max: 6 60; - fixed : 1 1; - align: 0.5 1.0; - color: 0 0 0 0; - rel1 { - relative: 0.5 0.0; - } - rel2 { - relative: 0.5 1.0; - } - } - } part{ name:"actionbtn2"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 60 60; - max: 60 60; + min: POPUP_BUTTONS2_IMAGE_SLIDER_BUTTON_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTONS2_IMAGE_SLIDER_BUTTON_DEFAULT_MIN_MAX_INC; fixed : 1 1; - align: 1.0 1.0; + align: 0.0 1.0; rel2 { relative: 1.0 1.0; } @@ -2874,19 +2807,13 @@ group { name: "elm/popup/base/image_list"; mouse_events: 0; repeat_events: 1; description { state: "default" 0.0; - min: 780 460; - max: 780 460; + min: POPUP_BASE_IMAGE_LIST_BG_DEFAULT_MIN_MAX_INC; + max: POPUP_BASE_IMAGE_LIST_BG_DEFAULT_MIN_MAX_INC; color: 255 0 0 0; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; align: 0.0 0.0; } - description { state: "portrait" 0.0; - inherit: "default" 0.0; - min: 460 780; - max: 460 780; - color: 255 0 0 100; - } } part { name: "base"; type: RECT; @@ -2894,15 +2821,13 @@ group { name: "elm/popup/base/image_list"; mouse_events: 0; repeat_events: 1; description { state: "default" 0.0; - min: 350 275; - max: 350 275; fixed: 1 1; color: 255 0 0 0; rel1 { - relative: 0.25 0.4; to: "bg"; + relative: 0.23 0.4; to: "bg"; } rel2 { - relative: 0.88 0.94; to: "bg";} + relative: 0.77 0.94; to: "bg";} align: 0.0 0.0; } } @@ -2910,11 +2835,11 @@ group { name: "elm/popup/base/image_list"; type: IMAGE; scale : 1; description { state: "default" 0.0; - min: 350 35; - fixed : 1 1; + min: POPUP_BASE_IMAGE_LIST_TITLE_DEFAULT_MIN_INC; + fixed : 0 1; visible: 0; image.normal: "00_popup_title_middle.png"; - image.border: 9 9 9 1; + image.border: POPUP_BASE_IMAGE_LIST_TITLE_DEFAULT_IMAGE_BORDER_INC; image.border_scale: 1; rel1 { relative: 0.0 0.0; to: "base"; @@ -2932,7 +2857,7 @@ group { name: "elm/popup/base/image_list"; scale : 1; mouse_events: 0; description { state: "default" 0.0; - min: 350 128; + min: POPUP_BASE_IMAGE_LIST_BACKGROUND_DEFAULT_MIN_INC; fixed: 1 1; rel1.to: "elm.rect.title"; rel1.relative: 0.0 1.0; @@ -2940,7 +2865,7 @@ group { name: "elm/popup/base/image_list"; rel2.relative: 1.0 1.0; image { normal: "00_popup_bottom.png"; - border: 9 9 0 9; + border: POPUP_BASE_IMAGE_LIST_BACKGROUND_DEFAULT_IMAGE_BORDER_INC; middle: DEFAULT; border_scale: 1; } @@ -2950,8 +2875,8 @@ group { name: "elm/popup/base/image_list"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 48 48; - max: 48 48; + min: POPUP_BASE_IMAGE_LIST_TITLE_ICON_DEFAULT_MIN_MAX_INC; + max: POPUP_BASE_IMAGE_LIST_TITLE_ICON_DEFAULT_MIN_MAX_INC; fixed: 1 1; align: 0.0 0.5; rel1 { @@ -3002,7 +2927,7 @@ group { name: "elm/popup/base/image_list"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 325 0; + min: POPUP_BASE_IMAGE_LIST_CONTENT_DEFAULT_MIN_INC; align: 0.5 0.5; fixed: 1 0; rel1 { @@ -3040,7 +2965,7 @@ group { name: "elm/popup/base/image_list"; type: RECT; scale : 1; description { state: "default" 0.0; - min: 64 436; + min: POPUP_BASE_IMAGE_LIST_BUTTONAREA_BG_DEFAULT_MIN_INC; fixed : 1 1; align: 1.0 0.5; visible: 1; @@ -3053,7 +2978,7 @@ group { name: "elm/popup/base/image_list"; to_x: "bg"; to_y: "base"; } - color: 0 255 0 0; + color: 0 0 0 0; } description { state: "show_button_area" 0.0; inherit: "default" 0.0; @@ -3064,10 +2989,10 @@ group { name: "elm/popup/base/image_list"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 40 70; + min: POPUP_BASE_IMAGE_LIST_BUTTONAREA_DEFAULT_MIN_INC; fixed : 1 1; align: 0.5 0.5; - visible: 0; + visible: 1; rel1 { relative: 0.0 0.0; to: "elm.swallow.buttonArea.Background"; @@ -3076,6 +3001,7 @@ group { name: "elm/popup/base/image_list"; relative: 1.0 1.0; to: "elm.swallow.buttonArea.Background"; } + color: 255 0 0 200; } description { state: "show_button_area" 0.0; inherit: "default" 0.0; @@ -3176,7 +3102,7 @@ group { name: "elm/popup/content/image_list"; repeat_events: 1; description { state: "default" 0.0; align: 0.5 0.0; - min: 0 9; + min: POPUP_CONTENT_IMAGE_LIST_PADDING_TOP_DEFAULT_MIN_INC; fixed: 0 1; color: 0 0 0 0; rel1 { @@ -3191,7 +3117,7 @@ group { name: "elm/popup/content/image_list"; type: RECT; scale: 1; description { state: "default" 0.0; - min : 15 0; + min : POPUP_CONTENT_IMAGE_LIST_PADDING_LEFT_DEFAULT_MIN_INC; fixed: 1 0; rel1 { relative: 0.0 0.0; @@ -3207,7 +3133,7 @@ group { name: "elm/popup/content/image_list"; type: RECT; scale: 1; description { state: "default" 0.0; - min : 15 0; + min : POPUP_CONTENT_IMAGE_LIST_PADDING_RIGHT_DEFAULT_MIN_INC; fixed: 1 0; rel1 { relative: 1.0 0.0; @@ -3223,7 +3149,7 @@ group { name: "elm/popup/content/image_list"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 320 0; + min: POPUP_CONTENT_IMAGE_LIST_CONTENT_DEFAULT_MIN_INC; align: 0.5 0.5; fixed: 1 0; rel1 { @@ -3243,7 +3169,7 @@ group { name: "elm/popup/content/image_list"; repeat_events: 1; description { state: "default" 0.0; align: 0.5 1.0; - min: 0 5; + min: POPUP_CONTENT_IMAGE_LIST_PADDING_BOTTOM_DEFAULT_MIN_INC; fixed: 0 1; color: 0 0 0 0; rel1 { @@ -3262,8 +3188,8 @@ group { name: "elm/popup/buttons2/image_list"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 60 60; - max: 60 60; + min: POPUP_BUTTONS2_IMAGE_LIST_BUTTON_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTONS2_IMAGE_LIST_BUTTON_DEFAULT_MIN_MAX_INC; fixed : 1 1; align: 0.0 0.0; rel1 { @@ -3271,31 +3197,14 @@ group { name: "elm/popup/buttons2/image_list"; } } } - part { name: "elm.rect.pad_btn"; - type: RECT; - scale : 1; - description { state: "default" 0.0; - min: 6 60; - max: 6 60; - fixed : 1 1; - align: 0.5 1.0; - color: 0 0 0 0; - rel1 { - relative: 0.5 0.0; - } - rel2 { - relative: 0.5 1.0; - } - } - } part{ name:"actionbtn2"; type: SWALLOW; scale : 1; description { state: "default" 0.0; - min: 60 60; - max: 60 60; + min: POPUP_BUTTONS2_IMAGE_LIST_BUTTON_DEFAULT_MIN_MAX_INC; + max: POPUP_BUTTONS2_IMAGE_LIST_BUTTON_DEFAULT_MIN_MAX_INC; fixed : 1 1; - align: 1.0 1.0; + align: 0.0 1.0; rel2 { relative: 1.0 1.0; } diff --git a/themes/images/nbeat-hd/00_volume_popup_bg.png b/themes/images/nbeat-hd/00_volume_popup_bg.png index 1b3522e..f3ed8c6 100644 Binary files a/themes/images/nbeat-hd/00_volume_popup_bg.png and b/themes/images/nbeat-hd/00_volume_popup_bg.png differ diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc index 4442c90..10cbec5 100644 --- a/themes/inc/nbeat-black-hd-inc.edc +++ b/themes/inc/nbeat-black-hd-inc.edc @@ -416,7 +416,7 @@ #define BUTTON_POPUP_PADDING_MIN_INC 8 5 #define BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0 #define BUTTON_POPUP_ICON_ICONONLY_MIN_INC 38 38 -#define BUTTON_POPUP_TEXT_MIN_INC 90 64 +#define BUTTON_POPUP_TEXT_MIN_INC 64 20 #define BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC 74 74 #define BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC 74 74 @@ -694,6 +694,143 @@ #define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC 150 #define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC 186 +#define POPUP_DESCRIPTION_DEFAULT_PADDING_INC 14 0 +#define POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC 588 0 +#define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 42 + +#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 620 0 +#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC 620 1120 +#define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 620 64 +#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 14 0 +#define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 62 62 +#define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 620 0 +#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 620 96 +#define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 38 + +#define POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC 0 22 +#define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 16 0 +#define POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 16 0 +#define POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC 0 22 +#define POPUP_CONTENT_DEFAULT_CONTENT_DEFAULT_MIN_INC 588 0 + +#define POPUP_BASE_VERTICAL_BUTTON_BASE_MIN_INC 620 0 +#define POPUP_BASE_VERTICAL_BUTTON_BASE_MAX_INC 620 1120 +#define POPUP_BASE_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_VERTICAL_BUTTON_TITLE_DEFAULT_MIN_INC 620 64 +#define POPUP_BASE_VERTICAL_BUTTON_TITLE_IMAGE_BORDER_MIN_INC 3 3 3 3 +#define POPUP_BASE_VERTICAL_BUTTON_TITLE_ICON_MIN_MAX_INC 62 62 +#define POPUP_BASE_VERTICAL_BUTTON_CONTENT_DEFAULT_MIN_INC 620 0 +#define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 620 286 + +#define POPUP_BUTTON3_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 16 +#define POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC 356 74 +#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC 0 16 +#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC 9999 16 + +#define POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC 3 3 +#define POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC 614 520 +#define POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC 3 0 + +#define POPUP_BASE_CUSTOMSTYLE_BASE_DEFAULT_MIN_INC 620 0 +#define POPUP_BASE_CUSTOMSTYLE_BASE_DEFAULT_MAX_INC 620 1120 +#define POPUP_BASE_CUSTOMSTYLE_BG_DEFAULT_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_CUSTOMSTYLE_TITLE_DEFAULT_MIN_INC 620 64 +#define POPUP_BASE_CUSTOMSTYLE_TITLE_BOTTOM_LINE_MIN_INC 620 1 +#define POPUP_BASE_CUSTOMSTYLE_TITLE_ICON_DEFAULT_MIN_MAX_INC 62 62 +#define POPUP_BASE_CUSTOMSTYLE_CONTENT_DEFAULT_MIN_INC 620 0 +#define POPUP_BASE_CUSTOMSTYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 620 96 +#define POPUP_BASE_CUSTOMSTYLE_BUTTONAREA_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_CUSTOMSTYLE_TEXT_FONT_SIZE_INC 38 + +#define POPUP_CONTENT_CUSTOMSTYLE_DEFAULT_MIN_INC 620 0 +#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_MAX_INC 402 74 +#define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 274 74 +#define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 10 74 + +#define POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 186 74 +#define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 10 74 + +#define POPUP_BASE_VOLUMEBAR_STYLE_BASE_DEFAULT_MIN_INC 416 0 +#define POPUP_BASE_VOLUMEBAR_STYLE_BASE_DEFAULT_MAX_INC 416 676 +#define POPUP_BASE_VOLUMEBAR_STYLE_BG_IMAGE_BORDER_INC 15 15 18 26 +#define POPUP_BASE_VOLUMEBAR_STYLE_TITLE_DEFAULT_MIN_MAX_INC 416 214 +#define POPUP_BASE_VOLUMEBAR_STYLE_TITLE_ICON_DEFAULT_MIN_MAX_INC 86 86 +#define POPUP_BASE_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 416 0 +#define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 416 142 +#define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_DEFAULT_MIN_MAX_INC 416 111 +#define POPUP_BASE_VOLUMEBAR_STYLE_PADDING_BOTTOM_MIN_INC 0 5 +#define POPUP_BASE_VOLUMEBAR_STYLE_TEXT_FONT_SIZE_INC 44 + +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_TOP_MIN_INC 0 2 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_LEFT_MIN_INC 68 0 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_RIGHT_MIN_INC 68 0 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 280 420 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_BOTTOM_MIN_INC 0 2 + +#define POPUP_BUTTON2_VOLUMEBAR_STYLE_BUTTON_DEFAULT_MIN_MAX_INC 274 74 +#define POPUP_BUTTON2_VOLUMEBAR_STYLE_PADDING_BUTTON_MIN_MAX_INC 10 74 + +#define POPUP_BUTTON1_VOLUMEBAR_STYLE_BUTTON_DEFAULT_MIN_MAX_INC 402 74 + +#define POPUP_BASE_IMAGE_SCROLL_BG_DEFAULT_MIN_MAX_INC 1280 720 +#define POPUP_BASE_IMAGE_SCROLL_TITLE_DEFAULT_MIN_INC 200 58 +#define POPUP_BASE_IMAGE_SCROLL_TITLE_IMAGE_BORDER_INC 9 9 9 1 +#define POPUP_BASE_IMAGE_SCROLL_BACKGROUND_DEFAULT_MIN_INC 200 204 +#define POPUP_BASE_IMAGE_SCROLL_BACKGROUND_IMAGE_BORDER_INC 9 9 0 9 +#define POPUP_BASE_IMAGE_SCROLL_TITLE_ICON_MIN_MAX_INC 62 62 +#define POPUP_BASE_IMAGE_SCROLL_CONTENT_DEFAULT_MIN_INC 660 0 +#define POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_BG_DEFAULT_MIN_MAX_INC 102 670 +#define POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_DEFAULT_MIN_INC 102 102 +#define POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_DEFAULT_MAX_INC 102 670 +#define POPUP_BASE_IMAGE_SCROLL_PADDING_BOTTOM_MIN_INC 0 24 +#define POPUP_BASE_IMAGE_SCROLL_TEXT_FONT_SIZE_INC 38 + +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_TOP_MIN_INC 0 15 +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_LEFT_MIN_INC 16 0 +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_RIGHT_MIN_INC 16 0 +#define POPUP_CONTENT_IMAGE_SCROLL_CONTENT_DEFAULT_MIN_INC 1034 0 +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_BOTTOM_MIN_INC 0 12 + +#define POPUP_BUTTONS2_IMAGE_SCROLL_BUTTON_DEFAULT_MIN_MAX_INC 74 74 + +#define POPUP_BASE_IMAGE_SLIDER_BG_DEFAULT_MIN_MAX_INC 1280 720 +#define POPUP_BASE_IMAGE_SLIDER_TITLE_DEFAULT_MIN_INC 200 58 +#define POPUP_BASE_IMAGE_SLIDER_TITLE_DEFAULT_IMAGE_BORDER_INC 9 9 9 1 +#define POPUP_BASE_IMAGE_SLIDER_BACKGROUND_DEFAULT_IMAGE_BORDER_INC 9 9 1 8 +#define POPUP_BASE_IMAGE_SLIDER_TITLE_ICON_DEFAULT_MIN_MAX_INC 62 62 +#define POPUP_BASE_IMAGE_SLIDER_CONTENT_DEFAULT_MIN_INC 430 0 +#define POPUP_BASE_IMAGE_SLIDER_BUTTONAREA_BG_DEFAULT_MIN_MAX_INC 64 436 + +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_TOP_DEFAULT_MIN_INC 0 9 +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_LEFT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_RIGHT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_SLIDER_CONTENT_DEFAULT_MIN_INC 430 0 +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_BOTTOM_DEFAULT_MIN_INC 0 5 + +#define POPUP_BUTTONS2_IMAGE_SLIDER_BUTTON_DEFAULT_MIN_MAX_INC 74 74 + +#define POPUP_BASE_IMAGE_LIST_BG_DEFAULT_MIN_MAX_INC 1280 720 +#define POPUP_BASE_IMAGE_LIST_TITLE_DEFAULT_MIN_INC 350 58 +#define POPUP_BASE_IMAGE_LIST_TITLE_DEFAULT_IMAGE_BORDER_INC 9 9 9 1 +#define POPUP_BASE_IMAGE_LIST_BACKGROUND_DEFAULT_MIN_INC 350 128 +#define POPUP_BASE_IMAGE_LIST_BACKGROUND_DEFAULT_IMAGE_BORDER_INC 9 9 0 9 +#define POPUP_BASE_IMAGE_LIST_TITLE_ICON_DEFAULT_MIN_MAX_INC 48 48 +#define POPUP_BASE_IMAGE_LIST_CONTENT_DEFAULT_MIN_INC 325 0 +#define POPUP_BASE_IMAGE_LIST_BUTTONAREA_BG_DEFAULT_MIN_INC 64 436 +#define POPUP_BASE_IMAGE_LIST_BUTTONAREA_DEFAULT_MIN_INC 40 70 + +#define POPUP_CONTENT_IMAGE_LIST_PADDING_TOP_DEFAULT_MIN_INC 0 9 +#define POPUP_CONTENT_IMAGE_LIST_PADDING_LEFT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_LIST_PADDING_RIGHT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_LIST_CONTENT_DEFAULT_MIN_INC 320 0 +#define POPUP_CONTENT_IMAGE_LIST_PADDING_BOTTOM_DEFAULT_MIN_INC 0 5 + +#define POPUP_BUTTONS2_IMAGE_LIST_BUTTON_DEFAULT_MIN_MAX_INC 74 74 + #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 diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc index 4797b52..b35f0eb 100644 --- a/themes/inc/nbeat-black-inc.edc +++ b/themes/inc/nbeat-black-inc.edc @@ -401,7 +401,7 @@ #define BUTTON_POPUP_PADDING_MIN_INC 5 5 #define BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 5 0 #define BUTTON_POPUP_ICON_ICONONLY_MIN_INC 24 24 -#define BUTTON_POPUP_TEXT_MIN_INC 90 20 +#define BUTTON_POPUP_TEXT_MIN_INC 36 20 #define BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC 46 46 #define BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC 46 46 @@ -680,6 +680,143 @@ #define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC 94 #define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC 116 +#define POPUP_DESCRIPTION_DEFAULT_PADDING_INC 10 0 +#define POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC 380 0 +#define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 26 + +#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 400 0 +#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC 400 730 +#define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 400 50 +#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 10 0 +#define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 48 48 +#define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 400 0 +#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 400 60 +#define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 24 + +#define POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC 0 14 +#define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 10 0 +#define POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 10 0 +#define POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC 0 14 +#define POPUP_CONTENT_DEFAULT_CONTENT_DEFAULT_MIN_INC 380 0 + +#define POPUP_BASE_VERTICAL_BUTTON_BASE_MIN_INC 400 0 +#define POPUP_BASE_VERTICAL_BUTTON_BASE_MAX_INC 400 730 +#define POPUP_BASE_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_VERTICAL_BUTTON_TITLE_DEFAULT_MIN_INC 400 50 +#define POPUP_BASE_VERTICAL_BUTTON_TITLE_IMAGE_BORDER_MIN_INC 3 3 3 3 +#define POPUP_BASE_VERTICAL_BUTTON_TITLE_ICON_MIN_MAX_INC 48 48 +#define POPUP_BASE_VERTICAL_BUTTON_CONTENT_DEFAULT_MIN_INC 400 0 +#define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 400 178 + +#define POPUP_BUTTON3_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 10 +#define POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC 222 46 +#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC 0 10 +#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC 9999 10 + +#define POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC 3 3 +#define POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC 394 320 +#define POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC 3 0 + +#define POPUP_BASE_CUSTOMSTYLE_BASE_DEFAULT_MIN_INC 400 0 +#define POPUP_BASE_CUSTOMSTYLE_BASE_DEFAULT_MAX_INC 400 730 +#define POPUP_BASE_CUSTOMSTYLE_BG_DEFAULT_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_CUSTOMSTYLE_TITLE_DEFAULT_MIN_INC 400 50 +#define POPUP_BASE_CUSTOMSTYLE_TITLE_BOTTOM_LINE_MIN_INC 400 1 +#define POPUP_BASE_CUSTOMSTYLE_TITLE_ICON_DEFAULT_MIN_MAX_INC 48 48 +#define POPUP_BASE_CUSTOMSTYLE_CONTENT_DEFAULT_MIN_INC 400 0 +#define POPUP_BASE_CUSTOMSTYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 400 60 +#define POPUP_BASE_CUSTOMSTYLE_BUTTONAREA_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_CUSTOMSTYLE_TEXT_FONT_SIZE_INC 24 + +#define POPUP_CONTENT_CUSTOMSTYLE_DEFAULT_MIN_INC 400 0 +#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_MAX_INC 252 46 +#define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 172 46 +#define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 6 46 + +#define POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 120 46 +#define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 6 46 + +#define POPUP_BASE_VOLUMEBAR_STYLE_BASE_DEFAULT_MIN_INC 262 0 +#define POPUP_BASE_VOLUMEBAR_STYLE_BASE_DEFAULT_MAX_INC 262 424 +#define POPUP_BASE_VOLUMEBAR_STYLE_BG_IMAGE_BORDER_INC 11 11 15 19 +#define POPUP_BASE_VOLUMEBAR_STYLE_TITLE_DEFAULT_MIN_MAX_INC 262 137 +#define POPUP_BASE_VOLUMEBAR_STYLE_TITLE_ICON_DEFAULT_MIN_MAX_INC 54 54 +#define POPUP_BASE_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 262 0 +#define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 262 90 +#define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_DEFAULT_MIN_MAX_INC 262 70 +#define POPUP_BASE_VOLUMEBAR_STYLE_PADDING_BOTTOM_MIN_INC 0 5 +#define POPUP_BASE_VOLUMEBAR_STYLE_TEXT_FONT_SIZE_INC 28 + +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_TOP_MIN_INC 0 2 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_LEFT_MIN_INC 43 0 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_RIGHT_MIN_INC 44 0 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 175 263 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_BOTTOM_MIN_INC 0 2 + +#define POPUP_BUTTON2_VOLUMEBAR_STYLE_BUTTON_DEFAULT_MIN_MAX_INC 172 46 +#define POPUP_BUTTON2_VOLUMEBAR_STYLE_PADDING_BUTTON_MIN_MAX_INC 6 46 + +#define POPUP_BUTTON1_VOLUMEBAR_STYLE_BUTTON_DEFAULT_MIN_MAX_INC 252 46 + +#define POPUP_BASE_IMAGE_SCROLL_BG_DEFAULT_MIN_MAX_INC 800 480 +#define POPUP_BASE_IMAGE_SCROLL_TITLE_DEFAULT_MIN_INC 200 37 +#define POPUP_BASE_IMAGE_SCROLL_TITLE_IMAGE_BORDER_INC 9 9 9 1 +#define POPUP_BASE_IMAGE_SCROLL_BACKGROUND_DEFAULT_MIN_INC 200 128 +#define POPUP_BASE_IMAGE_SCROLL_BACKGROUND_IMAGE_BORDER_INC 9 9 0 9 +#define POPUP_BASE_IMAGE_SCROLL_TITLE_ICON_MIN_MAX_INC 48 48 +#define POPUP_BASE_IMAGE_SCROLL_CONTENT_DEFAULT_MIN_INC 426 0 +#define POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_BG_DEFAULT_MIN_MAX_INC 64 436 +#define POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_DEFAULT_MIN_INC 46 46 +#define POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_DEFAULT_MAX_INC 46 436 +#define POPUP_BASE_IMAGE_SCROLL_PADDING_BOTTOM_MIN_INC 0 15 +#define POPUP_BASE_IMAGE_SCROLL_TEXT_FONT_SIZE_INC 20 + +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_TOP_MIN_INC 0 9 +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_LEFT_MIN_INC 10 0 +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_RIGHT_MIN_INC 10 0 +#define POPUP_CONTENT_IMAGE_SCROLL_CONTENT_DEFAULT_MIN_INC 648 0 +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_BOTTOM_MIN_INC 0 5 + +#define POPUP_BUTTONS2_IMAGE_SCROLL_BUTTON_DEFAULT_MIN_MAX_INC 46 46 + +#define POPUP_BASE_IMAGE_SLIDER_BG_DEFAULT_MIN_MAX_INC 800 480 +#define POPUP_BASE_IMAGE_SLIDER_TITLE_DEFAULT_MIN_INC 200 35 +#define POPUP_BASE_IMAGE_SLIDER_TITLE_DEFAULT_IMAGE_BORDER_INC 9 9 9 1 +#define POPUP_BASE_IMAGE_SLIDER_BACKGROUND_DEFAULT_IMAGE_BORDER_INC 9 9 1 8 +#define POPUP_BASE_IMAGE_SLIDER_TITLE_ICON_DEFAULT_MIN_MAX_INC 48 48 +#define POPUP_BASE_IMAGE_SLIDER_CONTENT_DEFAULT_MIN_INC 430 0 +#define POPUP_BASE_IMAGE_SLIDER_BUTTONAREA_BG_DEFAULT_MIN_MAX_INC 64 436 + +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_TOP_DEFAULT_MIN_INC 0 9 +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_LEFT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_RIGHT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_SLIDER_CONTENT_DEFAULT_MIN_INC 430 0 +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_BOTTOM_DEFAULT_MIN_INC 0 5 + +#define POPUP_BUTTONS2_IMAGE_SLIDER_BUTTON_DEFAULT_MIN_MAX_INC 46 46 + +#define POPUP_BASE_IMAGE_LIST_BG_DEFAULT_MIN_MAX_INC 800 480 +#define POPUP_BASE_IMAGE_LIST_TITLE_DEFAULT_MIN_INC 350 35 +#define POPUP_BASE_IMAGE_LIST_TITLE_DEFAULT_IMAGE_BORDER_INC 9 9 9 1 +#define POPUP_BASE_IMAGE_LIST_BACKGROUND_DEFAULT_MIN_INC 350 128 +#define POPUP_BASE_IMAGE_LIST_BACKGROUND_DEFAULT_IMAGE_BORDER_INC 9 9 0 9 +#define POPUP_BASE_IMAGE_LIST_TITLE_ICON_DEFAULT_MIN_MAX_INC 48 48 +#define POPUP_BASE_IMAGE_LIST_CONTENT_DEFAULT_MIN_INC 325 0 +#define POPUP_BASE_IMAGE_LIST_BUTTONAREA_BG_DEFAULT_MIN_INC 64 436 +#define POPUP_BASE_IMAGE_LIST_BUTTONAREA_DEFAULT_MIN_INC 40 70 + +#define POPUP_CONTENT_IMAGE_LIST_PADDING_TOP_DEFAULT_MIN_INC 0 9 +#define POPUP_CONTENT_IMAGE_LIST_PADDING_LEFT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_LIST_PADDING_RIGHT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_LIST_CONTENT_DEFAULT_MIN_INC 320 0 +#define POPUP_CONTENT_IMAGE_LIST_PADDING_BOTTOM_DEFAULT_MIN_INC 0 5 + +#define POPUP_BUTTONS2_IMAGE_LIST_BUTTON_DEFAULT_MIN_MAX_INC 46 46 + #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 diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc index 2568ae6..5145feb 100644 --- a/themes/inc/nbeat-hd-inc.edc +++ b/themes/inc/nbeat-hd-inc.edc @@ -432,7 +432,7 @@ #define BUTTON_POPUP_PADDING_MIN_INC 8 5 #define BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 8 0 #define BUTTON_POPUP_ICON_ICONONLY_MIN_INC 38 38 -#define BUTTON_POPUP_TEXT_MIN_INC 90 64 +#define BUTTON_POPUP_TEXT_MIN_INC 64 20 #define BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC 74 74 #define BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC 74 74 @@ -711,6 +711,143 @@ #define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC 150 #define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC 186 +#define POPUP_DESCRIPTION_DEFAULT_PADDING_INC 16 0 +#define POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC 588 0 +#define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 42 + +#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 620 0 +#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC 620 1120 +#define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 620 64 +#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 16 0 +#define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 62 62 +#define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 620 0 +#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 620 96 +#define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 38 + +#define POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC 0 22 +#define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 16 0 +#define POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 16 0 +#define POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC 0 22 +#define POPUP_CONTENT_DEFAULT_CONTENT_DEFAULT_MIN_INC 588 0 + +#define POPUP_BASE_VERTICAL_BUTTON_BASE_MIN_INC 620 0 +#define POPUP_BASE_VERTICAL_BUTTON_BASE_MAX_INC 620 1120 +#define POPUP_BASE_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_VERTICAL_BUTTON_TITLE_DEFAULT_MIN_INC 620 64 +#define POPUP_BASE_VERTICAL_BUTTON_TITLE_IMAGE_BORDER_MIN_INC 3 3 3 3 +#define POPUP_BASE_VERTICAL_BUTTON_TITLE_ICON_MIN_MAX_INC 62 62 +#define POPUP_BASE_VERTICAL_BUTTON_CONTENT_DEFAULT_MIN_INC 620 0 +#define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 620 286 + +#define POPUP_BUTTON3_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 16 +#define POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC 356 74 +#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC 0 16 +#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC 9999 16 + +#define POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC 3 3 +#define POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC 614 520 +#define POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC 3 0 + +#define POPUP_BASE_CUSTOMSTYLE_BASE_DEFAULT_MIN_INC 620 0 +#define POPUP_BASE_CUSTOMSTYLE_BASE_DEFAULT_MAX_INC 620 1120 +#define POPUP_BASE_CUSTOMSTYLE_BG_DEFAULT_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_CUSTOMSTYLE_TITLE_DEFAULT_MIN_INC 620 64 +#define POPUP_BASE_CUSTOMSTYLE_TITLE_BOTTOM_LINE_MIN_INC 620 1 +#define POPUP_BASE_CUSTOMSTYLE_TITLE_ICON_DEFAULT_MIN_MAX_INC 62 62 +#define POPUP_BASE_CUSTOMSTYLE_CONTENT_DEFAULT_MIN_INC 620 0 +#define POPUP_BASE_CUSTOMSTYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 620 96 +#define POPUP_BASE_CUSTOMSTYLE_BUTTONAREA_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_CUSTOMSTYLE_TEXT_FONT_SIZE_INC 38 + +#define POPUP_CONTENT_CUSTOMSTYLE_DEFAULT_MIN_INC 620 0 +#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_MAX_INC 402 74 +#define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 274 74 +#define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 10 74 + +#define POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 186 74 +#define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 10 74 + +#define POPUP_BASE_VOLUMEBAR_STYLE_BASE_DEFAULT_MIN_INC 416 0 +#define POPUP_BASE_VOLUMEBAR_STYLE_BASE_DEFAULT_MAX_INC 416 676 +#define POPUP_BASE_VOLUMEBAR_STYLE_BG_IMAGE_BORDER_INC 15 15 18 26 +#define POPUP_BASE_VOLUMEBAR_STYLE_TITLE_DEFAULT_MIN_MAX_INC 416 214 +#define POPUP_BASE_VOLUMEBAR_STYLE_TITLE_ICON_DEFAULT_MIN_MAX_INC 86 86 +#define POPUP_BASE_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 416 0 +#define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 416 142 +#define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_DEFAULT_MIN_MAX_INC 416 111 +#define POPUP_BASE_VOLUMEBAR_STYLE_PADDING_BOTTOM_MIN_INC 0 5 +#define POPUP_BASE_VOLUMEBAR_STYLE_TEXT_FONT_SIZE_INC 44 + +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_TOP_MIN_INC 0 2 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_LEFT_MIN_INC 68 0 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_RIGHT_MIN_INC 68 0 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 280 420 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_BOTTOM_MIN_INC 0 2 + +#define POPUP_BUTTON2_VOLUMEBAR_STYLE_BUTTON_DEFAULT_MIN_MAX_INC 274 74 +#define POPUP_BUTTON2_VOLUMEBAR_STYLE_PADDING_BUTTON_MIN_MAX_INC 10 74 + +#define POPUP_BUTTON1_VOLUMEBAR_STYLE_BUTTON_DEFAULT_MIN_MAX_INC 402 74 + +#define POPUP_BASE_IMAGE_SCROLL_BG_DEFAULT_MIN_MAX_INC 1280 720 +#define POPUP_BASE_IMAGE_SCROLL_TITLE_DEFAULT_MIN_INC 200 58 +#define POPUP_BASE_IMAGE_SCROLL_TITLE_IMAGE_BORDER_INC 9 9 9 1 +#define POPUP_BASE_IMAGE_SCROLL_BACKGROUND_DEFAULT_MIN_INC 200 204 +#define POPUP_BASE_IMAGE_SCROLL_BACKGROUND_IMAGE_BORDER_INC 9 9 0 9 +#define POPUP_BASE_IMAGE_SCROLL_TITLE_ICON_MIN_MAX_INC 62 62 +#define POPUP_BASE_IMAGE_SCROLL_CONTENT_DEFAULT_MIN_INC 660 0 +#define POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_BG_DEFAULT_MIN_MAX_INC 102 670 +#define POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_DEFAULT_MIN_INC 102 102 +#define POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_DEFAULT_MAX_INC 102 670 +#define POPUP_BASE_IMAGE_SCROLL_PADDING_BOTTOM_MIN_INC 0 24 +#define POPUP_BASE_IMAGE_SCROLL_TEXT_FONT_SIZE_INC 38 + +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_TOP_MIN_INC 0 15 +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_LEFT_MIN_INC 16 0 +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_RIGHT_MIN_INC 16 0 +#define POPUP_CONTENT_IMAGE_SCROLL_CONTENT_DEFAULT_MIN_INC 1034 0 +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_BOTTOM_MIN_INC 0 12 + +#define POPUP_BUTTONS2_IMAGE_SCROLL_BUTTON_DEFAULT_MIN_MAX_INC 74 74 + +#define POPUP_BASE_IMAGE_SLIDER_BG_DEFAULT_MIN_MAX_INC 1280 720 +#define POPUP_BASE_IMAGE_SLIDER_TITLE_DEFAULT_MIN_INC 200 58 +#define POPUP_BASE_IMAGE_SLIDER_TITLE_DEFAULT_IMAGE_BORDER_INC 9 9 9 1 +#define POPUP_BASE_IMAGE_SLIDER_BACKGROUND_DEFAULT_IMAGE_BORDER_INC 9 9 1 8 +#define POPUP_BASE_IMAGE_SLIDER_TITLE_ICON_DEFAULT_MIN_MAX_INC 62 62 +#define POPUP_BASE_IMAGE_SLIDER_CONTENT_DEFAULT_MIN_INC 430 0 +#define POPUP_BASE_IMAGE_SLIDER_BUTTONAREA_BG_DEFAULT_MIN_MAX_INC 64 436 + +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_TOP_DEFAULT_MIN_INC 0 9 +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_LEFT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_RIGHT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_SLIDER_CONTENT_DEFAULT_MIN_INC 430 0 +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_BOTTOM_DEFAULT_MIN_INC 0 5 + +#define POPUP_BUTTONS2_IMAGE_SLIDER_BUTTON_DEFAULT_MIN_MAX_INC 74 74 + +#define POPUP_BASE_IMAGE_LIST_BG_DEFAULT_MIN_MAX_INC 1280 720 +#define POPUP_BASE_IMAGE_LIST_TITLE_DEFAULT_MIN_INC 350 58 +#define POPUP_BASE_IMAGE_LIST_TITLE_DEFAULT_IMAGE_BORDER_INC 9 9 9 1 +#define POPUP_BASE_IMAGE_LIST_BACKGROUND_DEFAULT_MIN_INC 350 128 +#define POPUP_BASE_IMAGE_LIST_BACKGROUND_DEFAULT_IMAGE_BORDER_INC 9 9 0 9 +#define POPUP_BASE_IMAGE_LIST_TITLE_ICON_DEFAULT_MIN_MAX_INC 48 48 +#define POPUP_BASE_IMAGE_LIST_CONTENT_DEFAULT_MIN_INC 325 0 +#define POPUP_BASE_IMAGE_LIST_BUTTONAREA_BG_DEFAULT_MIN_INC 64 436 +#define POPUP_BASE_IMAGE_LIST_BUTTONAREA_DEFAULT_MIN_INC 40 70 + +#define POPUP_CONTENT_IMAGE_LIST_PADDING_TOP_DEFAULT_MIN_INC 0 9 +#define POPUP_CONTENT_IMAGE_LIST_PADDING_LEFT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_LIST_PADDING_RIGHT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_LIST_CONTENT_DEFAULT_MIN_INC 320 0 +#define POPUP_CONTENT_IMAGE_LIST_PADDING_BOTTOM_DEFAULT_MIN_INC 0 5 + +#define POPUP_BUTTONS2_IMAGE_LIST_BUTTON_DEFAULT_MIN_MAX_INC 74 74 + #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 diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc index ff808e3..bb199e5 100644 --- a/themes/inc/nbeat-inc.edc +++ b/themes/inc/nbeat-inc.edc @@ -425,7 +425,7 @@ #define BUTTON_POPUP_PADDING_MIN_INC 5 5 #define BUTTON_POPUP_PADDING_ICON_TEXT_VISIBLE_MIN_INC 5 0 #define BUTTON_POPUP_ICON_ICONONLY_MIN_INC 24 24 -#define BUTTON_POPUP_TEXT_MIN_INC 90 20 +#define BUTTON_POPUP_TEXT_MIN_INC 36 20 #define BUTTON_EDIT_STYLE_BG_NORMAL_MIN_MAX_INC 46 46 #define BUTTON_EDIT_STYLE_IMAGE_NORMAL_MIN_MAX_INC 46 46 @@ -703,6 +703,143 @@ #define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC 94 #define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC 116 +#define POPUP_DESCRIPTION_DEFAULT_PADDING_INC 10 0 +#define POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC 380 0 +#define POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC 26 + +#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MIN_INC 400 0 +#define POPUP_BASE_DEFAULT_BASE_DEFAULT_MAX_INC 400 730 +#define POPUP_BASE_DEFAULT_BG_DEFAULT_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_MIN_INC 400 50 +#define POPUP_BASE_DEFAULT_TITLE_DEFAULT_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_DEFAULT_PADDING_MIN_MAX_INC 10 0 +#define POPUP_BASE_DEFAULT_TITLE_ICON_DEFAULT_MIN_MAX_INC 48 48 +#define POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC 400 0 +#define POPUP_BASE_DEFAULT_BUTTON_BG_DEFAULT_MIN_INC 400 60 +#define POPUP_BASE_DEFAULT_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC 24 + +#define POPUP_CONTENT_DEFAULT_PADDING_TOP_MIN_INC 0 14 +#define POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 10 0 +#define POPUP_CONTENT_DEFAULT_PADDING_RIGHT_MIN_INC 10 0 +#define POPUP_CONTENT_DEFAULT_PADDING_BOTTOM_MIN_INC 0 14 +#define POPUP_CONTENT_DEFAULT_CONTENT_DEFAULT_MIN_INC 380 0 + +#define POPUP_BASE_VERTICAL_BUTTON_BASE_MIN_INC 400 0 +#define POPUP_BASE_VERTICAL_BUTTON_BASE_MAX_INC 400 730 +#define POPUP_BASE_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_VERTICAL_BUTTON_TITLE_DEFAULT_MIN_INC 400 50 +#define POPUP_BASE_VERTICAL_BUTTON_TITLE_IMAGE_BORDER_MIN_INC 3 3 3 3 +#define POPUP_BASE_VERTICAL_BUTTON_TITLE_ICON_MIN_MAX_INC 48 48 +#define POPUP_BASE_VERTICAL_BUTTON_CONTENT_DEFAULT_MIN_INC 400 0 +#define POPUP_BASE_VERTICAL_BUTTON_BUTTONAREA_DEFAULT_MIN_INC 400 178 + +#define POPUP_BUTTON3_VERTICAL_BUTTON_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_TOP_MIN_INC 0 10 +#define POPUP_BUTTON3_VERTICAL_BUTTON_BUTTON_MIN_MAX_INC 222 46 +#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MIN_INC 0 10 +#define POPUP_BUTTON3_VERTICAL_BUTTON_PADDING_BUTTON_MAX_INC 9999 10 + +#define POPUP_CONTENT_LISTSTYLE_PADDING_TOP_MIN_MAX_INC 3 3 +#define POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC 394 320 +#define POPUP_CONTENT_LISTSTYLE_PADDING_RIGHT_MIN_INC 3 0 + +#define POPUP_BASE_CUSTOMSTYLE_BASE_DEFAULT_MIN_INC 400 0 +#define POPUP_BASE_CUSTOMSTYLE_BASE_DEFAULT_MAX_INC 400 730 +#define POPUP_BASE_CUSTOMSTYLE_BG_DEFAULT_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_CUSTOMSTYLE_TITLE_DEFAULT_MIN_INC 400 50 +#define POPUP_BASE_CUSTOMSTYLE_TITLE_BOTTOM_LINE_MIN_INC 400 1 +#define POPUP_BASE_CUSTOMSTYLE_TITLE_ICON_DEFAULT_MIN_MAX_INC 48 48 +#define POPUP_BASE_CUSTOMSTYLE_CONTENT_DEFAULT_MIN_INC 400 0 +#define POPUP_BASE_CUSTOMSTYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 400 60 +#define POPUP_BASE_CUSTOMSTYLE_BUTTONAREA_BG_IMAGE_BORDER_INC 3 3 3 3 +#define POPUP_BASE_CUSTOMSTYLE_TEXT_FONT_SIZE_INC 24 + +#define POPUP_CONTENT_CUSTOMSTYLE_DEFAULT_MIN_INC 400 0 +#define POPUP_BUTTON1_DEFAULT_BUTTON1_DEFAULT_MIN_MAX_INC 252 46 +#define POPUP_BUTTON2_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 172 46 +#define POPUP_BUTTON2_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 6 46 + +#define POPUP_BUTTON3_DEFAULT_BUTTON_DEFAULT_MIN_MAX_INC 120 46 +#define POPUP_BUTTON3_DEFAULT_PADDING_BUTTON_MIN_MAX_INC 6 46 + +#define POPUP_BASE_VOLUMEBAR_STYLE_BASE_DEFAULT_MIN_INC 262 0 +#define POPUP_BASE_VOLUMEBAR_STYLE_BASE_DEFAULT_MAX_INC 262 424 +#define POPUP_BASE_VOLUMEBAR_STYLE_BG_IMAGE_BORDER_INC 11 11 15 19 +#define POPUP_BASE_VOLUMEBAR_STYLE_TITLE_DEFAULT_MIN_MAX_INC 262 137 +#define POPUP_BASE_VOLUMEBAR_STYLE_TITLE_ICON_DEFAULT_MIN_MAX_INC 54 54 +#define POPUP_BASE_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 262 0 +#define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_BG_DEFAULT_MIN_INC 262 90 +#define POPUP_BASE_VOLUMEBAR_STYLE_BUTTONAREA_DEFAULT_MIN_MAX_INC 262 70 +#define POPUP_BASE_VOLUMEBAR_STYLE_PADDING_BOTTOM_MIN_INC 0 5 +#define POPUP_BASE_VOLUMEBAR_STYLE_TEXT_FONT_SIZE_INC 28 + +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_TOP_MIN_INC 0 2 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_LEFT_MIN_INC 43 0 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_RIGHT_MIN_INC 44 0 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC 175 263 +#define POPUP_CONTENT_VOLUMEBAR_STYLE_PADDING_BOTTOM_MIN_INC 0 2 + +#define POPUP_BUTTON2_VOLUMEBAR_STYLE_BUTTON_DEFAULT_MIN_MAX_INC 172 46 +#define POPUP_BUTTON2_VOLUMEBAR_STYLE_PADDING_BUTTON_MIN_MAX_INC 6 46 + +#define POPUP_BUTTON1_VOLUMEBAR_STYLE_BUTTON_DEFAULT_MIN_MAX_INC 252 46 + +#define POPUP_BASE_IMAGE_SCROLL_BG_DEFAULT_MIN_MAX_INC 800 480 +#define POPUP_BASE_IMAGE_SCROLL_TITLE_DEFAULT_MIN_INC 200 37 +#define POPUP_BASE_IMAGE_SCROLL_TITLE_IMAGE_BORDER_INC 9 9 9 1 +#define POPUP_BASE_IMAGE_SCROLL_BACKGROUND_DEFAULT_MIN_INC 200 128 +#define POPUP_BASE_IMAGE_SCROLL_BACKGROUND_IMAGE_BORDER_INC 9 9 0 9 +#define POPUP_BASE_IMAGE_SCROLL_TITLE_ICON_MIN_MAX_INC 48 48 +#define POPUP_BASE_IMAGE_SCROLL_CONTENT_DEFAULT_MIN_INC 426 0 +#define POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_BG_DEFAULT_MIN_MAX_INC 64 436 +#define POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_DEFAULT_MIN_INC 46 46 +#define POPUP_BASE_IMAGE_SCROLL_BUTTONAREA_DEFAULT_MAX_INC 46 436 +#define POPUP_BASE_IMAGE_SCROLL_PADDING_BOTTOM_MIN_INC 0 15 +#define POPUP_BASE_IMAGE_SCROLL_TEXT_FONT_SIZE_INC 20 + +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_TOP_MIN_INC 0 9 +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_LEFT_MIN_INC 10 0 +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_RIGHT_MIN_INC 10 0 +#define POPUP_CONTENT_IMAGE_SCROLL_CONTENT_DEFAULT_MIN_INC 648 0 +#define POPUP_CONTENT_IMAGE_SCROLL_PADDING_BOTTOM_MIN_INC 0 5 + +#define POPUP_BUTTONS2_IMAGE_SCROLL_BUTTON_DEFAULT_MIN_MAX_INC 46 46 + +#define POPUP_BASE_IMAGE_SLIDER_BG_DEFAULT_MIN_MAX_INC 800 480 +#define POPUP_BASE_IMAGE_SLIDER_TITLE_DEFAULT_MIN_INC 200 35 +#define POPUP_BASE_IMAGE_SLIDER_TITLE_DEFAULT_IMAGE_BORDER_INC 9 9 9 1 +#define POPUP_BASE_IMAGE_SLIDER_BACKGROUND_DEFAULT_IMAGE_BORDER_INC 9 9 1 8 +#define POPUP_BASE_IMAGE_SLIDER_TITLE_ICON_DEFAULT_MIN_MAX_INC 48 48 +#define POPUP_BASE_IMAGE_SLIDER_CONTENT_DEFAULT_MIN_INC 430 0 +#define POPUP_BASE_IMAGE_SLIDER_BUTTONAREA_BG_DEFAULT_MIN_MAX_INC 64 436 + +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_TOP_DEFAULT_MIN_INC 0 9 +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_LEFT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_RIGHT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_SLIDER_CONTENT_DEFAULT_MIN_INC 430 0 +#define POPUP_CONTENT_IMAGE_SLIDER_PADDING_BOTTOM_DEFAULT_MIN_INC 0 5 + +#define POPUP_BUTTONS2_IMAGE_SLIDER_BUTTON_DEFAULT_MIN_MAX_INC 46 46 + +#define POPUP_BASE_IMAGE_LIST_BG_DEFAULT_MIN_MAX_INC 800 480 +#define POPUP_BASE_IMAGE_LIST_TITLE_DEFAULT_MIN_INC 350 35 +#define POPUP_BASE_IMAGE_LIST_TITLE_DEFAULT_IMAGE_BORDER_INC 9 9 9 1 +#define POPUP_BASE_IMAGE_LIST_BACKGROUND_DEFAULT_MIN_INC 350 128 +#define POPUP_BASE_IMAGE_LIST_BACKGROUND_DEFAULT_IMAGE_BORDER_INC 9 9 0 9 +#define POPUP_BASE_IMAGE_LIST_TITLE_ICON_DEFAULT_MIN_MAX_INC 48 48 +#define POPUP_BASE_IMAGE_LIST_CONTENT_DEFAULT_MIN_INC 325 0 +#define POPUP_BASE_IMAGE_LIST_BUTTONAREA_BG_DEFAULT_MIN_INC 64 436 +#define POPUP_BASE_IMAGE_LIST_BUTTONAREA_DEFAULT_MIN_INC 40 70 + +#define POPUP_CONTENT_IMAGE_LIST_PADDING_TOP_DEFAULT_MIN_INC 0 9 +#define POPUP_CONTENT_IMAGE_LIST_PADDING_LEFT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_LIST_PADDING_RIGHT_DEFAULT_MIN_INC 15 0 +#define POPUP_CONTENT_IMAGE_LIST_CONTENT_DEFAULT_MIN_INC 320 0 +#define POPUP_CONTENT_IMAGE_LIST_PADDING_BOTTOM_DEFAULT_MIN_INC 0 5 + +#define POPUP_BUTTONS2_IMAGE_LIST_BUTTON_DEFAULT_MIN_MAX_INC 46 46 + #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