summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun_cho@naver.com>2013-06-11 23:25:56 +0900
committerSungho Kwak <sungho1.kwak@samsung.com>2013-06-20 21:46:25 +0900
commitdb83996ac3380bd5654e0555d2cfe3a9677e6f4c (patch)
tree31b230147dbcc0b1c4c2bc3331943d07e6dc9a44 /themes
parent8c303961d89a29ce3ff68c73ae8055c57df94112 (diff)
downloadefl-theme-tizen-db83996ac3380bd5654e0555d2cfe3a9677e6f4c.tar.gz
efl-theme-tizen-db83996ac3380bd5654e0555d2cfe3a9677e6f4c.tar.bz2
efl-theme-tizen-db83996ac3380bd5654e0555d2cfe3a9677e6f4c.zip
[naviframe] Apply Dark Theme Winset GUI v0.2
Change-Id: I38eea996519ff46fef94c535ec9e3d52c6ec222c Conflicts: themes/widgets/button.edc themes/widgets/naviframe.edc
Diffstat (limited to 'themes')
-rwxr-xr-x[-rw-r--r--]themes/images/HD/dark/Naviframe/00_effect_tab_bounce_left.pngbin7087 -> 7087 bytes
-rwxr-xr-x[-rw-r--r--]themes/images/HD/dark/Naviframe/00_effect_tab_bounce_right.pngbin7003 -> 7003 bytes
-rwxr-xr-x[-rw-r--r--]themes/images/HD/dark/Naviframe/00_title_bg.pngbin2842 -> 2842 bytes
-rwxr-xr-x[-rw-r--r--]themes/images/HD/dark/Naviframe/00_toolbar_bg.pngbin2807 -> 2818 bytes
-rwxr-xr-x[-rw-r--r--]themes/images/HD/dark/Naviframe/00_toolbar_button.pngbin8218 -> 3834 bytes
-rwxr-xr-x[-rw-r--r--]themes/images/HD/dark/Naviframe/00_toolbar_button_dim.pngbin8218 -> 3792 bytes
-rwxr-xr-x[-rw-r--r--]themes/images/HD/dark/Naviframe/00_toolbar_button_press.pngbin9337 -> 4013 bytes
-rwxr-xr-x[-rw-r--r--]themes/images/HD/dark/Naviframe/Icon/00_icon_SIP_close.pngbin4163 -> 2036 bytes
-rwxr-xr-x[-rw-r--r--]themes/images/HD/dark/Naviframe/Icon/00_icon_edit.pngbin5139 -> 2471 bytes
-rwxr-xr-x[-rw-r--r--]themes/images/HD/dark/Naviframe/Icon/00_icon_plus.pngbin3270 -> 1300 bytes
-rwxr-xr-xthemes/inc/tizen-dark-inc.edc84
-rwxr-xr-xthemes/inc/tizen-light-inc.edc5
-rw-r--r--themes/widgets/button.edc55
-rw-r--r--themes/widgets/naviframe.edc2491
14 files changed, 289 insertions, 2346 deletions
diff --git a/themes/images/HD/dark/Naviframe/00_effect_tab_bounce_left.png b/themes/images/HD/dark/Naviframe/00_effect_tab_bounce_left.png
index 2cbd9534..2cbd9534 100644..100755
--- a/themes/images/HD/dark/Naviframe/00_effect_tab_bounce_left.png
+++ b/themes/images/HD/dark/Naviframe/00_effect_tab_bounce_left.png
Binary files differ
diff --git a/themes/images/HD/dark/Naviframe/00_effect_tab_bounce_right.png b/themes/images/HD/dark/Naviframe/00_effect_tab_bounce_right.png
index 3a245213..3a245213 100644..100755
--- a/themes/images/HD/dark/Naviframe/00_effect_tab_bounce_right.png
+++ b/themes/images/HD/dark/Naviframe/00_effect_tab_bounce_right.png
Binary files differ
diff --git a/themes/images/HD/dark/Naviframe/00_title_bg.png b/themes/images/HD/dark/Naviframe/00_title_bg.png
index 51fc7826..51fc7826 100644..100755
--- a/themes/images/HD/dark/Naviframe/00_title_bg.png
+++ b/themes/images/HD/dark/Naviframe/00_title_bg.png
Binary files differ
diff --git a/themes/images/HD/dark/Naviframe/00_toolbar_bg.png b/themes/images/HD/dark/Naviframe/00_toolbar_bg.png
index eef8f3ab..3b4be752 100644..100755
--- a/themes/images/HD/dark/Naviframe/00_toolbar_bg.png
+++ b/themes/images/HD/dark/Naviframe/00_toolbar_bg.png
Binary files differ
diff --git a/themes/images/HD/dark/Naviframe/00_toolbar_button.png b/themes/images/HD/dark/Naviframe/00_toolbar_button.png
index 269c1cc5..2780c2dd 100644..100755
--- a/themes/images/HD/dark/Naviframe/00_toolbar_button.png
+++ b/themes/images/HD/dark/Naviframe/00_toolbar_button.png
Binary files differ
diff --git a/themes/images/HD/dark/Naviframe/00_toolbar_button_dim.png b/themes/images/HD/dark/Naviframe/00_toolbar_button_dim.png
index 269c1cc5..ccec54fc 100644..100755
--- a/themes/images/HD/dark/Naviframe/00_toolbar_button_dim.png
+++ b/themes/images/HD/dark/Naviframe/00_toolbar_button_dim.png
Binary files differ
diff --git a/themes/images/HD/dark/Naviframe/00_toolbar_button_press.png b/themes/images/HD/dark/Naviframe/00_toolbar_button_press.png
index 17251d83..b91ad0ae 100644..100755
--- a/themes/images/HD/dark/Naviframe/00_toolbar_button_press.png
+++ b/themes/images/HD/dark/Naviframe/00_toolbar_button_press.png
Binary files differ
diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_SIP_close.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_SIP_close.png
index f79459c5..76f10ec9 100644..100755
--- a/themes/images/HD/dark/Naviframe/Icon/00_icon_SIP_close.png
+++ b/themes/images/HD/dark/Naviframe/Icon/00_icon_SIP_close.png
Binary files differ
diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_edit.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_edit.png
index 0e68b5dd..a56d1f69 100644..100755
--- a/themes/images/HD/dark/Naviframe/Icon/00_icon_edit.png
+++ b/themes/images/HD/dark/Naviframe/Icon/00_icon_edit.png
Binary files differ
diff --git a/themes/images/HD/dark/Naviframe/Icon/00_icon_plus.png b/themes/images/HD/dark/Naviframe/Icon/00_icon_plus.png
index 74f628c4..d49406f6 100644..100755
--- a/themes/images/HD/dark/Naviframe/Icon/00_icon_plus.png
+++ b/themes/images/HD/dark/Naviframe/Icon/00_icon_plus.png
Binary files differ
diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 4e3615a8..05181d7d 100755
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -26,74 +26,52 @@
#define LAYOUT_INDICATOR_HEIGHT_INC 60
#define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255
-#define NAVIFRAME_TITLE_BG_COLOR_INC 248 246 239 255
-#define NAVIFRAME_TOOLBAR_BG_COLOR_INC 248 246 239 255
-#define NAVIFRAME_TITLE_TOP_PADDING_INC 0 32
-#define NAVIFRAME_LANDSCAPE_TITLE_TOP_PADDING_INC 0 15
-#define NAVIFRAME_TITLE_TOP_PADDING2_INC 0 18
-#define NAVIFRAME_LANDSCAPE_TITLE_TOP_PADDING2_INC 0 11
-#define NAVIFRAME_TITLE_RIGHT_PADDING_INC 17 0
-#define NAVIFRAME_TITLE_TOOLBAR_TOP_PADDING_INC 0 32
-#define NAVIFRAME_TITLE_TOOLBAR_BOTTOM_PADDING_INC 0 7
-#define NAVIFRAME_TITLE_H_INC 111
+#define NAVIFRAME_TITLE_TEXT_BG_H_INC 82
+#define NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_H_INC 72
+#define NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC 8 8 2 2
+#define NAVIFRAME_TITLE_H_INC 96
#define NAVIFRAME_LANDSCAPE_TITLE_H_INC 91
#define NAVIFRAME_TAB_TITLE_H_INC 165
-#define NAVIFRAME_TAB_TITLE_TOP_PADDING_INC 0 18
#define NAVIFRAME_LANDSCAPE_TAB_TITLE_H_INC 145
-#define NAVIFRAME_LANDSCAPE_TAB_TITLE_TOP_PADDING_INC 0 17
+#define NAVIFRAME_TAB_TITLE_H2_INC 126
#define NAVIFRAME_TOOLBAR_HEIGHT_INC 98
#define NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC 85
-#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 85 111
-#define NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC 85 91
+#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 115 96
+#define NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC 115 91
#define NAVIFRAME_PREV_FUNC_BTN_SIZE_INC 85 98
#define NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC 85 85
#define NAVIFRAME_TITLE_TAB_H_INC 75
#define NAVIFRAME_TITLE_TAB_FONT_SIZE_INC 44
#define NAVIFRAME_LANDSCAPE_TITLE_TAB_FONT_SIZE_INC 38
-#define NAVIFRAME_TITLE_TAB_TEXT_H_INC 60
-#define NAVIFRAME_LANDSCAPE_TITLE_TAB_TEXT_H_INC 60
-#define NAVIFRAME_TITLE_FONT_SIZE_INC 56
+#define NAVIFRAME_TITLE_TAB_TEXT_H_INC 90
+#define NAVIFRAME_LANDSCAPE_TITLE_TAB_TEXT_H_INC 70
+#define NAVIFRAME_TITLE_FONT_SIZE_INC 50
#define NAVIFRAME_TITLE_FONT_MIN_SIZE_INC 46
#define NAVIFRAME_LANDSCAPE_TITLE_FONT_SIZE_INC 50
#define NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC 44
#define NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC 38
-#define NAVIFRAME_DUAL_TITLE_FONT_SIZE_INC 50
-#define NAVIFRAME_DUAL_TITLE1_MIN_W_INC 188
-#define NAVIFRAME_DUAL_TITLE1_MAX_W_WITH_ONE_BUTTON_INC 280
-#define NAVIFRAME_DUAL_TITLE1_MAX_W_WITH_TWO_BUTTON_INC 237
#define NAVIFRAME_ICON_SIZE_INC 45 45
-#define NAVIFRAME_PADDING_INC 16 0
-#define NAVIFRAME_LANDSCAPE_PADDING_INC 34 0
-#define NAVIFRAME_PADDING2_INC 9 0
+#define NAVIFRAME_PADDING_INC 26 0
+#define NAVIFRAME_PADDING2_INC 16 0
#define NAVIFRAME_PADDING_BADGE_INC 2 0
-#define NAVIFRAME_PADDING3_INC 8 0
-#define NAVIFRAME_MIDDLE_PADDING_INC 0 12
-#define NAVIFRAME_BOTTOM_TEXT_PADDING_INC 0 11
-#define NAVIFRAME_LANDSCAPE_BOTTOM_TEXT_PADDING_INC 0 8
-#define NAVIFRAME_BOTTOM_PADDING_INC 0 12
-#define NAVIFRAME_LANDSCAPE_BOTTOM_PADDING_INC 0 5
#define NAVIFRAME_BADGE_PADDING_INC 85 0
#define NAVIFRAME_BADGE_TOP_PADDING_INC 0 3
-#define NAVIFRAME_BADGE_LEFT_TEXT_PADDING_INC 10 0
#define NAVIFRAME_BADGE_TEXT_H_INC 26
#define NAVIFRAME_BADGE_TEXT_W_INC 42
#define NAVIFRAME_BADGE_BG_IMAGE_SIZE_INC 54 54
#define NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC 29 24 0 0
#define NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC 112 0
-#define NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 16
-#define NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 20
#define NAVIFRAME_ICON_PADDING_INC 77 0
-#define NAVIFRAME_TITLE_TEXT_COLOR_INC 59 115 182 255
-#define NAVIFRAME_TITLE_STYLE_COLOR_INC "#3B73B6"
-#define NAVIFRAME_SUBTITLE_TEXT_COLOR_INC 59 115 182 255
+#define NAVIFRAME_TITLE_TEXT_COLOR_INC 250 250 250 255
+#define NAVIFRAME_TITLE_STYLE_COLOR_INC "#FAFAFA"
+#define NAVIFRAME_SUBTITLE_TEXT_COLOR_INC 250 250 250 255
#define NAVIFRAME_SUBTITLE_FONT_SIZE_INC 32
#define NAVIFRAME_LANDSCAPE_SUBTITLE_FONT_SIZE_INC 28
#define NAVIFRAME_SUBTITLE_HEIGHT_INC 34
#define NAVIFRAME_LANDSCAPE_SUBTITLE_HEIGHT_INC 30
#define NAVIFRAME_TITLE_TEXT_UNSELECTED_COLOR_INC 153 153 153 255
#define NAVIFRAME_BADGE_TEXT_COLOR_INC 10 100 208 255;
-#define NAVIFRAME_DUAL_TITLE_DIVIDER_LEFT_COLOR_INC 211 209 203 255
-#define NAVIFRAME_DUAL_TITLE_DIVIDER_RIGHT_COLOR_INC 255 255 255 255
+#define NAVIFRAME_TITLE_BUTTON_DIVIDER_COLOR_INC 255 255 255 82
#define PROGRESSBAR_TITLE_FONT_SIZE_INC 28
#define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20
@@ -412,9 +390,9 @@
#define BUTTON_CONTACT_BUTTON_TEXT_DISABLED_COLOR_INC 255 255 255 76
#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_NORMAL_COLOR_INC 255 255 255 255
-#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC 115 115 115 255
-#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC 64 127 247 255
-#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC 101 101 101 76
+#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DEFAULT_COLOR_INC 250 250 250 255
+#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_PRESSED_COLOR_INC 93 131 255 255
+#define BUTTON_NAVIFRAME_TITLE_ICON_CLIPPER_DISABLED_COLOR_INC 250 250 250 76
#define BUTTON_NAVIFRAME_TITLE_TEXT_NORMAL_COLOR_INC 58 58 58 255
#define BUTTON_NAVIFRAME_TITLE_TEXT_PRESSED_COLOR_INC 255 255 255 255
@@ -556,24 +534,22 @@
#define BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC 249 249 249 255
#define BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC 249 249 249 255
-#define BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC 85 111
-#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC 85 91
+#define BUTTON_NAVIFRAME_TITLE_ICON_BG_MIN_MAX_INC 115 96
+#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC 115 91
#define BUTTON_NAVIFRAME_TITLE_ICON_IMAGE_MIN_MAX_INC 63 63
-#define BUTTON_NAVIFRAME_TITLE_ICON_TOP_PADDING_INC 0 34
-#define BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_TOP_PADDING_INC 0 17
-
-#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC 182 72
-#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MAX_INC 496 72
-#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_MIN_INC 126 70
-#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC 35 35 35 35
-#define BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC 28 5
-#define BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC 32
+
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MIN_INC 234 81
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_MAX_INC 668 81
+#define BUTTON_NAVIFRAME_TITLE_TEXTBLOCK_MIN_INC 178 81
+#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_PRESSED_BORDER_INC 40 40 81 81
+#define BUTTON_NAVIFRAME_TITLE_TEXT_PADDING_MIN_INC 28 0
+#define BUTTON_NAVIFRAME_TITLE_TEXT_FONT_SIZE_INC 36
#define BUTTON_NAVIFRAME_TITLE_VISIBLE_PADDING_ICON_TEXT_MIN_INC 8 0
#define BUTTON_NAVIFRAME_TITLE_TEXT_BG_NORMAL_COLOR_INC 249 249 249 255
#define BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MIN_INC 330 72
-#define BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC 1012 72
-#define BUTTON_NAVIFRAME_TITLE_LANDSCAPE_TEXTBLOCK_MIN_INC 274 70
+#define BUTTON_NAVIFRAME_TITLE_TEXT_LANDSCAPE_BG_NORMAL_MAX_INC 1228 72
+#define BUTTON_NAVIFRAME_TITLE_LANDSCAPE_TEXTBLOCK_MIN_INC 612 81
#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_TEXT_FONT_SIZE_INC 32
#define BUTTON_TOOLBAR_SEGMENTEDCONTROL_BG_NORMAL_MIN_INC 190 70
diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index b94f4e10..738cabcf 100755
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -27,6 +27,8 @@
#define LAYOUT_INDICATOR_HEIGHT_INC 60
#define LAYOUT_INDICATOR_COLOR_INC 0 0 0 255
+#define NAVIFRAME_TITLE_TEXT_BG_H_INC 82
+#define NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_H_INC 72
#define NAVIFRAME_TITLE_BG_COLOR_INC 248 246 239 255
#define NAVIFRAME_TOOLBAR_BG_COLOR_INC 248 246 239 255
#define NAVIFRAME_TITLE_TOP_PADDING_INC 0 32
@@ -36,11 +38,13 @@
#define NAVIFRAME_TITLE_RIGHT_PADDING_INC 17 0
#define NAVIFRAME_TITLE_TOOLBAR_TOP_PADDING_INC 0 32
#define NAVIFRAME_TITLE_TOOLBAR_BOTTOM_PADDING_INC 0 7
+#define NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC 8 8 2 2
#define NAVIFRAME_TITLE_H_INC 111
#define NAVIFRAME_LANDSCAPE_TITLE_H_INC 91
#define NAVIFRAME_TAB_TITLE_H_INC 165
#define NAVIFRAME_TAB_TITLE_TOP_PADDING_INC 0 18
#define NAVIFRAME_LANDSCAPE_TAB_TITLE_H_INC 145
+#define NAVIFRAME_TAB_TITLE_H2_INC 126
#define NAVIFRAME_LANDSCAPE_TAB_TITLE_TOP_PADDING_INC 0 17
#define NAVIFRAME_TOOLBAR_HEIGHT_INC 98
#define NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC 85
@@ -95,6 +99,7 @@
#define NAVIFRAME_BADGE_TEXT_COLOR_INC 10 100 208 255;
#define NAVIFRAME_DUAL_TITLE_DIVIDER_LEFT_COLOR_INC 211 209 203 255
#define NAVIFRAME_DUAL_TITLE_DIVIDER_RIGHT_COLOR_INC 255 255 255 255
+#define NAVIFRAME_TITLE_BUTTON_DIVIDER_COLOR_INC 255 255 255 82
#define PROGRESSBAR_TITLE_FONT_SIZE_INC 28
#define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20
diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index 880b1cc5..31e28c67 100644
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -5865,40 +5865,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
max: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_BG_MIN_MAX_INC;
}
}
- part { name: "focus_image";
- scale: 1;
- mouse_events: 0;
- repeat_events: 1;
- description { state: "default" 0.0;
- visible: 0;
- rel1.to : "button_image";
- rel2.to : "button_image";
- image {
- normal: "00_icon_focus.png";
- border_scale: 1;
- }
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "top_padding";
- type: RECT;
- scale: 1;
- description { state: "default" 0.0;
- visible: 0;
- min: BUTTON_NAVIFRAME_TITLE_ICON_TOP_PADDING_INC;
- fixed: 0 1;
- align: 0 0;
- rel1 { relative: 0.0 0.0; to: "button_image"; }
- rel2 { relative: 1.0 0.0; to: "button_image"; }
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: BUTTON_NAVIFRAME_LANDSCAPE_TITLE_ICON_TOP_PADDING_INC;
- }
- }
part { name: "elm.swallow.content";
type: SWALLOW;
scale: 1;
@@ -5906,10 +5872,9 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
description { state: "default" 0.0;
visible: 0;
max: BUTTON_NAVIFRAME_TITLE_ICON_IMAGE_MIN_MAX_INC;
- fixed: 1 1;
- align: 0.5 0.0;
- rel1 { relative: 0.0 1.0; to: "top_padding"; }
- rel2 { relative: 1.0 1.0; to: "button_image"; }
+ align: 0.5 0.5;
+ rel1 { to: "button_image"; }
+ rel2 { to: "button_image"; }
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -6051,14 +6016,12 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
source: "elm";
action: STATE_SET "landscape" 0.0;
target: "button_image";
- target: "top_padding";
}
program { name: "change_to_portrait";
signal: "elm,state,portrait";
source: "elm";
action: STATE_SET "default" 0.0;
target: "button_image";
- target: "top_padding";
}
program { name: "landscape_mode";
source: "elm";
@@ -6080,18 +6043,6 @@ BUTTON_SCROLL_JUMPTO("jumpto_left", "00_icon_jump_left.png")
signal: "elm,state,orient,180";
action: SIGNAL_EMIT "elm,state,portrait" "elm";
}
- program { name: "action_focus";
- signal: "elm,action,focus_highlight,show";
- source: "elm";
- action: STATE_SET "focused" 0.0;
- target: "focus_image";
- }
- program { name: "action_unfocus";
- signal: "elm,action,focus_highlight,hide";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "focus_image";
- }
}
}
diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index 91d337ab..7ef5183c 100644
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -21,11 +21,11 @@
group { name: "elm/naviframe/item/basic/default";
images {
+ image: "00_title_bg.png" COMP;
image: "00_badge_bg.png" COMP;
}
script {
public tbar_bg = 0; //Toolbar BG Show call count
- public toolbar_buttons_visible = 0; //when both toolbar buttons are visible
public tbar_close = 0; //Toolbar lastest Open/Close status
public title_badge_visible = 0; //Title badge visible/hidden status
public title_slide_visible = 0; //Title slide visible/hidden status
@@ -59,19 +59,25 @@
}
}
part { name: "title_bg";
- type: RECT;
+ type: IMAGE;
scale: 1;
description { state: "default" 0.0;
min: 1 NAVIFRAME_TITLE_H_INC;
+ max: -1 NAVIFRAME_TITLE_H_INC;
align: 0.0 0.0;
fixed: 0 1;
rel1 { relative: 0.0 0.0; to: "base"; }
rel2 { relative: 1.0 0.0; to: "base"; }
- color: NAVIFRAME_TITLE_BG_COLOR_INC;
+ image {
+ normal: "00_title_bg.png";
+ border: NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC;
+ border_scale: 1;
+ }
}
description { state: "landscape" 0.0;
inherit: "default" 0.0;
min: 1 NAVIFRAME_LANDSCAPE_TITLE_H_INC;
+ max: -1 NAVIFRAME_LANDSCAPE_TITLE_H_INC;
}
description { state: "hide" 0.0;
inherit: "default" 0.0;
@@ -89,51 +95,13 @@
rel2 { to_y: "title_bg"; }
}
}
- part { name: "top_padding";
- type: RECT;
- mouse_events: 0;
- scale: 1;
- description {
- state: "default" 0.0;
- min: NAVIFRAME_TITLE_TOP_PADDING_INC;
- fixed: 0 1;
- align: 0.0 0.0;
- rel1 { relative: 0.0 0.0; to: "title_bg"; }
- rel2 { relative: 1.0 0.0; to: "title_bg"; }
- visible: 0;
- }
- description {
- state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_LANDSCAPE_TITLE_TOP_PADDING_INC;
- }
- }
- part { name: "top_padding2";
- type: RECT;
- mouse_events: 0;
- scale: 1;
- description {
- state: "default" 0.0;
- min: NAVIFRAME_TITLE_TOP_PADDING2_INC;
- fixed: 0 1;
- align: 0.0 0.0;
- rel1 { relative: 0.0 0.0; to: "title_bg"; }
- rel2 { relative: 1.0 0.0; to: "title_bg"; }
- visible: 0;
- }
- description {
- state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_LANDSCAPE_TITLE_TOP_PADDING2_INC;
- }
- }
- part { name: "right_padding";
+ part { name: "title_right_padding";
type: RECT;
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
- min: NAVIFRAME_TITLE_RIGHT_PADDING_INC;
+ min: NAVIFRAME_PADDING_INC;
fixed: 1 0;
align: 1.0 0.0;
rel1 { relative: 1.0 0.0; to: "title_bg"; }
@@ -141,7 +109,7 @@
visible: 0;
}
}
- part { name: "padding_center_text1";
+ part { name: "title_left_padding";
type: RECT;
scale: 1;
mouse_events: 0;
@@ -170,7 +138,7 @@
rel1.to_y: "title_bg";
rel2.relative: 1.0 0.0;
rel2.to_x: "base";
- rel2.to_y: "toolbar_bg";
+ rel2.to_y: "toolbar";
}
}
part { name: "content_clip";
@@ -182,66 +150,52 @@
rel2.to_y: "elm.swallow.content";
}
}
- part { name: "padding_center_text2";
+ part { name: "badge_padding";
type: RECT;
mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- min: NAVIFRAME_PADDING2_INC;
+ min: 0 0;
fixed: 1 0;
- align: 1.0 0.5;
- rel1 { relative: 0.0 0.0; to: "title_left_btn"; }
- rel2 { relative: 0.0 1.0; to: "title_left_btn"; }
- visible: 0;
- }
- }
- part { name: "padding_bottom_text";
- type: RECT;
- mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- min: NAVIFRAME_BOTTOM_TEXT_PADDING_INC;
- fixed: 0 1;
- align: 0.0 1.0;
- rel1 { relative: 0.0 1.0; to: "title_bg"; }
- rel2 { relative: 1.0 1.0; to: "title_bg"; }
+ align: 1.0 0.0;
+ rel1 { relative: 0.0 0.0; to: "divider1"; }
+ rel2 { relative: 0.0 1.0; to: "divider1"; }
visible: 0;
}
- description { state: "landscape" 0.0;
+ description { state: "visible" 0.0;
inherit: "default" 0.0;
- min: NAVIFRAME_LANDSCAPE_BOTTOM_TEXT_PADDING_INC;
+ min: NAVIFRAME_BADGE_PADDING_INC;
}
}
- part { name: "badge_padding";
+ part { name: "title_text_bg";
type: RECT;
- mouse_events: 0;
- scale: 1;
+ repeat_events: 1;
description { state: "default" 0.0;
- min: 0 0;
- fixed: 1 0;
- align: 1.0 0.0;
- rel1 { relative: 0.0 0.0; to: "padding_center_text2"; }
- rel2 { relative: 0.0 1.0; to: "padding_center_text2"; }
visible: 0;
+ min: 0 NAVIFRAME_TITLE_TEXT_BG_H_INC;
+ max: -1 NAVIFRAME_TITLE_TEXT_BG_H_INC;
+ fixed: 0 1;
+ rel1 { relative: 1.0 0.0; to_x: "title_left_padding"; to_y: "title_bg"; }
+ rel2 { relative: 0.0 1.0; to_x: "divider1"; to_y: "title_bg"; }
}
- description { state: "visible" 0.0;
+ description { state: "landscape" 0.0;
inherit: "default" 0.0;
- min: NAVIFRAME_BADGE_PADDING_INC;
+ min: 0 NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_H_INC;
+ max: -1 NAVIFRAME_LANDSCAPE_TITLE_TEXT_BG_H_INC;
}
}
- part { name: "title_text_bg";
+ part { name: "maintitle_text_bg";
type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
visible: 0;
- fixed: 1 1;
- rel1 { relative: 1.0 1.0; to_x: "padding_center_text1"; to_y: "top_padding"; }
- rel2 { relative: 0.0 0.0; to_x: "padding_center_text2"; to_y: "padding_bottom_text"; }
+ rel1 { relative: 0.0 0.0; to: "title_text_bg"; }
+ rel2 { relative: 0.0 1.0; to_x: "badge_padding"; to_y: "title_text_bg"; }
}
description { state: "subtitle_is_set" 0.0;
inherit: "default" 0.0;
- rel1 { relative: 1.0 1.0; to_x: "padding_center_text1"; to_y: "top_padding2"; }
- rel2 { relative: 0.0 0.0; to_x: "padding_center_text2"; to_y: "subtitle_text_bg"; }
+ rel1 { relative: 0.0 0.0; to: "title_text_bg"; }
+ rel2 { relative: 0.0 0.0; to_x: "badge_padding"; to_y: "subtitle_text_bg"; }
}
}
part { name: "elm.text.title";
@@ -260,33 +214,15 @@
text_class: "tizen";
}
color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
- color3: 255 255 255 255;
- fixed: 1 1;
+ color3: 0 0 0 255;
align: 0.0 0.5;
- rel1 { to: "title_text_bg"; }
- rel2 { relative: 0.0 1.0; to_x: "badge_padding"; to_y: "title_text_bg"; }
+ rel1.to: "maintitle_text_bg";
+ rel2.to: "maintitle_text_bg";
}
description { state: "subtitle_is_set" 0.0;
- text { font: "Tizen:style=Bold";
- size: NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC;
- min: 0 0;
- max: 1 0;
- align: 0.0 0.5;
- text_class: "tizen";
- }
- color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
- color3: 255 255 255 255;
- fixed: 1 1;
- align: 0.0 0.5;
- rel1 { to: "title_text_bg"; }
- rel2 { relative: 0.0 1.0; to_x: "badge_padding"; to_y: "title_text_bg"; }
- }
- description { state: "default_landscape" 0.0;
inherit: "default" 0.0;
text { font: "Tizen:style=Bold";
- size: NAVIFRAME_LANDSCAPE_TITLE_FONT_SIZE_INC;
- size_range: NAVIFRAME_TITLE_FONT_MIN_SIZE_INC NAVIFRAME_LANDSCAPE_TITLE_FONT_SIZE_INC;
- fit: 1 0;
+ size: NAVIFRAME_TITLE_SMALL_FONT_SIZE_INC;
min: 0 0;
max: 1 0;
align: 0.0 0.5;
@@ -294,7 +230,7 @@
}
}
description { state: "subtitle_is_set_landscape" 0.0;
- inherit: "subtitle_is_set" 0.0;
+ inherit: "default" 0.0;
text { font: "Tizen:style=Bold";
size: NAVIFRAME_LANDSCAPE_TITLE_SMALL_FONT_SIZE_INC;
min: 0 0;
@@ -313,17 +249,19 @@
min: 0 0;
max: 0 0;
fixed: 1 1;
- align: 0.0 1.0;
- rel1 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "padding_bottom_text"; }
- rel2 { relative: 0.0 0.0; to_x: "padding_center_text2"; to_y: "padding_bottom_text"; }
+ align: 0.5 1.0;
+ rel1 { relative: 0.0 1.0; to: "title_text_bg"; }
+ rel2 { relative: 1.0 1.0; to: "title_text_bg"; }
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
+ fixed: 0 1;
min: 0 NAVIFRAME_SUBTITLE_HEIGHT_INC;
max: -1 NAVIFRAME_SUBTITLE_HEIGHT_INC;
}
description { state: "visible_landscape" 0.0;
inherit: "default" 0.0;
+ fixed: 0 1;
min: 0 NAVIFRAME_LANDSCAPE_SUBTITLE_HEIGHT_INC;
max: -1 NAVIFRAME_LANDSCAPE_SUBTITLE_HEIGHT_INC;
}
@@ -341,7 +279,6 @@
text_class: "tizen";
}
color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC;
- fixed: 1 1;
align: 0.0 0.5;
rel1.to: "subtitle_text_bg";
rel2.to: "subtitle_text_bg";
@@ -366,7 +303,7 @@
rel1 { relative: 0.0 0.0; to: "elm.text.title"; }
rel2 { relative: 0.0 1.0; to: "elm.text.title"; }
fixed: 1 0;
- min: NAVIFRAME_PADDING_INC;
+ min: NAVIFRAME_PADDING2_INC;
visible: 0;
}
}
@@ -521,8 +458,8 @@
clip_to: "title_clip";
description { state: "default" 0.0;
fixed: 1 1;
- rel1 { to: "title_text_bg"; }
- rel2 { to: "title_text_bg"; }
+ rel1 { to: "maintitle_text_bg"; }
+ rel2 { to: "maintitle_text_bg"; }
}
}
part { name: "elm.swallow.subtitle";
@@ -546,6 +483,23 @@
color: 0 0 0 0;
}
}
+ part { name: "divider1";
+ type: RECT;
+ description { state: "default" 0.0;
+ min: 0 0;
+ max: 0 -1;
+ fixed: 1 1;
+ color: NAVIFRAME_TITLE_BUTTON_DIVIDER_COLOR_INC;
+ rel1 { relative: 0.0 0.0; to: "title_left_btn"; }
+ rel2 { relative: 0.0 1.0; to: "title_left_btn"; }
+ align: 1.0 0.5;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ min: 2 48;
+ max: 2 48;
+ }
+ }
part { name: "title_left_btn";
type: SWALLOW;
scale: 1;
@@ -554,14 +508,31 @@
max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
fixed: 1 1;
align: 1.0 0.5;
- rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
- rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+ rel1 { relative: 0.0 0.0; to: "divider2"; }
+ rel2 { relative: 0.0 1.0; to: "divider2"; }
}
description { state: "landscape" 0.0;
inherit: "default" 0.0;
max: NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC;
}
}
+ part { name: "divider2";
+ type: RECT;
+ description { state: "default" 0.0;
+ min: 0 0;
+ max: 0 -1;
+ fixed: 1 1;
+ color: NAVIFRAME_TITLE_BUTTON_DIVIDER_COLOR_INC;
+ rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+ rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+ align: 1.0 0.5;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ min: 2 48;
+ max: 2 48;
+ }
+ }
part { name: "elm.swallow.icon";
type: SWALLOW;
scale: 1;
@@ -584,33 +555,17 @@
max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
align: 1.0 0.5;
fixed: 1 1;
- rel1 { relative: 0.0 0.0; to: "right_padding"; }
- rel2 { relative: 0.0 1.0; to: "right_padding"; }
+ rel1 { relative: 1.0 0.0; to: "title_bg"; }
+ rel2 { relative: 1.0 1.0; to: "title_bg"; }
}
description { state: "landscape" 0.0;
inherit: "default" 0.0;
max: NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC;
}
}
- part { name: "title_more_btn";
+ part { name: "toolbar";
type: SWALLOW;
scale: 1;
- clip_to: "title_clip";
- description { state: "default" 0.0;
- max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
- fixed: 1 1;
- align: 1.0 0.5;
- rel1 { relative: 0.0 0.0; to: "title_left_btn"; }
- rel2 { relative: 0.0 1.0; to: "title_left_btn"; }
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- max: NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC;
- }
- }
- part { name: "toolbar_bg";
- type: RECT;
- scale: 1;
description { state: "default" 0.0;
min: 0 0;
max: 999999 0;
@@ -619,7 +574,6 @@
visible: 0;
rel1 { to: "base"; }
rel2 { to: "base"; }
- color: NAVIFRAME_TOOLBAR_BG_COLOR_INC;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -642,8 +596,8 @@
min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC;
fixed: 1 0;
align: 0.0 0.0;
- rel1 { relative: 0.0 0.0; to: "toolbar_bg"; }
- rel2 { relative: 0.0 1.0; to: "toolbar_bg"; }
+ rel1 { relative: 0.0 0.0; to: "toolbar"; }
+ rel2 { relative: 0.0 1.0; to: "toolbar"; }
visible: 0;
}
}
@@ -656,6 +610,7 @@
fixed: 1 1;
rel1.to: "more_btn_bg";
rel2.to: "more_btn_bg";
+ visible: 0;
}
description { state: "landscape" 0.0;
inherit: "default" 0.0;
@@ -670,8 +625,8 @@
min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC;
fixed: 1 0;
align: 1.0 0.0;
- rel1 { relative: 1.0 0.0; to: "toolbar_bg"; }
- rel2.to: "toolbar_bg";
+ rel1 { relative: 1.0 0.0; to: "toolbar"; }
+ rel2.to: "toolbar";
visible: 0;
}
}
@@ -685,84 +640,20 @@
align: 0.5 0.5;
rel1.to: "prev_btn_bg";
rel2.to: "prev_btn_bg";
+ visible: 0;
}
description { state: "landscape" 0.0;
inherit: "default" 0.0;
max: NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC;
}
}
- part { name: "toolbar_btns_area";
- type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1 { relative: 1.0 0.0; to: "more_btn_bg"; }
- rel2 { relative: 0.0 1.0; to: "prev_btn_bg"; }
- visible: 0;
- }
- }
part { name: "toolbar_clip";
type: RECT;
mouse_events: 0;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1 { to_y: "toolbar_bg"; }
- rel2 { to_y: "toolbar_bg"; }
- }
- }
- part { name: "toolbar_button1";
- type: SWALLOW;
- scale: 1;
- clip_to: "toolbar_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "buttons_set" 0.0;
- inherit: "default" 0.0;
- align: 1.0 0.5;
- rel2 {
- relative: 0.0 1.0;
- to: "toolbar_button_padding";
- }
- }
- }
- part { name: "toolbar_button_padding";
- type: RECT;
- scale : 1;
- description { state: "default" 0.0;
- min: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 0;
- max: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 9999;
- fixed : 1 0;
- visible: 0;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 0;
- max: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 9999;
- }
- }
- part { name: "toolbar_button2";
- type: SWALLOW;
- scale: 1;
- clip_to: "toolbar_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "buttons_set" 0.0;
- inherit: "default" 0.0;
- align: 0.0 0.5;
- rel1 {
- relative: 1.0 0.0;
- to: "toolbar_button_padding";
- }
+ rel1 { to: "toolbar"; }
+ rel2 { to: "toolbar"; }
}
}
}
@@ -853,7 +744,7 @@
signal: "elm,state,subtitle,show";
source: "elm";
script {
- set_state(PART:"title_text_bg", "subtitle_is_set", 0.0);
+ set_state(PART:"maintitle_text_bg", "subtitle_is_set", 0.0);
if (get_int(landscape) == 0) {
set_state(PART:"elm.text.title", "subtitle_is_set", 0.0);
set_state(PART:"subtitle_text_bg", "visible", 0.0);
@@ -868,118 +759,65 @@
signal: "elm,state,subtitle,hide";
source: "elm";
script {
- set_state(PART:"title_text_bg", "default", 0.0);
+ set_state(PART:"maintitle_text_bg", "default", 0.0);
set_state(PART:"subtitle_text_bg", "default", 0.0);
- if (get_int(landscape) == 0)
- set_state(PART:"elm.text.title", "default", 0.0);
- else
- set_state(PART:"elm.text.title", "default_landscape", 0.0);
+ set_state(PART:"elm.text.title", "default", 0.0);
}
}
program { name: "icon_show";
signal: "elm,state,icon,show";
source: "elm";
action: STATE_SET "icon" 0.0;
- target: "padding_center_text1";
+ target: "title_left_padding";
}
program { name: "icon_hide";
signal: "elm,state,icon,hide";
source: "elm";
action: STATE_SET "default" 0.0;
- target: "padding_center_text1";
- }
- program { name: "prev_btn_show";
- signal: "elm,state,prev_btn,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- }
+ target: "title_left_padding";
}
- program { name: "prev_btn_hide";
- signal: "elm,state,prev_btn,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- }
- }
- program { name: "more_btn_show";
- signal: "elm,state,toolbar_more_btn,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- }
- }
- program { name: "more_btn_hide";
- signal: "elm,state,toolbar_more_btn,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- }
- }
- program { name: "toolbar_button1_show";
- signal: "elm,state,toolbar_button1,show";
+ program { name: "title_left_btn_show";
+ signal: "elm,state,title_left_btn,show";
source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) + 1);
- if (get_int(toolbar_buttons_visible) >= 2)
- {
- set_state(PART:"toolbar_button1", "buttons_set", 0.0);
- set_state(PART:"toolbar_button2", "buttons_set", 0.0);
- }
- }
+ action: STATE_SET "visible" 0.0;
+ target: "divider1";
}
- program { name: "toolbar_button1_hide";
- signal: "elm,state,toolbar_button1,hide";
+ program { name: "title_left_btn_hide";
+ signal: "elm,state,title_left_btn,hide";
source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) - 1);
- set_state(PART:"toolbar_button1", "default", 0.0);
- set_state(PART:"toolbar_button2", "default", 0.0);
- }
+ action: STATE_SET "default" 0.0;
+ target: "divider1";
}
- program { name: "toolbar_button2_show";
- signal: "elm,state,toolbar_button2,show";
+ program { name: "title_right_btn_show";
+ signal: "elm,state,title_right_btn,show";
source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) + 1);
- if (get_int(toolbar_buttons_visible) >= 2)
- {
- set_state(PART:"toolbar_button1", "buttons_set", 0.0);
- set_state(PART:"toolbar_button2", "buttons_set", 0.0);
- }
- }
+ action: STATE_SET "visible" 0.0;
+ target: "divider2";
}
- program { name: "toolbar_button2_hide";
- signal: "elm,state,toolbar_button2,hide";
+ program { name: "title_right_btn_hide";
+ signal: "elm,state,title_right_btn,hide";
source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) - 1);
- set_state(PART:"toolbar_button1", "default", 0.0);
- set_state(PART:"toolbar_button2", "default", 0.0);
- }
+ action: STATE_SET "default" 0.0;
+ target: "divider2";
}
- program { name: "toolbar_bg_show";
- signal: "elm,state,toolbar_bg,show";
+ program { name: "toolbar_show";
+ signal: "elm,state,toolbar,show";
source: "elm";
script {
if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
set_int(tbar_bg, get_int(tbar_bg) + 1);
}
}
- program { name: "toolbar_bg_hide";
- signal: "elm,state,toolbar_bg,hide";
+ program { name: "toolbar_hide";
+ signal: "elm,state,toolbar,hide";
source: "elm";
script {
set_int(tbar_bg, get_int(tbar_bg) - 1);
if (get_int(tbar_bg) <= 0)
- set_state(PART:"toolbar_bg", "default", 0.0);
+ set_state(PART:"toolbar", "default", 0.0);
}
}
program { name: "toolbar_open_internal";
@@ -988,9 +826,9 @@
script {
set_int(tbar_close, 0);
if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
}
}
program { name: "toolbar_close_internal";
@@ -998,7 +836,7 @@
source: "elm";
script {
set_int(tbar_close, 1);
- set_state(PART:"toolbar_bg", "default", 0.0);
+ set_state(PART:"toolbar", "default", 0.0);
}
}
program { name: "toolbar_open";
@@ -1006,9 +844,9 @@
source: "";
script {
if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
}
transition: LINEAR 0.2;
after: "toolbar_open_internal";
@@ -1017,7 +855,7 @@
signal: "elm,state,toolbar,close";
source: "";
action: STATE_SET "default" 0.0;
- target: "toolbar_bg";
+ target: "toolbar";
transition: LINEAR 0.2;
after: "toolbar_close_internal";
}
@@ -1106,7 +944,7 @@
signal: "elm,state,elm.swallow.subtitle,show";
source: "elm";
script {
- set_state(PART:"title_text_bg", "subtitle_is_set", 0.0);
+ set_state(PART:"maintitle_text_bg", "subtitle_is_set", 0.0);
if (get_int(landscape) == 0)
set_state(PART:"subtitle_text_bg", "visible", 0.0);
else
@@ -1118,7 +956,7 @@
signal: "elm,state,elm.swallow.subtitle,hide";
source: "elm";
script {
- set_state(PART:"title_text_bg", "default", 0.0);
+ set_state(PART:"maintitle_text_bg", "default", 0.0);
set_state(PART:"subtitle_text_bg", "default", 0.0);
}
}
@@ -1128,16 +966,13 @@
source: "elm";
script {
if (get_int(landscape) == 0) {
- set_state(PART:"top_padding", "landscape", 0.0);
- set_state(PART:"top_padding2", "landscape", 0.0);
- set_state(PART:"padding_bottom_text", "landscape", 0.0);
+ set_state(PART:"title_text_bg", "landscape", 0.0);
set_state(PART:"elm.text.subtitle", "landscape", 0.0);
set_state(PART:"title_left_btn", "landscape", 0.0);
set_state(PART:"title_right_btn", "landscape", 0.0);
set_state(PART:"title_more_btn", "landscape", 0.0);
set_state(PART:"toolbar_more_btn", "landscape", 0.0);
set_state(PART:"elm.swallow.prev_btn", "landscape", 0.0);
- set_state(PART:"toolbar_button_padding", "landscape", 0.0);
new st[31];
new Float:vl;
@@ -1146,18 +981,16 @@
set_state(PART:"title_bg", "landscape", 0.0);
get_state(PART:"elm.text.title", st, 30, vl);
- if (!strcmp(st, "default"))
- set_state(PART:"elm.text.title", "default_landscape", 0.0);
- else
+ if (!strcmp(st, "subtitle_is_set"))
set_state(PART:"elm.text.title", "subtitle_is_set_landscape", 0.0);
get_state(PART:"subtitle_text_bg", st, 30, vl);
if (!strcmp(st, "visible"))
set_state(PART:"subtitle_text_bg", "visible_landscape", 0.0);
- get_state(PART:"toolbar_bg", st, 30, vl);
+ get_state(PART:"toolbar", st, 30, vl);
if (!strcmp(st, "visible"))
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
set_int(landscape, 1);
}
@@ -1169,16 +1002,13 @@
source: "elm";
script {
if (get_int(landscape) == 1) {
- set_state(PART:"top_padding", "default", 0.0);
- set_state(PART:"top_padding2", "default", 0.0);
- set_state(PART:"padding_bottom_text", "default", 0.0);
+ set_state(PART:"title_text_bg", "default", 0.0);
set_state(PART:"elm.text.subtitle", "default", 0.0);
set_state(PART:"title_left_btn", "default", 0.0);
set_state(PART:"title_right_btn", "default", 0.0);
set_state(PART:"title_more_btn", "default", 0.0);
set_state(PART:"toolbar_more_btn", "default", 0.0);
set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
- set_state(PART:"toolbar_button_padding", "default", 0.0);
new st[31];
new Float:vl;
@@ -1187,18 +1017,16 @@
set_state(PART:"title_bg", "default", 0.0);
get_state(PART:"elm.text.title", st, 30, vl);
- if (!strcmp(st, "default_landscape"))
- set_state(PART:"elm.text.title", "default", 0.0);
- else
+ if (!strcmp(st, "subtitle_is_set_landscape"))
set_state(PART:"elm.text.title", "subtitle_is_set", 0.0);
get_state(PART:"subtitle_text_bg", st, 30, vl);
if (!strcmp(st, "visible_landscape"))
set_state(PART:"subtitle_text_bg", "visible", 0.0);
- get_state(PART:"toolbar_bg", st, 30, vl);
+ get_state(PART:"toolbar", st, 30, vl);
if (!strcmp(st, "visible_landscape"))
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
set_int(landscape, 0);
}
@@ -1228,9 +1056,11 @@
}
group { name: "elm/naviframe/item/tabbar/default";
+ images {
+ image: "00_title_bg.png" COMP;
+ }
script {
public tbar_bg = 0; //Controlbar BG Show call count
- public toolbar_buttons_visible = 0; //when both toolbar buttons are visible
public tbar_close = 0; //Toolbar lastest Open/Close status
public landscape = 0; //Landscape mode status
}
@@ -1262,19 +1092,25 @@
}
}
part { name: "title_bg";
- type: RECT;
+ type: IMAGE;
scale: 1;
description { state: "default" 0.0;
min: 1 NAVIFRAME_TAB_TITLE_H_INC;
+ max: -1 NAVIFRAME_TAB_TITLE_H_INC;
align: 0.0 0.0;
fixed: 0 1;
rel1 { relative: 0.0 0.0; to: "base"; }
rel2 { relative: 1.0 0.0; to: "base"; }
- color: NAVIFRAME_TITLE_BG_COLOR_INC;
+ image {
+ normal: "00_title_bg.png";
+ border: NAVIFRAME_TITLE_BG_IMAGE_BORDER_INC;
+ border_scale: 1;
+ }
}
description { state: "landscape" 0.0;
inherit: "default" 0.0;
min: 1 NAVIFRAME_LANDSCAPE_TAB_TITLE_H_INC;
+ max: -1 NAVIFRAME_LANDSCAPE_TAB_TITLE_H_INC;
}
description { state: "hide" 0.0;
inherit: "default" 0.0;
@@ -1304,7 +1140,7 @@
rel1.to_y: "title_bg";
rel2.relative: 1.0 0.0;
rel2.to_x: "base";
- rel2.to_y: "toolbar_bg";
+ rel2.to_y: "toolbar";
}
}
part { name: "content_clip";
@@ -1316,24 +1152,7 @@
rel2.to_y: "elm.swallow.content";
}
}
- part { name: "top_padding";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- align: 0.0 0.0;
- rel1 { relative: 0.0 0.0; to: "title_bg"; }
- rel2 { relative: 1.0 0.0; to: "title_bg"; }
- fixed: 0 1;
- min: NAVIFRAME_TAB_TITLE_TOP_PADDING_INC;
- visible: 0;
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_LANDSCAPE_TAB_TITLE_TOP_PADDING_INC;
- }
- }
- part { name: "left_padding";
+ part { name: "title_left_padding";
type: RECT;
scale: 1;
mouse_events: 0;
@@ -1346,7 +1165,7 @@
visible: 0;
}
}
- part { name: "right_padding";
+ part { name: "title_right_padding";
type: RECT;
scale: 1;
mouse_events: 0;
@@ -1358,10 +1177,6 @@
min: NAVIFRAME_PADDING_INC;
visible: 0;
}
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_LANDSCAPE_PADDING_INC;
- }
}
part { name: "elm.text.title";
type: TEXT;
@@ -1374,20 +1189,17 @@
size: NAVIFRAME_TITLE_TAB_FONT_SIZE_INC;
min: 0 0;
max: 1 0;
- align: 0.5 0.5;
+ align: 0.0 0.5;
text_class: "tizen";
}
min: 0 NAVIFRAME_TITLE_TAB_TEXT_H_INC;
max: 999999 NAVIFRAME_TITLE_TAB_TEXT_H_INC;
- fixed: 1 1;
+ fixed: 0 1;
color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
- color3: 255 255 255 255;
- align: 0 0;
- rel1.to_x: "left_padding";
- rel1.to_y: "top_padding";
- rel1.relative: 1.0 1.0;
- rel2.to: "right_padding";
- rel2.relative: 0.0 1.0;
+ color3: 0 0 0 255;
+ align: 0.0 0.0;
+ rel1 { relative: 1.0 0.0; to: "title_left_padding"; }
+ rel2 { relative: 0.0 1.0; to: "title_right_padding"; }
}
description { state: "landscape" 0.0;
inherit: "default" 0.0;
@@ -1395,7 +1207,7 @@
size: NAVIFRAME_LANDSCAPE_TITLE_TAB_FONT_SIZE_INC;
min: 0 0;
max: 1 0;
- align: 0.5 0.5;
+ align: 0.0 0.5;
text_class: "tizen";
}
min: 0 NAVIFRAME_LANDSCAPE_TITLE_TAB_TEXT_H_INC;
@@ -1421,59 +1233,20 @@
color: 0 0 0 0;
}
}
- part { name: "middle_padding";
- type: RECT;
- mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- min: NAVIFRAME_MIDDLE_PADDING_INC;
- fixed: 0 1;
- align: 0.0 0.0;
- rel1 { relative: 0.0 1.0; to_x: "title_bg"; to_y: "elm.text.title"; }
- rel2 { relative: 1.0 1.0; to_x: "title_bg"; to_y: "elm.text.title"; }
- visible: 0;
- }
- description { state: "hide" 0.0;
- inherit: "default" 0.0;
- min: 0 0;
- }
- }
part { name: "tabbar";
type: SWALLOW;
scale: 1;
clip_to: "title_clip";
description { state: "default" 0.0;
- min: 0 NAVIFRAME_TITLE_TAB_H_INC;
- max: 999999 NAVIFRAME_TITLE_TAB_H_INC;
- fixed: 1 1;
- align: 0.5 0.0;
- rel1.to_x: "title_bg";
- rel1.to_y: "middle_padding";
- rel1.relative: 0.0 1.0;
- rel2.to_x: "title_bg";
- rel2.to_y: "bottom_padding";
- rel2.relative: 1.0 0.0;
- }
- }
- part { name: "bottom_padding";
- type: RECT;
- mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- min: NAVIFRAME_BOTTOM_PADDING_INC;
+ max: -1 NAVIFRAME_TITLE_TAB_H_INC;
fixed: 0 1;
- align: 0.0 1.0;
+ align: 0.5 1.0;
rel1 { relative: 0.0 1.0; to: "title_bg"; }
rel2 { relative: 1.0 1.0; to: "title_bg"; }
- visible: 0;
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_LANDSCAPE_BOTTOM_PADDING_INC;
}
}
- part { name: "toolbar_bg";
- type: RECT;
+ part { name: "toolbar";
+ type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
min: 0 0;
@@ -1483,7 +1256,6 @@
visible: 0;
rel1 { to: "base"; }
rel2 { to: "base"; }
- color: NAVIFRAME_TOOLBAR_BG_COLOR_INC;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -1506,8 +1278,8 @@
min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC;
fixed: 1 0;
align: 0.0 0.0;
- rel1 { relative: 0.0 0.0; to: "toolbar_bg"; }
- rel2 { relative: 0.0 1.0; to: "toolbar_bg"; }
+ rel1 { relative: 0.0 0.0; to: "toolbar"; }
+ rel2 { relative: 0.0 1.0; to: "toolbar"; }
visible: 0;
}
}
@@ -1520,6 +1292,7 @@
fixed: 1 1;
rel1.to: "more_btn_bg";
rel2.to: "more_btn_bg";
+ visible: 0;
}
description { state: "landscape" 0.0;
inherit: "default" 0.0;
@@ -1534,8 +1307,8 @@
min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC;
fixed: 1 0;
align: 1.0 0.0;
- rel1 { relative: 1.0 0.0; to: "toolbar_bg"; }
- rel2.to: "toolbar_bg";
+ rel1 { relative: 1.0 0.0; to: "toolbar"; }
+ rel2.to: "toolbar";
visible: 0;
}
}
@@ -1549,85 +1322,20 @@
align: 0.5 0.5;
rel1.to: "prev_btn_bg";
rel2.to: "prev_btn_bg";
+ visible: 0;
}
description { state: "landscape" 0.0;
inherit: "default" 0.0;
max: NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC;
}
}
- part { name: "toolbar_btns_area";
- type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1 { relative: 1.0 0.0; to: "more_btn_bg"; }
- rel2 { relative: 0.0 1.0; to: "prev_btn_bg"; }
- visible: 0;
- }
- }
part { name: "toolbar_clip";
type: RECT;
mouse_events: 0;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1 { to_y: "toolbar_bg"; }
- rel2 { to_y: "toolbar_bg"; }
- }
- }
- part { name: "toolbar_button1";
- type: SWALLOW;
- scale: 1;
- clip_to: "toolbar_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "buttons_set" 0.0;
- inherit: "default" 0.0;
- align: 1.0 0.5;
- rel2 {
- relative: 0.0 1.0;
- to: "toolbar_button_padding";
- }
- }
- }
- part { name: "toolbar_button_padding";
- type: RECT;
- scale : 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- min: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 0;
- max: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 9999;
- fixed : 1 0;
- visible: 0;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 0;
- max: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 9999;
- }
- }
- part { name: "toolbar_button2";
- type: SWALLOW;
- scale: 1;
- clip_to: "toolbar_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "buttons_set" 0.0;
- inherit: "default" 0.0;
- align: 0.0 0.5;
- rel1 {
- relative: 1.0 0.0;
- to: "toolbar_button_padding";
- }
+ rel1 { to: "toolbar"; }
+ rel2 { to: "toolbar"; }
}
}
}
@@ -1713,98 +1421,24 @@
set_state(PART:"title_bg", "hide", 0.0);
}
}
- program { name: "prev_btn_show";
- signal: "elm,state,prev_btn,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- }
- }
- program { name: "prev_btn_hide";
- signal: "elm,state,prev_btn,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- }
- }
- program { name: "more_btn_show";
- signal: "elm,state,toolbar_more_btn,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- }
- }
- program { name: "more_btn_hide";
- signal: "elm,state,toolbar_more_btn,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- }
- }
- program { name: "toolbar_button1_show";
- signal: "elm,state,toolbar_button1,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) + 1);
- if (get_int(toolbar_buttons_visible) >= 2)
- {
- set_state(PART:"toolbar_button1", "buttons_set", 0.0);
- set_state(PART:"toolbar_button2", "buttons_set", 0.0);
- }
- }
- }
- program { name: "toolbar_button1_hide";
- signal: "elm,state,toolbar_button1,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) - 1);
- set_state(PART:"toolbar_button1", "default", 0.0);
- set_state(PART:"toolbar_button2", "default", 0.0);
- }
- }
- program { name: "toolbar_button2_show";
- signal: "elm,state,toolbar_button2,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) + 1);
- if (get_int(toolbar_buttons_visible) >= 2)
- {
- set_state(PART:"toolbar_button1", "buttons_set", 0.0);
- set_state(PART:"toolbar_button2", "buttons_set", 0.0);
- }
- }
- }
- program { name: "toolbar_button2_hide";
- signal: "elm,state,toolbar_button2,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) - 1);
- set_state(PART:"toolbar_button1", "default", 0.0);
- set_state(PART:"toolbar_button2", "default", 0.0);
- }
- }
- program { name: "toolbar_bg_show";
- signal: "elm,state,toolbar_bg,show";
+ program { name: "toolbar_show";
+ signal: "elm,state,toolbar,show";
source: "elm";
script {
if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
set_int(tbar_bg, get_int(tbar_bg) + 1);
}
}
- program { name: "toolbar_bg_hide";
- signal: "elm,state,toolbar_bg,hide";
+ program { name: "toolbar_hide";
+ signal: "elm,state,toolbar,hide";
source: "elm";
script {
set_int(tbar_bg, get_int(tbar_bg) - 1);
if (get_int(tbar_bg) <= 0)
- set_state(PART:"toolbar_bg", "default", 0.0);
+ set_state(PART:"toolbar", "default", 0.0);
}
}
program { name: "toolbar_open_internal";
@@ -1813,9 +1447,9 @@
script {
set_int(tbar_close, 0);
if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
}
}
program { name: "toolbar_close_internal";
@@ -1823,7 +1457,7 @@
source: "elm";
script {
set_int(tbar_close, 1);
- set_state(PART:"toolbar_bg", "default", 0.0);
+ set_state(PART:"toolbar", "default", 0.0);
}
}
program { name: "toolbar_open";
@@ -1831,9 +1465,9 @@
source: "";
script {
if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
}
transition: LINEAR 0.2;
after: "toolbar_open_internal";
@@ -1842,7 +1476,7 @@
signal: "elm,state,toolbar,close";
source: "";
action: STATE_SET "default" 0.0;
- target: "toolbar_bg";
+ target: "toolbar";
transition: LINEAR 0.2;
after: "toolbar_close_internal";
}
@@ -1881,14 +1515,9 @@
source: "elm";
script {
if (get_int(landscape) == 0) {
- set_state(PART:"top_padding", "landscape", 0.0);
- set_state(PART:"right_padding", "landscape", 0.0);
set_state(PART:"elm.text.title", "landscape", 0.0);
- set_state(PART:"middle_padding", "hide", 0.0);
- set_state(PART:"bottom_padding", "landscape", 0.0);
set_state(PART:"toolbar_more_btn", "landscape", 0.0);
set_state(PART:"elm.swallow.prev_btn", "landscape", 0.0);
- set_state(PART:"toolbar_button_padding", "landscape", 0.0);
new st[31];
new Float:vl;
@@ -1896,9 +1525,9 @@
if (!strcmp(st, "default"))
set_state(PART:"title_bg", "landscape", 0.0);
- get_state(PART:"toolbar_bg", st, 30, vl);
+ get_state(PART:"toolbar", st, 30, vl);
if (!strcmp(st, "visible"))
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
set_int(landscape, 1);
}
@@ -1910,14 +1539,9 @@
source: "elm";
script {
if (get_int(landscape) == 1) {
- set_state(PART:"top_padding", "default", 0.0);
- set_state(PART:"right_padding", "default", 0.0);
set_state(PART:"elm.text.title", "default", 0.0);
- set_state(PART:"middle_padding", "default", 0.0);
- set_state(PART:"bottom_padding", "default", 0.0);
set_state(PART:"toolbar_more_btn", "default", 0.0);
set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
- set_state(PART:"toolbar_button_padding", "default", 0.0);
new st[31];
new Float:vl;
@@ -1925,9 +1549,9 @@
if (!strcmp(st, "landscape"))
set_state(PART:"title_bg", "default", 0.0);
- get_state(PART:"toolbar_bg", st, 30, vl);
+ get_state(PART:"toolbar", st, 30, vl);
if (!strcmp(st, "visible_landscape"))
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
set_int(landscape, 0);
}
@@ -1959,7 +1583,6 @@
group { name: "elm/naviframe/item/tabbar/notitle/default";
script {
public tbar_bg = 0; //Toolbar BG Show call count
- public toolbar_buttons_visible = 0; //when both toolbar buttons are visible
public tbar_close = 0; //Toolbar lastest Open/Close status
public landscape = 0; //Landscape mode status
}
@@ -1994,16 +1617,12 @@
type: RECT;
scale: 1;
description { state: "default" 0.0;
- min: 1 NAVIFRAME_TITLE_H_INC;
+ min: 1 NAVIFRAME_TAB_TITLE_H2_INC;
+ max: -1 NAVIFRAME_TAB_TITLE_H2_INC;
align: 0.0 0.0;
fixed: 0 1;
rel1 { relative: 0.0 0.0; to: "base"; }
rel2 { relative: 1.0 0.0; to: "base"; }
- color: NAVIFRAME_TITLE_BG_COLOR_INC;
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: 1 NAVIFRAME_LANDSCAPE_TITLE_H_INC;
}
description { state: "hide" 0.0;
inherit: "default" 0.0;
@@ -2026,18 +1645,9 @@
scale: 1;
clip_to: "title_clip";
description { state: "default" 0.0;
- max: -1 NAVIFRAME_TITLE_H_INC;
- rel1.to: "title_bg";
- rel1.relative: 0.0 0.0;
- rel2.to: "title_bg";
- rel2.relative: 1.0 1.0;
- }
- description { state: "landscape" 0.0;
- max: -1 NAVIFRAME_LANDSCAPE_TITLE_H_INC;
- rel1.to: "title_bg";
- rel1.relative: 0.0 0.0;
- rel2.to: "title_bg";
- rel2.relative: 1.0 1.0;
+ max: -1 NAVIFRAME_TAB_TITLE_H2_INC;
+ rel1 { relative: 0.0 0.0; to: "title_bg"; }
+ rel2 { relative: 1.0 1.0; to: "title_bg"; }
}
}
part { name: "elm.swallow.content";
@@ -2052,7 +1662,7 @@
rel1.to_y: "title_bg";
rel2.relative: 1.0 0.0;
rel2.to_x: "base";
- rel2.to_y: "toolbar_bg";
+ rel2.to_y: "toolbar";
}
}
part { name: "content_clip";
@@ -2064,8 +1674,8 @@
rel2.to_y: "elm.swallow.content";
}
}
- part { name: "toolbar_bg";
- type: RECT;
+ part { name: "toolbar";
+ type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
min: 0 0;
@@ -2075,7 +1685,6 @@
visible: 0;
rel1 { to: "base"; }
rel2 { to: "base"; }
- color: NAVIFRAME_TOOLBAR_BG_COLOR_INC;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -2098,8 +1707,8 @@
min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC;
fixed: 1 0;
align: 0.0 0.0;
- rel1 { relative: 0.0 0.0; to: "toolbar_bg"; }
- rel2 { relative: 0.0 1.0; to: "toolbar_bg"; }
+ rel1 { relative: 0.0 0.0; to: "toolbar"; }
+ rel2 { relative: 0.0 1.0; to: "toolbar"; }
visible: 0;
}
}
@@ -2112,6 +1721,7 @@
fixed: 1 1;
rel1.to: "more_btn_bg";
rel2.to: "more_btn_bg";
+ visible: 0;
}
description { state: "landscape" 0.0;
inherit: "default" 0.0;
@@ -2126,8 +1736,8 @@
min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC;
fixed: 1 0;
align: 1.0 0.0;
- rel1 { relative: 1.0 0.0; to: "toolbar_bg"; }
- rel2.to: "toolbar_bg";
+ rel1 { relative: 1.0 0.0; to: "toolbar"; }
+ rel2.to: "toolbar";
visible: 0;
}
}
@@ -2141,6 +1751,7 @@
align: 0.5 0.5;
rel1.to: "prev_btn_bg";
rel2.to: "prev_btn_bg";
+ visible: 0;
}
description { state: "landscape" 0.0;
inherit: "default" 0.0;
@@ -2152,73 +1763,8 @@
mouse_events: 0;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1 { to_y: "toolbar_bg"; }
- rel2 { to_y: "toolbar_bg"; }
- }
- }
- part { name: "toolbar_btns_area";
- type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1 { relative: 1.0 0.0; to: "more_btn_bg"; }
- rel2 { relative: 0.0 1.0; to: "prev_btn_bg"; }
- visible: 0;
- }
- }
- part { name: "toolbar_button1";
- type: SWALLOW;
- scale: 1;
- clip_to: "toolbar_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "buttons_set" 0.0;
- inherit: "default" 0.0;
- align: 1.0 0.5;
- rel2 {
- relative: 0.0 1.0;
- to: "toolbar_button_padding";
- }
- }
- }
- part { name: "toolbar_button_padding";
- type: RECT;
- scale : 1;
- description { state: "default" 0.0;
- min: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 0;
- max: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 9999;
- fixed : 1 0;
- visible: 0;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 0;
- max: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 9999;
- }
- }
- part { name: "toolbar_button2";
- type: SWALLOW;
- scale: 1;
- clip_to: "toolbar_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "buttons_set" 0.0;
- inherit: "default" 0.0;
- align: 0.0 0.5;
- rel1 {
- relative: 1.0 0.0;
- to: "toolbar_button_padding";
- }
+ rel1 { to: "toolbar"; }
+ rel2 { to: "toolbar"; }
}
}
}
@@ -2291,10 +1837,7 @@
signal: "elm,state,title,show";
source: "elm";
script {
- if (get_int(landscape) == 0)
- set_state(PART:"title_bg", "default", 0.0);
- else
- set_state(PART:"title_bg", "landscape", 0.0);
+ set_state(PART:"title_bg", "default", 0.0);
}
}
program { name: "title_hide";
@@ -2304,98 +1847,24 @@
set_state(PART:"title_bg", "hide", 0.0);
}
}
- program { name: "prev_btn_show";
- signal: "elm,state,prev_btn,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- }
- }
- program { name: "prev_btn_hide";
- signal: "elm,state,prev_btn,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- }
- }
- program { name: "more_btn_show";
- signal: "elm,state,toolbar_more_btn,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- }
- }
- program { name: "more_btn_hide";
- signal: "elm,state,toolbar_more_btn,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- }
- }
- program { name: "toolbar_button1_show";
- signal: "elm,state,toolbar_button1,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) + 1);
- if (get_int(toolbar_buttons_visible) >= 2)
- {
- set_state(PART:"toolbar_button1", "buttons_set", 0.0);
- set_state(PART:"toolbar_button2", "buttons_set", 0.0);
- }
- }
- }
- program { name: "toolbar_button1_hide";
- signal: "elm,state,toolbar_button1,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) - 1);
- set_state(PART:"toolbar_button1", "default", 0.0);
- set_state(PART:"toolbar_button2", "default", 0.0);
- }
- }
- program { name: "toolbar_button2_show";
- signal: "elm,state,toolbar_button2,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) + 1);
- if (get_int(toolbar_buttons_visible) >= 2)
- {
- set_state(PART:"toolbar_button1", "buttons_set", 0.0);
- set_state(PART:"toolbar_button2", "buttons_set", 0.0);
- }
- }
- }
- program { name: "toolbar_button2_hide";
- signal: "elm,state,toolbar_button2,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) - 1);
- set_state(PART:"toolbar_button1", "default", 0.0);
- set_state(PART:"toolbar_button2", "default", 0.0);
- }
- }
- program { name: "toolbar_bg_show";
- signal: "elm,state,toolbar_bg,show";
+ program { name: "toolbar_show";
+ signal: "elm,state,toolbar,show";
source: "elm";
script {
if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
set_int(tbar_bg, get_int(tbar_bg) + 1);
}
}
- program { name: "toolbar_bg_hide";
- signal: "elm,state,toolbar_bg,hide";
+ program { name: "toolbar_hide";
+ signal: "elm,state,toolbar,hide";
source: "elm";
script {
set_int(tbar_bg, get_int(tbar_bg) - 1);
if (get_int(tbar_bg) <= 0)
- set_state(PART:"toolbar_bg", "default", 0.0);
+ set_state(PART:"toolbar", "default", 0.0);
}
}
program { name: "toolbar_open_internal";
@@ -2404,9 +1873,9 @@
script {
set_int(tbar_close, 0);
if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
}
}
program { name: "toolbar_close_internal";
@@ -2414,7 +1883,7 @@
source: "elm";
script {
set_int(tbar_close, 1);
- set_state(PART:"toolbar_bg", "default", 0.0);
+ set_state(PART:"toolbar", "default", 0.0);
}
}
program { name: "toolbar_open";
@@ -2422,9 +1891,9 @@
source: "";
script {
if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
}
transition: LINEAR 0.2;
after: "toolbar_open_internal";
@@ -2433,7 +1902,7 @@
signal: "elm,state,toolbar,close";
source: "";
action: STATE_SET "default" 0.0;
- target: "toolbar_bg";
+ target: "toolbar";
transition: LINEAR 0.2;
after: "toolbar_close_internal";
}
@@ -2468,21 +1937,12 @@
if (get_int(landscape) == 0) {
set_state(PART:"toolbar_more_btn", "landscape", 0.0);
set_state(PART:"elm.swallow.prev_btn", "landscape", 0.0);
- set_state(PART:"toolbar_button_padding", "landscape", 0.0);
new st[31];
new Float:vl;
- get_state(PART:"title_bg", st, 30, vl);
- if (!strcmp(st, "default"))
- set_state(PART:"title_bg", "landscape", 0.0);
-
- get_state(PART:"tabbar", st, 30, vl);
- if (!strcmp(st, "default"))
- set_state(PART:"tabbar", "landscape", 0.0);
-
- get_state(PART:"toolbar_bg", st, 30, vl);
+ get_state(PART:"toolbar", st, 30, vl);
if (!strcmp(st, "visible"))
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
set_int(landscape, 1);
}
@@ -2496,21 +1956,12 @@
if (get_int(landscape) == 1) {
set_state(PART:"toolbar_more_btn", "default", 0.0);
set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
- set_state(PART:"toolbar_button_padding", "default", 0.0);
new st[31];
new Float:vl;
- get_state(PART:"toolbar_bg", st, 30, vl);
+ get_state(PART:"toolbar", st, 30, vl);
if (!strcmp(st, "visible_landscape"))
- set_state(PART:"toolbar_bg", "visible", 0.0);
-
- get_state(PART:"title_bg", st, 30, vl);
- if (!strcmp(st, "landscape"))
- set_state(PART:"title_bg", "default", 0.0);
-
- get_state(PART:"tabbar", st, 30, vl);
- if (!strcmp(st, "landscape"))
- set_state(PART:"tabbar", "default", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
set_int(landscape, 0);
}
@@ -2542,7 +1993,6 @@
group { name: "elm/naviframe/item/empty/default";
script {
public tbar_bg = 0; //Toolbar BG Show call count
- public toolbar_buttons_visible = 0; //when both toolbar buttons are visible
public tbar_close = 0; //Toolbar lastest Open/Close status
public landscape = 0; //Landscape mode status
}
@@ -2579,7 +2029,6 @@
description { state: "default" 0.0;
rel1 { to: "title"; }
rel2 { to: "title"; }
- color: NAVIFRAME_TITLE_BG_COLOR_INC;
}
description { state: "hide" 0.0;
inherit: "default" 0.0;
@@ -2600,7 +2049,7 @@
rel1.to_y: "title_bg";
rel2.relative: 1.0 0.0;
rel2.to_x: "base";
- rel2.to_y: "toolbar_bg";
+ rel2.to_y: "toolbar";
}
}
part { name: "content_clip";
@@ -2630,8 +2079,8 @@
fixed: 1 1;
}
}
- part { name: "toolbar_bg";
- type: RECT;
+ part { name: "toolbar";
+ type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
min: 0 0;
@@ -2641,7 +2090,6 @@
visible: 0;
rel1 { to: "base"; }
rel2 { to: "base"; }
- color: NAVIFRAME_TOOLBAR_BG_COLOR_INC;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -2664,8 +2112,8 @@
min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC;
fixed: 1 0;
align: 0.0 0.0;
- rel1 { relative: 0.0 0.0; to: "toolbar_bg"; }
- rel2 { relative: 0.0 1.0; to: "toolbar_bg"; }
+ rel1 { relative: 0.0 0.0; to: "toolbar"; }
+ rel2 { relative: 0.0 1.0; to: "toolbar"; }
visible: 0;
}
}
@@ -2678,6 +2126,7 @@
fixed: 1 1;
rel1.to: "more_btn_bg";
rel2.to: "more_btn_bg";
+ visible: 0;
}
description { state: "landscape" 0.0;
inherit: "default" 0.0;
@@ -2692,8 +2141,8 @@
min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC;
fixed: 1 0;
align: 1.0 0.0;
- rel1 { relative: 1.0 0.0; to: "toolbar_bg"; }
- rel2.to: "toolbar_bg";
+ rel1 { relative: 1.0 0.0; to: "toolbar"; }
+ rel2.to: "toolbar";
visible: 0;
}
}
@@ -2707,6 +2156,7 @@
align: 0.5 0.5;
rel1.to: "prev_btn_bg";
rel2.to: "prev_btn_bg";
+ visible: 0;
}
description { state: "landscape" 0.0;
inherit: "default" 0.0;
@@ -2718,73 +2168,8 @@
mouse_events: 0;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1 { to: "toolbar_bg"; }
- rel2 { to: "toolbar_bg"; }
- }
- }
- part { name: "toolbar_btns_area";
- type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1 { relative: 1.0 0.0; to: "more_btn_bg"; }
- rel2 { relative: 0.0 1.0; to: "prev_btn_bg"; }
- visible: 0;
- }
- }
- part { name: "toolbar_button1";
- type: SWALLOW;
- scale: 1;
- clip_to: "toolbar_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "buttons_set" 0.0;
- inherit: "default" 0.0;
- align: 1.0 0.5;
- rel2 {
- relative: 0.0 1.0;
- to: "toolbar_button_padding";
- }
- }
- }
- part { name: "toolbar_button_padding";
- type: RECT;
- scale : 1;
- description { state: "default" 0.0;
- min: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 0;
- max: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 9999;
- fixed : 1 0;
- visible: 0;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 0;
- max: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 9999;
- }
- }
- part { name: "toolbar_button2";
- type: SWALLOW;
- scale: 1;
- clip_to: "toolbar_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "buttons_set" 0.0;
- inherit: "default" 0.0;
- align: 0.0 0.5;
- rel1 {
- relative: 1.0 0.0;
- to: "toolbar_button_padding";
- }
+ rel1 { to: "toolbar"; }
+ rel2 { to: "toolbar"; }
}
}
}
@@ -2802,7 +2187,6 @@
source: "elm";
action: STATE_SET "left" 0.0;
target: "base";
- target: "clipper";
transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME;
after: "pushed_finished";
}
@@ -2869,98 +2253,24 @@
set_state(PART:"title", "hide", 0.0);
}
}
- program { name: "prev_btn_show";
- signal: "elm,state,prev_btn,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- }
- }
- program { name: "prev_btn_hide";
- signal: "elm,state,prev_btn,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- }
- }
- program { name: "more_btn_show";
- signal: "elm,state,toolbar_more_btn,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- }
- }
- program { name: "more_btn_hide";
- signal: "elm,state,toolbar_more_btn,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- }
- }
- program { name: "toolbar_button1_show";
- signal: "elm,state,toolbar_button1,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) + 1);
- if (get_int(toolbar_buttons_visible) >= 2)
- {
- set_state(PART:"toolbar_button1", "buttons_set", 0.0);
- set_state(PART:"toolbar_button2", "buttons_set", 0.0);
- }
- }
- }
- program { name: "toolbar_button1_hide";
- signal: "elm,state,toolbar_button1,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) - 1);
- set_state(PART:"toolbar_button1", "default", 0.0);
- set_state(PART:"toolbar_button2", "default", 0.0);
- }
- }
- program { name: "toolbar_button2_show";
- signal: "elm,state,toolbar_button2,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) + 1);
- if (get_int(toolbar_buttons_visible) >= 2)
- {
- set_state(PART:"toolbar_button1", "buttons_set", 0.0);
- set_state(PART:"toolbar_button2", "buttons_set", 0.0);
- }
- }
- }
- program { name: "toolbar_button2_hide";
- signal: "elm,state,toolbar_button2,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) - 1);
- set_state(PART:"toolbar_button1", "default", 0.0);
- set_state(PART:"toolbar_button2", "default", 0.0);
- }
- }
- program { name: "toolbar_bg_show";
- signal: "elm,state,toolbar_bg,show";
+ program { name: "toolbar_show";
+ signal: "elm,state,toolbar,show";
source: "elm";
script {
if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
set_int(tbar_bg, get_int(tbar_bg) + 1);
}
}
- program { name: "toolbar_bg_hide";
- signal: "elm,state,toolbar_bg,hide";
+ program { name: "toolbar_hide";
+ signal: "elm,state,toolbar,hide";
source: "elm";
script {
set_int(tbar_bg, get_int(tbar_bg) - 1);
if (get_int(tbar_bg) <= 0)
- set_state(PART:"toolbar_bg", "default", 0.0);
+ set_state(PART:"toolbar", "default", 0.0);
}
}
program { name: "toolbar_open_internal";
@@ -2969,9 +2279,9 @@
script {
set_int(tbar_close, 0);
if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
}
}
program { name: "toolbar_close_internal";
@@ -2979,7 +2289,7 @@
source: "elm";
script {
set_int(tbar_close, 1);
- set_state(PART:"toolbar_bg", "default", 0.0);
+ set_state(PART:"toolbar", "default", 0.0);
}
}
program { name: "toolbar_open";
@@ -2987,9 +2297,9 @@
source: "";
script {
if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
}
transition: LINEAR 0.2;
after: "toolbar_open_internal";
@@ -2998,7 +2308,7 @@
signal: "elm,state,toolbar,close";
source: "";
action: STATE_SET "default" 0.0;
- target: "toolbar_bg";
+ target: "toolbar";
transition: LINEAR 0.2;
after: "toolbar_close_internal";
}
@@ -3033,13 +2343,12 @@
if (get_int(landscape) == 0) {
set_state(PART:"toolbar_more_btn", "landscape", 0.0);
set_state(PART:"elm.swallow.prev_btn", "landscape", 0.0);
- set_state(PART:"toolbar_button_padding", "landscape", 0.0);
new st[31];
new Float:vl;
- get_state(PART:"toolbar_bg", st, 30, vl);
+ get_state(PART:"toolbar", st, 30, vl);
if (!strcmp(st, "visible"))
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
+ set_state(PART:"toolbar", "visible_landscape", 0.0);
set_int(landscape, 1);
}
@@ -3053,13 +2362,12 @@
if (get_int(landscape) == 1) {
set_state(PART:"toolbar_more_btn", "default", 0.0);
set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
- set_state(PART:"toolbar_button_padding", "default", 0.0);
new st[31];
new Float:vl;
- get_state(PART:"toolbar_bg", st, 30, vl);
+ get_state(PART:"toolbar", st, 30, vl);
if (!strcmp(st, "visible_landscape"))
- set_state(PART:"toolbar_bg", "visible", 0.0);
+ set_state(PART:"toolbar", "visible", 0.0);
set_int(landscape, 0);
}
@@ -3191,1300 +2499,3 @@
}
}
}
-
- group { name: "elm/naviframe/item/dual_title/default";
- images {
- image: "00_badge_bg.png" COMP;
- }
- script {
- public tbar_bg = 0; //Toolbar BG Show call count
- public toolbar_buttons_visible = 0; //when both toolbar buttons are visible
- public tbar_close = 0; //Toolbar lastest Open/Close status
- public title_buttons_visible = 0; //when both title buttons are visible
- public landscape = 0; //Landscape mode status
- }
- parts {
- part { name: "clipper";
- type: RECT;
- description { state: "default" 0.0;
- visible: 1;
- }
- description { state: "left" 0.0;
- visible: 0;
- }
- }
- part { name: "base";
- type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- visible: 0;
- }
- description { state: "left" 0.0;
- inherit: "default" 0.0;
- rel1.relative: -1.0 0.0;
- rel2.relative: 0.0 1.0;
- }
- description { state: "right" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 1.0 0.0;
- rel2.relative: 2.0 1.0;
- }
- }
- part { name: "title_bg";
- type: RECT;
- scale: 1;
- description { state: "default" 0.0;
- min: 1 NAVIFRAME_TITLE_H_INC;
- align: 0.0 0.0;
- fixed: 0 1;
- rel1 { relative: 0.0 0.0; to: "base"; }
- rel2 { relative: 1.0 0.0; to: "base"; }
- color: NAVIFRAME_TITLE_BG_COLOR_INC;
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: 1 NAVIFRAME_LANDSCAPE_TITLE_H_INC;
- }
- description { state: "hide" 0.0;
- inherit: "default" 0.0;
- min: 0 0;
- max: 0 0;
- fixed: 1 1;
- }
- }
- part { name: "title_clip";
- type: RECT;
- mouse_events: 0;
- clip_to: "clipper";
- description { state: "default" 0.0;
- rel1 { to_y: "title_bg"; }
- rel2 { to_y: "title_bg"; }
- }
- }
- part { name: "top_padding";
- type: RECT;
- mouse_events: 0;
- scale: 1;
- description {
- state: "default" 0.0;
- min: NAVIFRAME_TITLE_TOP_PADDING_INC;
- fixed: 0 1;
- align: 0.0 0.0;
- rel1 { relative: 0.0 0.0; to: "title_bg"; }
- rel2 { relative: 1.0 0.0; to: "title_bg"; }
- visible: 0;
- }
- description {
- state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_LANDSCAPE_TITLE_TOP_PADDING_INC;
- }
- }
- part { name: "right_padding";
- type: RECT;
- mouse_events: 0;
- scale: 1;
- description {
- state: "default" 0.0;
- min: NAVIFRAME_TITLE_RIGHT_PADDING_INC;
- fixed: 1 0;
- align: 1.0 0.0;
- rel1 { relative: 1.0 0.0; to: "title_bg"; }
- rel2 { relative: 1.0 1.0; to: "title_bg"; }
- visible: 0;
- }
- }
- part { name: "padding_center_text1";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- min: NAVIFRAME_PADDING_INC;
- fixed: 1 0;
- align: 0.0 0.0;
- rel1 { relative: 0.0 0.0; to: "title_bg"; }
- rel2 { relative: 0.0 1.0; to: "title_bg"; }
- visible: 0;
- }
- }
- part { name: "elm.swallow.content";
- type: SWALLOW;
- scale: 1;
- repeat_events: 0;
- clip_to: "content_clip";
- description { state: "default" 0.0;
- align: 0.0 0.0;
- rel1.relative: 0.0 1.0;
- rel1.to_x: "base";
- rel1.to_y: "title_bg";
- rel2.relative: 1.0 0.0;
- rel2.to_x: "base";
- rel2.to_y: "toolbar_bg";
- }
- }
- part { name: "content_clip";
- type: RECT;
- mouse_events: 0;
- clip_to: "clipper";
- description { state: "default" 0.0;
- rel1.to_y: "elm.swallow.content";
- rel2.to_y: "elm.swallow.content";
- }
- }
- part { name: "padding_bottom_text";
- type: RECT;
- mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- min: NAVIFRAME_BOTTOM_TEXT_PADDING_INC;
- fixed: 0 1;
- align: 0.0 1.0;
- rel1 { relative: 0.0 1.0; to: "title_bg"; }
- rel2 { relative: 1.0 1.0; to: "title_bg"; }
- visible: 0;
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_LANDSCAPE_BOTTOM_TEXT_PADDING_INC;
- }
- }
- part { name: "padding_center_text2";
- type: RECT;
- mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- min: NAVIFRAME_PADDING2_INC;
- fixed: 1 0;
- align: 1.0 0.5;
- rel1 { relative: 0.0 0.0; to: "title_left_btn"; }
- rel2 { relative: 0.0 1.0; to: "title_left_btn"; }
- visible: 0;
- }
- }
- part { name: "title1_max_area";
- type: RECT;
- mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- min: NAVIFRAME_DUAL_TITLE1_MAX_W_WITH_ONE_BUTTON_INC 0;
- max: NAVIFRAME_DUAL_TITLE1_MAX_W_WITH_ONE_BUTTON_INC -1;
- align: 0.0 0.5;
- fixed: 1 1;
- rel1 { relative: 1.0 1.0; to_x: "padding_center_text1"; to_y: "top_padding"; }
- rel2 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "padding_bottom_text"; }
- visible: 0;
- }
- description { state: "buttons_set" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_DUAL_TITLE1_MAX_W_WITH_TWO_BUTTON_INC 0;
- max: NAVIFRAME_DUAL_TITLE1_MAX_W_WITH_TWO_BUTTON_INC -1;
- }
- }
- part { name: "elm.text.title";
- type: TEXT;
- effect: FAR_SHADOW BOTTOM;
- scale: 1;
- clip_to: "title_clip";
- description { state: "default" 0.0;
- text { font: "Tizen:style=Bold";
- size: NAVIFRAME_DUAL_TITLE_FONT_SIZE_INC;
- min: 0 0;
- max: 1 0;
- align: 0.0 0.5;
- text_class: "tizen";
- }
- color: NAVIFRAME_TITLE_TEXT_UNSELECTED_COLOR_INC;
- color3: 255 255 255 255;
- align: 0.0 0.5;
- fixed: 1 1;
- rel1 { to: "title1_max_area"; }
- rel2 { to: "title1_max_area"; }
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
- }
- description { state: "default_landscape" 0.0;
- inherit: "default" 0.0;
- text { font: "Tizen:style=Bold";
- size: NAVIFRAME_LANDSCAPE_TITLE_FONT_SIZE_INC;
- min: 0 0;
- max: 1 0;
- align: 0.0 0.5;
- text_class: "tizen";
- }
- }
- description { state: "selected_landscape" 0.0;
- inherit: "default_landscape" 0.0;
- color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
- }
- }
- part { name: "click_event_title1_area";
- type: RECT;
- ignore_flags: ON_HOLD;
- description { state: "default" 0.0;
- min: NAVIFRAME_DUAL_TITLE1_MIN_W_INC 0;
- align: 0.0 0.5;
- fixed: 1 1;
- rel1 { to: "elm.text.title"; }
- rel2 { to: "elm.text.title"; }
- color: 0 0 0 0;
- }
- }
- part { name: "text.padding";
- type: RECT;
- scale: 1;
- clip_to: "title_clip";
- description { state: "default" 0.0;
- min: 30 0;
- align: 0.0 0.0;
- fixed: 1 0;
- rel1 { relative: 1.0 0.0; to: "click_event_title1_area"; }
- rel2 { relative: 1.0 1.0; to: "click_event_title1_area"; }
- visible: 0;
- }
- }
- part { name: "divider";
- type: RECT;
- description { state: "default" 0.0;
- min: 4 26;
- max: 4 26;
- fixed: 1 1;
- rel1.to: "text.padding";
- rel2.to: "text.padding";
- align: 0.5 0.5;
- }
- }
- part { name: "divider_left";
- type: RECT;
- clip_to: "divider";
- description { state: "default" 0.0;
- color: NAVIFRAME_DUAL_TITLE_DIVIDER_LEFT_COLOR_INC;
- rel1 { relative: 0.0 0.0; to: "divider"; }
- rel2 { relative: 0.5 1.0; to: "divider"; }
- }
- }
- part { name: "divider_right";
- type: RECT;
- clip_to: "divider";
- description { state: "default" 0.0;
- color: NAVIFRAME_DUAL_TITLE_DIVIDER_RIGHT_COLOR_INC;
- rel1 { relative: 0.5 0.0; to: "divider"; }
- rel2 { relative: 1.0 1.0; to: "divider"; }
- }
- }
- part { name: "elm.text.title2";
- type: TEXT;
- effect: FAR_SHADOW BOTTOM;
- scale: 1;
- clip_to: "title_clip";
- description { state: "default" 0.0;
- text { font: "Tizen:style=Bold";
- size: NAVIFRAME_DUAL_TITLE_FONT_SIZE_INC;
- min: 0 0;
- max: 1 0;
- align: 0.0 0.5;
- text_class: "tizen";
- }
- color: NAVIFRAME_TITLE_TEXT_UNSELECTED_COLOR_INC;
- color3: 255 255 255 255;
- align: 0.0 0.5;
- fixed: 1 1;
- rel1 { relative: 1.0 1.0; to_x: "text.padding"; to_y: "top_padding"; }
- rel2 { relative: 0.0 0.0; to_x: "padding_center_text2"; to_y: "padding_bottom_text"; }
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
- }
- description { state: "default_landscape" 0.0;
- inherit: "default" 0.0;
- text { font: "Tizen:style=Bold";
- size: NAVIFRAME_LANDSCAPE_TITLE_FONT_SIZE_INC;
- min: 0 0;
- max: 1 0;
- align: 0.0 0.5;
- text_class: "tizen";
- }
- }
- description { state: "selected_landscape" 0.0;
- inherit: "default_landscape" 0.0;
- color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
- }
- }
- part { name: "click_event_title2_area";
- type: RECT;
- ignore_flags: ON_HOLD;
- description { state: "default" 0.0;
- rel1 { to: "elm.text.title2"; }
- rel2 { to: "elm.text.title2"; }
- color: 0 0 0 0;
- }
- }
- part { name: "badge_top_padding";
- type: RECT;
- scale: 1;
- description { state: "default" 0.0;
- visible: 0;
- min: NAVIFRAME_BADGE_TOP_PADDING_INC;
- fixed: 0 1;
- rel1 { relative: 0.0 0.0; to: "title_bg"; }
- rel2 { relative: 1.0 0.0; to: "title_bg"; }
- align: 0.0 0.0;
- }
- }
- part { name: "badge_left_padding";
- type: RECT;
- scale: 1;
- description { state: "default" 0.0;
- visible: 0;
- min: 0 0;
- fixed: 1 1;
- rel1 { relative: 0.0 1.0; to_x: "divider"; to_y: "badge_top_padding"; }
- rel2 { relative: 0.0 0.5; to_x: "divider"; to_y: "title_bg"; }
- align: 0.0 0.5;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_PADDING_BADGE_INC;
- }
- }
- part { name: "right.padding.text";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- fixed: 1 1;
- min: 8 54;
- rel1 {
- to: "badge_left_padding";
- relative: 0.0 1.0;
- }
- rel2 {
- to: "badge_left_padding";
- relative: 0.0 1.0;
- }
- align: 1.0 1.0;
- }
- }
- part { name: "left.padding.text";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- fixed: 1 1;
- min: 13 54;
- rel1 {
- to: "title_badge";
- relative: 0.0 1.0;
- }
- rel2 {
- to: "title_badge";
- relative: 0.0 1.0;
- }
- align: 1.0 1.0;
- }
- }
- part { name: "badge_bg";
- type: IMAGE;
- scale: 1;
- clip_to: "title_clip";
- description { state: "default" 0.0;
- visible: 0;
- fixed: 1 1;
- rel1 {
- to: "left.padding.text";
- relative: 0.0 0.0;
- }
- rel2 {
- to: "right.padding.text";
- relative: 1.0 1.0;
- }
- image {
- normal: "00_badge_bg.png";
- border: NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC;
- border_scale: 1;
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- min: NAVIFRAME_BADGE_BG_IMAGE_SIZE_INC;
- fixed: 1 1;
- }
- }
- part { name: "title_badge";
- type: TEXT;
- mouse_events: 0;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- rel1 {
- to: "right.padding.text";
- relative: 0.0 0.0;
- }
- rel2 {
- to: "right.padding.text";
- relative: 0.0 1.0;
- }
- fixed: 1 0;
- align: 1.0 0.5;
- color: NAVIFRAME_BADGE_TEXT_COLOR_INC;
- text {
- font: "Tizen:style=Bold";
- size: NAVIFRAME_BADGE_TEXT_H_INC;
- min: 1 1;
- max: 1 0;
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "badge_left_padding2";
- type: RECT;
- scale: 1;
- description { state: "default" 0.0;
- visible: 0;
- min: 0 0;
- fixed: 1 1;
- rel1 { relative: 1.0 1.0; to_x: "elm.text.title2"; to_y: "badge_top_padding"; }
- rel2 { relative: 1.0 0.5; to_x: "elm.text.title2"; to_y: "title_bg"; }
- align: 0.0 0.5;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_PADDING_INC;
- }
- }
- part { name: "right.padding.text2";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- fixed: 1 1;
- min: 8 54;
- rel1 {
- to: "badge_left_padding2";
- relative: 1.0 1.0;
- }
- rel2 {
- to: "badge_left_padding2";
- relative: 1.0 1.0;
- }
- align: 1.0 1.0;
- }
- }
- part { name: "left.padding.text2";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- fixed: 1 1;
- min: 13 54;
- rel1 {
- to: "title2_badge";
- relative: 0.0 1.0;
- }
- rel2 {
- to: "title2_badge";
- relative: 0.0 1.0;
- }
- align: 1.0 1.0;
- }
- }
- part { name: "badge2_bg";
- type: IMAGE;
- scale: 1;
- clip_to: "title_clip";
- description { state: "default" 0.0;
- visible: 0;
- fixed: 1 1;
- rel1 {
- to: "left.padding.text2";
- relative: 0.0 0.0;
- }
- rel2 {
- to: "right.padding.text2";
- relative: 1.0 1.0;
- }
- image {
- normal: "00_badge_bg.png";
- border: NAVIFRAME_BADGE_BG_IMAGE_BORDER_INC;
- border_scale: 1;
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- min: NAVIFRAME_BADGE_BG_IMAGE_SIZE_INC;
- fixed: 1 1;
- }
- }
- part { name: "title2_badge";
- type: TEXT;
- mouse_events: 0;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- rel1 {
- to: "right.padding.text2";
- relative: 0.0 0.0;
- }
- rel2 {
- to: "right.padding.text2";
- relative: 0.0 1.0;
- }
- fixed: 1 0;
- align: 1.0 0.5;
- color: NAVIFRAME_BADGE_TEXT_COLOR_INC;
- text {
- font: "Tizen:style=Bold";
- size: NAVIFRAME_BADGE_TEXT_H_INC;
- min: 1 1;
- max: 1 0;
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "access.title";
- type: RECT;
- repeat_events: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "title_bg";
- rel2.to: "title_bg";
- color: 0 0 0 0;
- }
- }
- part { name: "title_left_btn";
- type: SWALLOW;
- scale: 1;
- clip_to: "title_clip";
- description { state: "default" 0.0;
- max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
- fixed: 1 1;
- align: 1.0 0.5;
- rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
- rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- max: NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC;
- }
- }
- part { name: "title_right_btn";
- type: SWALLOW;
- scale: 1;
- clip_to: "title_clip";
- description { state: "default" 0.0;
- max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
- align: 1.0 0.5;
- fixed: 1 1;
- rel1 { relative: 0.0 0.0; to: "right_padding"; }
- rel2 { relative: 0.0 1.0; to: "right_padding"; }
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- max: NAVIFRAME_LANDSCAPE_TITLE_FUNC_BTN_SIZE_INC;
- }
- }
- part { name: "toolbar_bg";
- type: RECT;
- scale: 1;
- description { state: "default" 0.0;
- min: 0 0;
- max: 999999 0;
- fixed: 0 1;
- align: 0.0 1.0;
- visible: 0;
- rel1 { to: "base"; }
- rel2 { to: "base"; }
- color: NAVIFRAME_TOOLBAR_BG_COLOR_INC;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- min: 0 NAVIFRAME_TOOLBAR_HEIGHT_INC;
- max: 999999 NAVIFRAME_TOOLBAR_HEIGHT_INC;
- visible: 1;
- }
- description { state: "visible_landscape" 0.0;
- inherit: "default" 0.0;
- min: 0 NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC;
- max: 999999 NAVIFRAME_LANDSCAPE_TOOLBAR_HEIGHT_INC;
- visible: 1;
- }
- }
- part { name: "more_btn_bg";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC;
- fixed: 1 0;
- align: 0.0 0.0;
- rel1 { relative: 0.0 0.0; to: "toolbar_bg"; }
- rel2 { relative: 0.0 1.0; to: "toolbar_bg"; }
- visible: 0;
- }
- }
- part { name: "toolbar_more_btn";
- type: SWALLOW;
- scale: 1;
- clip_to: "toolbar_clip";
- description { state: "default" 0.0;
- max: NAVIFRAME_PREV_FUNC_BTN_SIZE_INC;
- fixed: 1 1;
- rel1.to: "more_btn_bg";
- rel2.to: "more_btn_bg";
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- max: NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC;
- }
- }
- part { name: "prev_btn_bg";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- min: NAVIFRAME_TOOLBAR_BUTTON_BG_PADDING_INC;
- fixed: 1 0;
- align: 1.0 0.0;
- rel1 { relative: 1.0 0.0; to: "toolbar_bg"; }
- rel2.to: "toolbar_bg";
- visible: 0;
- }
- }
- part { name: "elm.swallow.prev_btn";
- type: SWALLOW;
- scale: 1;
- clip_to: "toolbar_clip";
- description { state: "default" 0.0;
- max: NAVIFRAME_PREV_FUNC_BTN_SIZE_INC;
- fixed: 1 1;
- align: 0.5 0.5;
- rel1.to: "prev_btn_bg";
- rel2.to: "prev_btn_bg";
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- max: NAVIFRAME_LANDSCAPE_PREV_FUNC_BTN_SIZE_INC;
- }
- }
- part { name: "toolbar_btns_area";
- type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1 { relative: 1.0 0.0; to: "more_btn_bg"; }
- rel2 { relative: 0.0 1.0; to: "prev_btn_bg"; }
- visible: 0;
- }
- }
- part { name: "toolbar_clip";
- type: RECT;
- mouse_events: 0;
- clip_to: "clipper";
- description { state: "default" 0.0;
- rel1 { to_y: "toolbar_bg"; }
- rel2 { to_y: "toolbar_bg"; }
- }
- }
- part { name: "toolbar_button1";
- type: SWALLOW;
- scale: 1;
- clip_to: "toolbar_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "buttons_set" 0.0;
- inherit: "default" 0.0;
- align: 1.0 0.5;
- rel2 {
- relative: 0.0 1.0;
- to: "toolbar_button_padding";
- }
- }
- }
- part { name: "toolbar_button_padding";
- type: RECT;
- scale : 1;
- description { state: "default" 0.0;
- min: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 0;
- max: NAVIFRAME_TOOLBAR_BUTTONS_PADDING_INC 9999;
- fixed : 1 0;
- visible: 0;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "landscape" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 0;
- max: NAVIFRAME_LANDSCAPE_TOOLBAR_BUTTONS_PADDING_INC 9999;
- }
- }
- part { name: "toolbar_button2";
- type: SWALLOW;
- scale: 1;
- clip_to: "toolbar_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- align: 0.5 0.5;
- rel1.to: "toolbar_btns_area";
- rel2.to: "toolbar_btns_area";
- }
- description { state: "buttons_set" 0.0;
- inherit: "default" 0.0;
- align: 0.0 0.5;
- rel1 {
- relative: 1.0 0.0;
- to: "toolbar_button_padding";
- }
- }
- }
- }
- programs {
- program { name: "content_new_pushed";
- signal: "elm,state,new,pushed,deferred";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "base";
- transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME;
- after: "show_finished";
- }
- program { name: "content_cur_pushed";
- signal: "elm,state,cur,pushed,deferred";
- source: "elm";
- action: STATE_SET "left" 0.0;
- target: "base";
- target: "clipper";
- transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME;
- after: "pushed_finished";
- }
- program { name: "content_prev_popped";
- signal: "elm,state,prev,popped,deferred";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "base";
- target: "clipper";
- transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME;
- after: "show_finished";
- }
- program { name: "content_cur_popped";
- signal: "elm,state,cur,popped,deferred";
- source: "elm";
- action: STATE_SET "right" 0.0;
- target: "base";
- transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME;
- after: "popped_finished";
- }
- program { name: "cur_pushed";
- signal: "elm,state,cur,pushed";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "base";
- }
- program { name: "new_pushed";
- signal: "elm,state,new,pushed";
- source: "elm";
- action: STATE_SET "right" 0.0;
- target: "base";
- }
- program { name: "prev_popped";
- signal: "elm,state,prev,popped";
- source: "elm";
- action: STATE_SET "left" 0.0;
- target: "base";
- }
- program { name: "cur_popped";
- signal: "elm,state,cur,popped";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "base";
- }
- program { name: "visible";
- signal: "elm,state,visible";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "base";
- }
- program { name: "title_show";
- signal: "elm,state,title,show";
- source: "elm";
- script {
- if (get_int(landscape) == 0)
- set_state(PART:"title_bg", "default", 0.0);
- else
- set_state(PART:"title_bg", "landscape", 0.0);
- }
- }
- program { name: "title_hide";
- signal: "elm,state,title,hide";
- source: "elm";
- script {
- set_state(PART:"title_bg", "hide", 0.0);
- }
- }
- program { name: "title_left_btn_show";
- signal: "elm,state,title_left_btn,show";
- source: "elm";
- script {
- set_int(title_buttons_visible, get_int(title_buttons_visible) + 1);
- if (get_int(title_buttons_visible) >= 2)
- set_state(PART:"title1_max_area", "buttons_set", 0.0);
- }
- }
- program { name: "title_left_btn_hide";
- signal: "elm,state,title_left_btn,hide";
- source: "elm";
- script {
- set_int(title_buttons_visible, get_int(title_buttons_visible) - 1);
- set_state(PART:"title1_max_area", "default", 0.0);
- }
- }
- program { name: "title_right_btn_show";
- signal: "elm,state,title_right_btn,show";
- source: "elm";
- script {
- set_int(title_buttons_visible, get_int(title_buttons_visible) + 1);
- if (get_int(title_buttons_visible) >= 2)
- set_state(PART:"title1_max_area", "buttons_set", 0.0);
- }
- }
- program { name: "title_right_btn_hide";
- signal: "elm,state,title_right_btn,hide";
- source: "elm";
- script {
- set_int(title_buttons_visible, get_int(title_buttons_visible) - 1);
- set_state(PART:"title1_max_area", "default", 0.0);
- }
- }
- program { name: "prev_btn_show";
- signal: "elm,state,prev_btn,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- }
- }
- program { name: "prev_btn_hide";
- signal: "elm,state,prev_btn,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- }
- }
- program { name: "more_btn_show";
- signal: "elm,state,toolbar_more_btn,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- }
- }
- program { name: "more_btn_hide";
- signal: "elm,state,toolbar_more_btn,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- }
- }
- program { name: "toolbar_button1_show";
- signal: "elm,state,toolbar_button1,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) + 1);
- if (get_int(toolbar_buttons_visible) >= 2)
- {
- set_state(PART:"toolbar_button1", "buttons_set", 0.0);
- set_state(PART:"toolbar_button2", "buttons_set", 0.0);
- }
- }
- }
- program { name: "toolbar_button1_hide";
- signal: "elm,state,toolbar_button1,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) - 1);
- set_state(PART:"toolbar_button1", "default", 0.0);
- set_state(PART:"toolbar_button2", "default", 0.0);
- }
- }
- program { name: "toolbar_button2_show";
- signal: "elm,state,toolbar_button2,show";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,show", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) + 1);
- if (get_int(toolbar_buttons_visible) >= 2)
- {
- set_state(PART:"toolbar_button1", "buttons_set", 0.0);
- set_state(PART:"toolbar_button2", "buttons_set", 0.0);
- }
- }
- }
- program { name: "toolbar_button2_hide";
- signal: "elm,state,toolbar_button2,hide";
- source: "elm";
- script {
- emit("elm,state,toolbar_bg,hide", "elm");
- set_int(toolbar_buttons_visible, get_int(toolbar_buttons_visible) - 1);
- set_state(PART:"toolbar_button1", "default", 0.0);
- set_state(PART:"toolbar_button2", "default", 0.0);
- }
- }
- program { name: "toolbar_bg_show";
- signal: "elm,state,toolbar_bg,show";
- source: "elm";
- script {
- if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
- else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
- set_int(tbar_bg, get_int(tbar_bg) + 1);
- }
- }
- program { name: "toolbar_bg_hide";
- signal: "elm,state,toolbar_bg,hide";
- source: "elm";
- script {
- set_int(tbar_bg, get_int(tbar_bg) - 1);
- if (get_int(tbar_bg) <= 0)
- set_state(PART:"toolbar_bg", "default", 0.0);
- }
- }
- program { name: "toolbar_open_internal";
- signal: "elm,state,toolbar,open,internal";
- source: "elm";
- script {
- set_int(tbar_close, 0);
- if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
- else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
- }
- }
- program { name: "toolbar_close_internal";
- signal: "elm,state,toolbar,close,internal";
- source: "elm";
- script {
- set_int(tbar_close, 1);
- set_state(PART:"toolbar_bg", "default", 0.0);
- }
- }
- program { name: "toolbar_open";
- signal: "elm,state,toolbar,open";
- source: "";
- script {
- if (get_int(landscape) == 0)
- set_state(PART:"toolbar_bg", "visible", 0.0);
- else
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
- }
- transition: LINEAR 0.2;
- after: "toolbar_open_internal";
- }
- program { name: "toolbar_close";
- signal: "elm,state,toolbar,close";
- source: "";
- action: STATE_SET "default" 0.0;
- target: "toolbar_bg";
- transition: LINEAR 0.2;
- after: "toolbar_close_internal";
- }
- program { name: "toolbar_instant_open";
- signal: "elm,state,toolbar,instant_open";
- source: "";
- script {
- emit("elm,state,toolbar,open,internal", "elm");
- }
- }
- program { name: "toolbar_instant_close";
- signal: "elm,state,toolbar,instant_close";
- source: "";
- script {
- emit("elm,state,toolbar,close,internal", "elm");
- }
- }
- program { name: "show_finished";
- action: SIGNAL_EMIT "elm,action,show,finished" "";
- }
- program { name: "pushed_finished";
- action: SIGNAL_EMIT "elm,action,pushed,finished" "";
- }
- program { name: "popped_finished";
- action: SIGNAL_EMIT "elm,action,popped,finished" "";
- }
- program {
- name: "init_title_selection";
- signal: "elm,state,title_label,show";
- source: "elm";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text.title", st, 30, vl);
- if (get_int(landscape) == 0)
- {
- set_state(PART:"elm.text.title", "selected", 0.0);
- set_state(PART:"elm.text.title2", "default", 0.0);
- }
- else
- {
- set_state(PART:"elm.text.title", "selected_landscape", 0.0);
- set_state(PART:"elm.text.title2", "default_landscape", 0.0);
- }
- }
- }
- program {
- name: "title1_clicked";
- signal: "mouse,clicked,1";
- source: "click_event_title1_area";
- after: "touch_snd";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text.title", st, 30, vl);
- if ((get_int(landscape) == 0) && !strcmp(st, "default"))
- {
- set_state(PART:"elm.text.title", "selected", 0.0);
- set_state(PART:"elm.text.title2", "default", 0.0);
- }
- else if ((get_int(landscape) == 1) && !strcmp(st, "default_landscape"))
- {
- set_state(PART:"elm.text.title", "selected_landscape", 0.0);
- set_state(PART:"elm.text.title2", "default_landscape", 0.0);
- }
- emit("elm,action,title1,clicked", "");
- }
- }
- program {
- name: "title2_clicked";
- signal: "mouse,clicked,1";
- source: "click_event_title2_area";
- after: "touch_snd";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text.title2", st, 30, vl);
- if ((get_int(landscape) == 0) && !strcmp(st, "default"))
- {
- set_state(PART:"elm.text.title2", "selected", 0.0);
- set_state(PART:"elm.text.title", "default", 0.0);
- }
- else if ((get_int(landscape) == 1) && !strcmp(st, "default_landscape"))
- {
- set_state(PART:"elm.text.title2", "selected_landscape", 0.0);
- set_state(PART:"elm.text.title", "default_landscape", 0.0);
- }
- emit("elm,action,title2,clicked", "");
- }
- }
- program { name: "touch_snd";
- action: PLAY_SAMPLE "touch_sound" 1.0;
- }
- program { name: "title1_selected";
- signal: "elm,state,title1,selected";
- source: "";
- script {
- if (get_int(landscape) == 0)
- {
- set_state(PART:"elm.text.title", "selected", 0.0);
- set_state(PART:"elm.text.title2", "default", 0.0);
- }
- else
- {
- set_state(PART:"elm.text.title", "selected_landscape", 0.0);
- set_state(PART:"elm.text.title2", "default_landscape", 0.0);
- }
- }
- }
- program { name: "title1_unselected";
- signal: "elm,state,title1,unselected";
- source: "";
- script {
- if (get_int(landscape) == 0)
- set_state(PART:"elm.text.title", "default", 0.0);
- else
- set_state(PART:"elm.text.title", "default_landscape", 0.0);
- }
- }
- program { name: "title2_selected";
- signal: "elm,state,title2,selected";
- source: "";
- script {
- if (get_int(landscape) == 0)
- {
- set_state(PART:"elm.text.title2", "selected", 0.0);
- set_state(PART:"elm.text.title", "default", 0.0);
- }
- else
- {
- set_state(PART:"elm.text.title2", "selected_landscape", 0.0);
- set_state(PART:"elm.text.title", "default_landscape", 0.0);
- }
- }
- }
- program { name: "title2_unselected";
- signal: "elm,state,title2,unselected";
- source: "";
- script {
- if (get_int(landscape) == 0)
- set_state(PART:"elm.text.title2", "default", 0.0);
- else
- set_state(PART:"elm.text.title2", "default_landscape", 0.0);
- }
- }
- program {
- name: "badge_show";
- signal: "elm,state,title_badge,show";
- source: "elm";
- script {
- set_state(PART:"badge_bg", "visible", 0.0);
- set_state(PART:"title_badge", "visible", 0.0);
- }
- }
- program {
- name: "badge_hide";
- signal: "elm,state,title_badge,hide";
- source: "elm";
- script {
- set_state(PART:"badge_bg", "default", 0.0);
- set_state(PART:"title_badge", "default", 0.0);
- }
- }
- program {
- name: "badge2_show";
- signal: "elm,state,title2_badge,show";
- source: "elm";
- script {
- set_state(PART:"badge_left_padding2", "visible", 0.0);
- set_state(PART:"badge2_bg", "visible", 0.0);
- set_state(PART:"title2_badge", "visible", 0.0);
- }
- }
- program {
- name: "badge2_hide";
- signal: "elm,state,title2_badge,hide";
- source: "elm";
- script {
- set_state(PART:"badge_left_padding2", "default", 0.0);
- set_state(PART:"badge2_bg", "default", 0.0);
- set_state(PART:"title2_badge", "default", 0.0);
- }
- }
- program {
- name: "change_to_landscape";
- signal: "elm,state,landscape";
- source: "elm";
- script {
- if (get_int(landscape) == 0) {
- set_state(PART:"top_padding", "landscape", 0.0);
- set_state(PART:"padding_bottom_text", "landscape", 0.0);
- set_state(PART:"title_left_btn", "landscape", 0.0);
- set_state(PART:"title_right_btn", "landscape", 0.0);
- set_state(PART:"toolbar_more_btn", "landscape", 0.0);
- set_state(PART:"elm.swallow.prev_btn", "landscape", 0.0);
- set_state(PART:"toolbar_button_padding", "landscape", 0.0);
-
- new st[31];
- new Float:vl;
- get_state(PART:"title_bg", st, 30, vl);
- if (!strcmp(st, "default"))
- set_state(PART:"title_bg", "landscape", 0.0);
-
- get_state(PART:"elm.text.title", st, 30, vl);
- if (!strcmp(st, "default"))
- set_state(PART:"elm.text.title", "default_landscape", 0.0);
- else
- set_state(PART:"elm.text.title", "selected_landscape", 0.0);
-
- get_state(PART:"elm.text.title2", st, 30, vl);
- if (!strcmp(st, "default"))
- set_state(PART:"elm.text.title2", "default_landscape", 0.0);
- else
- set_state(PART:"elm.text.title2", "selected_landscape", 0.0);
-
- get_state(PART:"toolbar_bg", st, 30, vl);
- if (!strcmp(st, "visible"))
- set_state(PART:"toolbar_bg", "visible_landscape", 0.0);
-
- set_int(landscape, 1);
- }
- }
- }
- program {
- name: "change_to_portrait";
- signal: "elm,state,portrait";
- source: "elm";
- script {
- if (get_int(landscape) == 1) {
- set_state(PART:"top_padding", "default", 0.0);
- set_state(PART:"padding_bottom_text", "default", 0.0);
- set_state(PART:"title_left_btn", "default", 0.0);
- set_state(PART:"title_right_btn", "default", 0.0);
- set_state(PART:"toolbar_more_btn", "default", 0.0);
- set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
- set_state(PART:"toolbar_button_padding", "default", 0.0);
-
- new st[31];
- new Float:vl;
- get_state(PART:"title_bg", st, 30, vl);
- if (!strcmp(st, "landscape"))
- set_state(PART:"title_bg", "default", 0.0);
-
- get_state(PART:"elm.text.title", st, 30, vl);
- if (!strcmp(st, "default_landscape"))
- set_state(PART:"elm.text.title", "default", 0.0);
- else
- set_state(PART:"elm.text.title", "selected", 0.0);
-
- get_state(PART:"elm.text.title2", st, 30, vl);
- if (!strcmp(st, "default_landscape"))
- set_state(PART:"elm.text.title2", "default", 0.0);
- else
- set_state(PART:"elm.text.title2", "selected", 0.0);
-
- get_state(PART:"toolbar_bg", st, 30, vl);
- if (!strcmp(st, "visible_landscape"))
- set_state(PART:"toolbar_bg", "visible", 0.0);
-
- set_int(landscape, 0);
- }
- }
- }
- program { name: "landscape_mode";
- source: "elm";
- signal: "elm,state,orient,90";
- action: SIGNAL_EMIT "elm,state,landscape" "elm";
- }
- program { name: "landscape_mode2";
- source: "elm";
- signal: "elm,state,orient,270";
- action: SIGNAL_EMIT "elm,state,landscape" "elm";
- }
- program { name: "portrait_mode";
- source: "elm";
- signal: "elm,state,orient,0";
- action: SIGNAL_EMIT "elm,state,portrait" "elm";
- }
- program { name: "portrait_mode2";
- source: "elm";
- signal: "elm,state,orient,180";
- action: SIGNAL_EMIT "elm,state,portrait" "elm";
- }
- }
- }