[*][controlbar] apply GUI v0.5, but images are in v0.2. add 'top' style.

Change-Id: If8b626247a35848abb682df5e0b016492a044c8a

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index c279b67..965c733 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -7716,6 +7716,7 @@
             }
             description { state: "icononly" 0.0;
                inherit: "default" 0.0;
+               min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
             }
          }
          part {

diff --git a/themes/groups/controlbar.edc b/themes/groups/controlbar.edc
index be57417..02d94cd 100644 (file)
--- a/themes/groups/controlbar.edc
+++ b/themes/groups/controlbar.edc
@@ -75,6 +75,20 @@
 // controlbar
 ///////////////////////////////////////////////////////////////////////////////////////
 
+       images{
+               image: "00_winset_control_toolbar_bg.png" COMP;
+               image: "00_winset_control_tabbar_bg.png" COMP;
+               image: "00_winset_control_tabbar_bg_left.png" COMP;
+               image: "00_winset_control_tabbar_bg_right.png" COMP;
+               image: "00_winset_control_tabbar_bg_top.png" COMP;
+               image: "00_winset_tabbar_press.png" COMP;
+               image: "00_winset_tabbar_press_left.png" COMP;
+               image: "00_winset_tabbar_press_right.png" COMP;
+               image: "00_winset_tabbar_press_top.png" COMP;
+               image: "00_winset_toolbar_press.png" COMP;
+               image: "00_winset_tabbar_focus.png" COMP;
+       }
+
        group{
                name: "elm/controlbar/base/default";
 
@@ -93,6 +107,17 @@
                                }
                        }
                        part{
+                               name: "elm.swallow.view";
+                               type: SWALLOW;
+                               scale: 1;
+                               mouse_events: 1;
+                               description{
+                                       state: "default" 0.0;
+                                       rel1 {relative: 0.0 0.0;}
+                                       rel2 {relative: 1.0 0.0; to: "bg_image";}
+                               }
+                       }
+                       part{
                                name: "bg_image";
                                type: SWALLOW;
                                scale: 1;
@@ -212,13 +237,6 @@
        group{
                name: "elm/controlbar/background/default";
 
-               images{
-                       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{
                        part{
                                name: "bg_image";
@@ -240,12 +258,12 @@
                                description{
                                        state: "tabbar_left" 0.0;
                                        inherit: "default" 0.0;
-                                       image.normal: "00_winset_control_tabbar_left_bg.png";
+                                       image.normal: "00_winset_control_tabbar_bg_left.png";
                                }
                                description{
                                        state: "tabbar_right" 0.0;
                                        inherit: "default" 0.0;
-                                       image.normal: "00_winset_control_tabbar_right_bg.png";
+                                       image.normal: "00_winset_control_tabbar_bg_right.png";
                                }
                        }
                        programs {
@@ -310,15 +328,6 @@
 
        group{
                name: "elm/controlbar/item_bg/default";
-               images{
-                       image: "00_winset_tabbar_press.png" COMP;
-                       image: "00_winset_tabbar_press_left.png" COMP;
-                       image: "00_winset_tabbar_press_right.png" COMP;
-                       image: "00_winset_toolbar_press.png" COMP;
-                       image: "00_winset_tabbar_focus.png" COMP;
-                       image: "00_winset_tabbar_focus_left.png" COMP;
-                       image: "00_winset_tabbar_focus_right.png" COMP;
-               }
 
                parts{
                        part{
@@ -383,7 +392,7 @@
                                description{
                                        state: "focused_left" 0.0;
                                        inherit: "default" 0.0;
-                                       image.normal: "00_winset_tabbar_focus_left.png";
+                                       image.normal: "00_winset_tabbar_focus.png";
                                        image.border: 2 3 2 2;
                                        visible: 1;
                                        fill.smooth: 0;
@@ -391,7 +400,7 @@
                                description{
                                        state: "focused_right" 0.0;
                                        inherit: "default" 0.0;
-                                       image.normal: "00_winset_tabbar_focus_right.png";
+                                       image.normal: "00_winset_tabbar_focus.png";
                                        image.border: 3 2 2 2;
                                        visible: 1;
                                        fill.smooth: 0;
@@ -402,7 +411,7 @@
                                        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: 2 2 2 2;
+                                       image.border: 3 3 3 3;
                                        visible: 1;
                                        fill.smooth: 0;
                                }
@@ -616,11 +625,6 @@
 
        group{
                name: "elm/controlbar/item_bg_move/default";
-               images{
-                       image: "00_winset_tabbar_focus.png" COMP;
-                       image: "00_winset_tabbar_focus_left.png" COMP;
-                       image: "00_winset_tabbar_focus_right.png" COMP;
-               }
 
                parts{
                        part{
@@ -676,6 +680,93 @@
                }
        }
 
+    group{
+               name: "elm/controlbar/base/top";
+               inherit: "elm/controlbar/base/default";
+
+               parts{
+                       part{
+                               name: "elm.swallow.view";
+                               description{
+                                       state: "default" 0.0;
+                                       rel1 {relative: 0.0 1.0; to: "bg_image";}
+                                       rel2 {relative: 1.0 1.0; to: "";}
+                               }
+                       }
+                       part{
+                               name: "bg_image";
+                               description{
+                                       state: "large" 0.0;
+                                       align: 0.5 0.0;
+                                       rel1.relative: 0.0 0.0;
+                                       rel2.relative: 1.0 0.0;
+                               }
+                               description{
+                                       state: "small" 0.0;
+                                       align: 0.5 0.0;
+                                       rel1.relative: 0.0 0.0;
+                                       rel2.relative: 1.0 0.0;
+                               }
+                       }
+                       part{
+                               name: "elm.dragable.box";
+                               source: "elm/controlbar/item_bg_move/top";
+                       }
+               }
+       }
+
+       group{
+               name: "elm/controlbar/background/top";
+               inherit: "elm/controlbar/background/default";
+
+               parts{
+                       part{
+                               name: "bg_image";
+                               description{
+                                       state: "tabbar" 0.0;
+                                       image.normal: "00_winset_control_tabbar_bg_top.png";
+                               }
+                       }
+               }
+       }
+
+       group{
+               name: "elm/controlbar/item_bg/top";
+               inherit: "elm/controlbar/item_bg/default";
+
+               parts{
+                       part{
+                               name: "bg_img";
+                               description{
+                                       state: "pressed" 0.0;
+                                       image.normal: "00_winset_tabbar_press_top.png";
+                                       image.border: 2 2 2 3;
+                               }
+                               description{
+                                       state: "focused" 0.0;
+                                       image.normal: "00_winset_tabbar_focus.png";
+                                       image.border: 2 2 2 3;
+                               }
+                       }
+               }
+       }
+
+       group{
+               name: "elm/controlbar/item_bg_move/top";
+               inherit: "elm/controlbar/item_bg_move/default";
+
+               parts{
+                       part{
+                               name: "selected_box";
+                               description{
+                                       state: "default" 0.0;
+                                       image.normal: "00_winset_tabbar_focus.png";
+                                       image.border: 2 2 2 3;
+                               }
+                       }
+               }
+       }
+
        group{
                name: "elm/controlbar/base/navigationbar";
 
@@ -958,7 +1049,7 @@
                                        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: 2 2 2 2;
+                                       image.border: 3 3 3 3;
                                        visible: 1;
                                }
                        }
@@ -1451,7 +1542,7 @@
                                        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: 2 2 2 2;
+                                       image.border: 3 3 3 3;
                                        visible: 1;
                                }
                        }

diff --git a/themes/images/nbeat-black/00_winset_control_tabbar_left_bg.png b/themes/images/nbeat-black-hd/00_winset_control_tabbar_bg_left.png
similarity index 100%
rename from themes/images/nbeat-black/00_winset_control_tabbar_left_bg.png
rename to themes/images/nbeat-black-hd/00_winset_control_tabbar_bg_left.png

diff --git a/themes/images/nbeat-black/00_winset_control_tabbar_right_bg.png b/themes/images/nbeat-black-hd/00_winset_control_tabbar_bg_right.png
similarity index 100%
rename from themes/images/nbeat-black/00_winset_control_tabbar_right_bg.png
rename to themes/images/nbeat-black-hd/00_winset_control_tabbar_bg_right.png

diff --git a/themes/images/nbeat-black-hd/00_winset_control_tabbar_bg_top.png b/themes/images/nbeat-black-hd/00_winset_control_tabbar_bg_top.png
new file mode 100644 (file)
index 0000000..386fc3d
Binary files /dev/null and b/themes/images/nbeat-black-hd/00_winset_control_tabbar_bg_top.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_tabbar_press_top.png b/themes/images/nbeat-black-hd/00_winset_tabbar_press_top.png
new file mode 100644 (file)
index 0000000..28d74b6
Binary files /dev/null and b/themes/images/nbeat-black-hd/00_winset_tabbar_press_top.png differ

diff --git a/themes/images/nbeat-black-hd/00_winset_control_tabbar_left_bg.png b/themes/images/nbeat-black/00_winset_control_tabbar_bg_left.png
similarity index 100%
rename from themes/images/nbeat-black-hd/00_winset_control_tabbar_left_bg.png
rename to themes/images/nbeat-black/00_winset_control_tabbar_bg_left.png

diff --git a/themes/images/nbeat-black-hd/00_winset_control_tabbar_right_bg.png b/themes/images/nbeat-black/00_winset_control_tabbar_bg_right.png
similarity index 100%
rename from themes/images/nbeat-black-hd/00_winset_control_tabbar_right_bg.png
rename to themes/images/nbeat-black/00_winset_control_tabbar_bg_right.png

diff --git a/themes/images/nbeat-black/00_winset_control_tabbar_bg_top.png b/themes/images/nbeat-black/00_winset_control_tabbar_bg_top.png
new file mode 100644 (file)
index 0000000..3cee633
Binary files /dev/null and b/themes/images/nbeat-black/00_winset_control_tabbar_bg_top.png differ

diff --git a/themes/images/nbeat-black/00_winset_tabbar_focus.png b/themes/images/nbeat-black/00_winset_tabbar_focus.png
index edcb394..4939d61 100755 (executable)
Binary files a/themes/images/nbeat-black/00_winset_tabbar_focus.png and b/themes/images/nbeat-black/00_winset_tabbar_focus.png differ

diff --git a/themes/images/nbeat-black/00_winset_tabbar_press_top.png b/themes/images/nbeat-black/00_winset_tabbar_press_top.png
new file mode 100644 (file)
index 0000000..a674a25
Binary files /dev/null and b/themes/images/nbeat-black/00_winset_tabbar_press_top.png differ

diff --git a/themes/images/nbeat-black/00_winset_toolbar_press.png b/themes/images/nbeat-black/00_winset_toolbar_press.png
index 172f666..a7ee03d 100755 (executable)
Binary files a/themes/images/nbeat-black/00_winset_toolbar_press.png and b/themes/images/nbeat-black/00_winset_toolbar_press.png differ

diff --git a/themes/images/nbeat/00_winset_control_tabbar_left_bg.png b/themes/images/nbeat-hd/00_winset_control_tabbar_bg_left.png
similarity index 100%
rename from themes/images/nbeat/00_winset_control_tabbar_left_bg.png
rename to themes/images/nbeat-hd/00_winset_control_tabbar_bg_left.png

diff --git a/themes/images/nbeat/00_winset_control_tabbar_right_bg.png b/themes/images/nbeat-hd/00_winset_control_tabbar_bg_right.png
similarity index 100%
rename from themes/images/nbeat/00_winset_control_tabbar_right_bg.png
rename to themes/images/nbeat-hd/00_winset_control_tabbar_bg_right.png

diff --git a/themes/images/nbeat-hd/00_winset_control_tabbar_bg_top.png b/themes/images/nbeat-hd/00_winset_control_tabbar_bg_top.png
new file mode 100644 (file)
index 0000000..9964a82
Binary files /dev/null and b/themes/images/nbeat-hd/00_winset_control_tabbar_bg_top.png differ

diff --git a/themes/images/nbeat-hd/00_winset_tabbar_focus.png b/themes/images/nbeat-hd/00_winset_tabbar_focus.png
index 50c60b5..5b8de58 100755 (executable)
Binary files a/themes/images/nbeat-hd/00_winset_tabbar_focus.png and b/themes/images/nbeat-hd/00_winset_tabbar_focus.png differ

diff --git a/themes/images/nbeat-hd/00_winset_tabbar_press_top.png b/themes/images/nbeat-hd/00_winset_tabbar_press_top.png
new file mode 100644 (file)
index 0000000..79e6a2e
Binary files /dev/null and b/themes/images/nbeat-hd/00_winset_tabbar_press_top.png differ

diff --git a/themes/images/nbeat-hd/00_winset_toolbar_press.png b/themes/images/nbeat-hd/00_winset_toolbar_press.png
index 25ba453..e04d885 100755 (executable)
Binary files a/themes/images/nbeat-hd/00_winset_toolbar_press.png and b/themes/images/nbeat-hd/00_winset_toolbar_press.png differ

diff --git a/themes/images/nbeat-hd/00_winset_control_tabbar_left_bg.png b/themes/images/nbeat/00_winset_control_tabbar_bg_left.png
similarity index 100%
rename from themes/images/nbeat-hd/00_winset_control_tabbar_left_bg.png
rename to themes/images/nbeat/00_winset_control_tabbar_bg_left.png

diff --git a/themes/images/nbeat-hd/00_winset_control_tabbar_right_bg.png b/themes/images/nbeat/00_winset_control_tabbar_bg_right.png
similarity index 100%
rename from themes/images/nbeat-hd/00_winset_control_tabbar_right_bg.png
rename to themes/images/nbeat/00_winset_control_tabbar_bg_right.png

diff --git a/themes/images/nbeat/00_winset_control_tabbar_bg_top.png b/themes/images/nbeat/00_winset_control_tabbar_bg_top.png
new file mode 100644 (file)
index 0000000..6e0e0a3
Binary files /dev/null and b/themes/images/nbeat/00_winset_control_tabbar_bg_top.png differ

diff --git a/themes/images/nbeat/00_winset_tabbar_focus.png b/themes/images/nbeat/00_winset_tabbar_focus.png
index 50c60b5..5b8de58 100755 (executable)
Binary files a/themes/images/nbeat/00_winset_tabbar_focus.png and b/themes/images/nbeat/00_winset_tabbar_focus.png differ

diff --git a/themes/images/nbeat/00_winset_tabbar_press_top.png b/themes/images/nbeat/00_winset_tabbar_press_top.png
new file mode 100644 (file)
index 0000000..f1b994e
Binary files /dev/null and b/themes/images/nbeat/00_winset_tabbar_press_top.png differ

diff --git a/themes/images/nbeat/00_winset_toolbar_press.png b/themes/images/nbeat/00_winset_toolbar_press.png
index 25ba453..e04d885 100755 (executable)
Binary files a/themes/images/nbeat/00_winset_toolbar_press.png and b/themes/images/nbeat/00_winset_toolbar_press.png differ