[controlbar] apply new UX

diff --git a/themes/groups/controlbar.edc b/themes/groups/controlbar.edc
index d398f05..ea3c3d0 100644 (file)
--- a/themes/groups/controlbar.edc
+++ b/themes/groups/controlbar.edc
@@ -190,7 +190,10 @@
                name: "elm/controlbar/background/default";
 
                images{
-                       image: "00_winset_softkey_bg.png" COMP;
+                       image: "00_winset_control_toolbar_bg.png" COMP;
+                       image: "00_winset_control_tabbar_bg.png" COMP;
+                       image: "00_winset_control_tabbar_left_bg.png" COMP;
+                       image: "00_winset_control_tabbar_right_bg.png" COMP;
                }
 
                parts{
@@ -203,9 +206,54 @@
                                        state: "default" 0.0;
                                        rel1 {relative: 0.0 0.0; offset: 0 0;}
                                        rel2 {relative: 1.0 1.0; offset: -1 -1;}
-                                       image.normal: "00_winset_softkey_bg.png";
+                                       image.normal: "00_winset_control_toolbar_bg.png";
                                        color: 255 255 255 255; 
                                }
+                               description{
+                                       state: "tabbar" 0.0;
+                                       inherit: "default" 0.0;
+                                       image.normal: "00_winset_control_tabbar_bg.png";
+                               }
+                               description{
+                                       state: "tabbar_left" 0.0;
+                                       inherit: "default" 0.0;
+                                       image.normal: "00_winset_control_tabbar_left_bg.png";
+                               }
+                               description{
+                                       state: "tabbar_right" 0.0;
+                                       inherit: "default" 0.0;
+                                       image.normal: "00_winset_control_tabbar_right_bg.png";
+                               }
+                       }
+                       programs {
+                               program {
+                                       name: "tabbar_bg";
+                                       signal: "elm,state,tabbar";
+                                       source: "elm";
+                                       action: STATE_SET "tabbar" 0.0;
+                                       target: "bg_image";
+                               }
+                               program {
+                                       name: "toolbar_bg";
+                                       signal: "elm,state,toolbar";
+                                       source: "elm";
+                                       action: STATE_SET "default" 0.0;
+                                       target: "bg_image";
+                               }
+                               program {
+                                       name: "tabbar_left_bg";
+                                       signal: "elm,state,tabbar_left";
+                                       source: "elm";
+                                       action: STATE_SET "tabbar_left" 0.0;
+                                       target: "bg_image";
+                               }
+                               program {
+                                       name: "tabbar_right_bg";
+                                       signal: "elm,state,tabbar_right";
+                                       source: "elm";
+                                       action: STATE_SET "tabbar_right" 0.0;
+                                       target: "bg_image";
+                               }
                        }
                }
        }
@@ -240,16 +288,15 @@
        group{
                name: "elm/controlbar/item_bg/default";
                images{
-                       image: "00_winset_tab_press.png" COMP;
+//                     image: "00_winset_tabbar_focus.png" COMP;
                        image: "00_winset_tab_press_left.png" COMP;
                        image: "00_winset_tab_press_right.png" COMP;
                        image: "00_winset_toolbar_press.png" COMP;
-                       image: "00_winset_tab_focus.png" COMP;
+                       image: "00_winset_tabbar_focus.png" COMP;
                        image: "00_winset_tab_focus_left.png" COMP;
                        image: "00_winset_tab_focus_right.png" COMP;
-                       image: "01_touch_glow.png" COMP;
                }
-
+               
                parts{
                        part{
                                name: "bg_rect";
@@ -272,92 +319,93 @@
                                description{
                                        state: "default" 0.0;
                                        visible: 0;
-                                       rel1 {relative: 0.0 0.07; offset: 5 0;}
-                                       rel2 {relative: 1.0 1.0; offset: -5 0;}
+                                       rel1 {relative: 0.0 0.0; offset: 0 0;}
+                                       rel2 {relative: 1.0 1.0; offset: -1 -1;}
                                }
                                description{
                                        state: "pressed" 0.0;
                                        inherit: "default" 0.0;
-                                       image.normal: "00_winset_tab_press.png";
-                                       image.border: 7 7 7 0;
+                                       image.normal: "00_winset_tabbar_focus.png";
+                                       image.border: 2 2 2 2;
+                                       color: 255 255 255 50;
                                        visible: 1;
                                }
                                description{
                                        state: "pressed_left" 0.0;
                                        inherit: "default" 0.0;
-                                       rel1 {relative: 0.0 0.0; offset: 0 5;}
-                                       rel2 {relative: 0.93 1.0; offset: 0 -5;}
-                                       image.normal: "00_winset_tab_press_left.png";
-                                       image.border: 0 7 7 7;
+                                       image.normal: "00_winset_tabbar_focus.png";
+                                       image.border: 2 2 2 2;
+                                       color: 255 255 255 50;
                                        visible: 1;
                                }
                                description{
                                        state: "pressed_right" 0.0;
                                        inherit: "default" 0.0;
-                                       rel1 {relative: 0.07 0.0; offset: 0 5;}
-                                       rel2 {relative: 1.0 1.0; offset: 0 -5;}
-                                       image.normal: "00_winset_tab_press_right.png";
-                                       image.border: 7 0 7 7;
+                                       image.normal: "00_winset_tabbar_focus.png";
+                                       image.border: 2 2 2 2;
+                                       color: 255 255 255 50;
                                        visible: 1;
                                }
                                description{
                                        state: "focused" 0.0;
                                        inherit: "default" 0.0;
-                                       image.normal: "00_winset_tab_focus.png";
-                                       image.border: 7 7 7 0;
+                                       image.normal: "00_winset_tabbar_focus.png";
+                                       image.border: 2 2 2 2;
                                        visible: 1;
                                }
                                description{
                                        state: "focused_left" 0.0;
                                        inherit: "default" 0.0;
-                                       rel1 {relative: 0.0 0.0; offset: 0 5;}
-                                       rel2 {relative: 0.93 1.0; offset: 0 -5;}
-                                       image.normal: "00_winset_tab_focus_left.png";
-                                       image.border: 0 7 7 7;
+                                       image.normal: "00_winset_tabbar_focus.png";
+                                       image.border: 2 2 2 2;
                                        visible: 1;
                                }
                                description{
                                        state: "focused_right" 0.0;
                                        inherit: "default" 0.0;
-                                       rel1 {relative: 0.07 0.0; offset: 0 5;}
-                                       rel2 {relative: 1.0 1.0; offset: 0 -5;}
-                                       image.normal: "00_winset_tab_focus_right.png";
-                                       image.border: 7 0 7 7;
+                                       image.normal: "00_winset_tabbar_focus.png";
+                                       image.border: 2 2 2 2;
                                        visible: 1;
                                }
                                description{
                                        state: "toolbar_pressed" 0.0;
                                        inherit: "default" 0.0;
-                                       rel2 {relative: 1.0 0.93; offset: -5 0;}
+                                       rel1 {relative: 0.0 0.07; offset: 3 0;}
+                                       rel2 {relative: 1.0 0.93; offset: -3 0;}
                                        image.normal: "00_winset_toolbar_press.png";
-                                       image.border: 5 5 5 5;
+                                       image.border: 2 2 2 2;
                                        visible: 1;
                                }
                        }
                        part{
-                               name: "item";
-                               type: SWALLOW;
+                               name: "left_line";
+                               type: RECT;
                                scale: 1;
-                               mouse_events: 1;
+                               mouse_events: 0;
                                description{
                                        state: "default" 0.0;
-                                       rel1{to: "bg_rect";}
-                                       rel2{to: "bg_rect";}
+                                       visible: 0;
+                                       rel1 {relative: 0.0 0.0; offset: 0 5;}
+                                       rel2 {relative: 0.0 1.0; offset: 1 -3;}
+                                       color: 136 121 100 255;
+                               }
+                               description{
+                                       state: "show" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 1;
                                }
                        }
                        part{
-                               name: "glow";
-                               type: IMAGE;
+                               name: "right_line";
+                               type: RECT;
+                               scale: 1;
                                mouse_events: 0;
                                description{
                                        state: "default" 0.0;
                                        visible: 0;
-                                       min: 80 80;
-                                       fixed: 1 1;
-                                       align: 0.5 0.5;
-                                       rel1 {relative: 0.5 0.5; }
-                                       rel2 {relative: 0.5 0.5; }
-                                       image.normal: "01_touch_glow.png";
+                                       rel1 {relative: 1.0 0.0; offset: -1 5;}
+                                       rel2 {relative: 1.0 1.0; offset: 0 -3;}
+                                       color: 101 86 65 255;
                                }
                                description{
                                        state: "show" 0.0;
@@ -366,17 +414,54 @@
                                }
                        }
                        part{
-                               name: "elm.item.default.color";
+                               name: "top_line";
                                type: RECT;
+                               scale: 1;
                                mouse_events: 0;
                                description{
                                        state: "default" 0.0;
                                        visible: 0;
-                                       color: 255 255 255 255;
+                                       rel1 {relative: 0.0 0.0; offset: 5 0;}
+                                       rel2 {relative: 1.0 0.0; offset: -5 1;}
+                                       color: 136 121 100 255;
+                               }
+                               description{
+                                       state: "show" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 1;
                                }
                        }
                        part{
-                               name: "elm.tabbar.selected.color";
+                               name: "bottom_line";
+                               type: RECT;
+                               scale: 1;
+                               mouse_events: 0;
+                               description{
+                                       state: "default" 0.0;
+                                       visible: 0;
+                                       rel1 {relative: 0.0 1.0; offset: 5 -1;}
+                                       rel2 {relative: 1.0 1.0; offset: -5 0;}
+                                       color: 101 86 65 255;
+                               }
+                               description{
+                                       state: "show" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 1;
+                               }
+                       }
+                       part{
+                               name: "item";
+                               type: SWALLOW;
+                               scale: 1;
+                               mouse_events: 1;
+                               description{
+                                       state: "default" 0.0;
+                                       rel1 {to: "bg_rect";}
+                                       rel2 {to: "bg_rect";}
+                               }
+                       }
+                       part{
+                               name: "elm.item.default.color";
                                type: RECT;
                                mouse_events: 0;
                                description{
@@ -386,17 +471,17 @@
                                }
                        }
                        part{
-                               name: "elm.toolbar.pressed.color";
+                               name: "elm.tabbar.selected.color";
                                type: RECT;
                                mouse_events: 0;
                                description{
                                        state: "default" 0.0;
                                        visible: 0;
-                                       color: 151 144 139 255;
+                                       color: 255 255 255 255;
                                }
                        }
                        part{
-                               name: "elm.item.disable.color";
+                               name: "elm.toolbar.pressed.color";
                                type: RECT;
                                mouse_events: 0;
                                description{
@@ -406,13 +491,13 @@
                                }
                        }
                        part{
-                               name: "elm.item.uneditable.color";
+                               name: "elm.item.disable.color";
                                type: RECT;
                                mouse_events: 0;
                                description{
                                        state: "default" 0.0;
                                        visible: 0;
-                                       color: 25 25 25 255;
+                                       color: 151 144 139 255;
                                }
                        }
                }
@@ -480,6 +565,62 @@
                                action: STATE_SET "default" 0.0;
                                target: "bg_img";
                        }
+                       program {
+                               name: "left_line_show";
+                               signal: "elm,state,left_line_show";
+                               source: "elm";
+                               action: STATE_SET "show" 0.0;
+                               target: "left_line";
+                       }
+                       program {
+                               name: "left_line_hide";
+                               signal: "elm,state,left_line_hide";
+                               source: "elm";
+                               action: STATE_SET "default" 0.0;
+                               target: "left_line";
+                       }
+                       program {
+                               name: "right_line_show";
+                               signal: "elm,state,right_line_show";
+                               source: "elm";
+                               action: STATE_SET "show" 0.0;
+                               target: "right_line";
+                       }
+                       program {
+                               name: "right_line_hide";
+                               signal: "elm,state,right_line_hide";
+                               source: "elm";
+                               action: STATE_SET "default" 0.0;
+                               target: "right_line";
+                       }
+                       program {
+                               name: "top_line_show";
+                               signal: "elm,state,top_line_show";
+                               source: "elm";
+                               action: STATE_SET "show" 0.0;
+                               target: "top_line";
+                       }
+                       program {
+                               name: "top_line_hide";
+                               signal: "elm,state,top_line_hide";
+                               source: "elm";
+                               action: STATE_SET "default" 0.0;
+                               target: "top_line";
+                       }
+                       program {
+                               name: "bottom_line_show";
+                               signal: "elm,state,bottom_line_show";
+                               source: "elm";
+                               action: STATE_SET "show" 0.0;
+                               target: "bottom_line";
+                       }
+                       program {
+                               name: "bottom_line_hide";
+                               signal: "elm,state,bottom_line_hide";
+                               source: "elm";
+                               action: STATE_SET "default" 0.0;
+                               target: "bottom_line";
+                       }
                }
        }
 
@@ -620,7 +761,7 @@
        group{
                name: "elm/controlbar/item_bg_move/default";
                images{
-                       image: "00_winset_tab_focus.png" COMP;
+                       image: "00_winset_tabbar_focus.png" COMP;
                }
 
                parts{
@@ -633,8 +774,8 @@
                                        visible: 1;
                                        rel1 {relative: 0.0 0.0; offset: 0 0;}
                                        rel2 {relative: 1.0 1.0; offset: 0 0;}
-                                       image.normal: "00_winset_tab_focus.png";
-                                       image.border: 7 7 7 0;
+                                       image.normal: "00_winset_tabbar_focus.png";
+                                       image.border: 2 2 2 2;
                                }
                        }
                }
@@ -643,7 +784,7 @@
        group{
                name: "elm/controlbar/item_bg_move_left/default";
                images{
-                       image: "00_winset_tab_focus_left.png" COMP;
+                       image: "00_winset_tabbar_focus.png" COMP;
                }
 
                parts{
@@ -654,8 +795,8 @@
                                description{
                                        state: "default" 0.0;
                                        visible: 1;
-                                       image.normal: "00_winset_tab_focus_left.png";
-                                       image.border: 0 7 7 7;
+                                       image.normal: "00_winset_tabbar_focus.png";
+                                       image.border: 2 2 2 2;
                                }
                        }
                }
@@ -664,7 +805,7 @@
        group{
                name: "elm/controlbar/item_bg_move_right/default";
                images{
-                       image: "00_winset_tab_focus_right.png" COMP;
+                       image: "00_winset_tabbar_focus.png" COMP;
                }
 
                parts{
@@ -675,8 +816,8 @@
                                description{
                                        state: "default" 0.0;
                                        visible: 1;
-                                       image.normal: "00_winset_tab_focus_right.png";
-                                       image.border: 7 0 7 7;
+                                       image.normal: "00_winset_tabbar_focus.png";
+                                       image.border: 2 2 2 2;
                                }
                        }
                }

diff --git a/themes/images/nbeat/00_winset_control_tabbar_bg.png b/themes/images/nbeat/00_winset_control_tabbar_bg.png
new file mode 100755 (executable)
index 0000000..6acbf92
Binary files /dev/null and b/themes/images/nbeat/00_winset_control_tabbar_bg.png differ

diff --git a/themes/images/nbeat/00_winset_control_tabbar_left_bg.png b/themes/images/nbeat/00_winset_control_tabbar_left_bg.png
new file mode 100755 (executable)
index 0000000..37f0951
Binary files /dev/null and b/themes/images/nbeat/00_winset_control_tabbar_left_bg.png differ

diff --git a/themes/images/nbeat/00_winset_control_tabbar_right_bg.png b/themes/images/nbeat/00_winset_control_tabbar_right_bg.png
new file mode 100755 (executable)
index 0000000..6cc1a71
Binary files /dev/null and b/themes/images/nbeat/00_winset_control_tabbar_right_bg.png differ

diff --git a/themes/images/nbeat/00_winset_control_toolbar_bg.png b/themes/images/nbeat/00_winset_control_toolbar_bg.png
new file mode 100755 (executable)
index 0000000..7301699
Binary files /dev/null and b/themes/images/nbeat/00_winset_control_toolbar_bg.png differ

diff --git a/themes/images/nbeat/00_winset_control_top_bg.png b/themes/images/nbeat/00_winset_control_top_bg.png
new file mode 100755 (executable)
index 0000000..a5d8d2c
Binary files /dev/null and b/themes/images/nbeat/00_winset_control_top_bg.png differ

diff --git a/themes/images/nbeat/00_winset_tabbar_focus.png b/themes/images/nbeat/00_winset_tabbar_focus.png
new file mode 100755 (executable)
index 0000000..0f4d2a8
Binary files /dev/null and b/themes/images/nbeat/00_winset_tabbar_focus.png differ

diff --git a/themes/images/nbeat/00_winset_toolbar_press.png b/themes/images/nbeat/00_winset_toolbar_press.png
old mode 100644 (file)
new mode 100755 (executable)
index ee6158f..c43400f
Binary files a/themes/images/nbeat/00_winset_toolbar_press.png and b/themes/images/nbeat/00_winset_toolbar_press.png differ