Merge "Add the more panel feature." into intefl/surc

5 files changed, 186 insertions, 6 deletions

diff --git a/themes/images/tizen-hd/00_tab_move_bg.png b/themes/images/tizen-hd/00_tab_move_bg.png
new file mode 100755
index 00000000..0ee3ab3d
--- /dev/null
+++ b/themes/images/tizen-hd/00_tab_move_bg.png
diff --git a/themes/images/tizen-hd/00_winset_control_tab_h_line_h.png b/themes/images/tizen-hd/00_winset_control_tab_h_line_h.png
new file mode 100755
index 00000000..4c8900dc
--- /dev/null
+++ b/themes/images/tizen-hd/00_winset_control_tab_h_line_h.png
diff --git a/themes/images/tizen-hd/00_winset_control_tab_line.png b/themes/images/tizen-hd/00_winset_control_tab_line.png
new file mode 100755
index 00000000..1a67a298
--- /dev/null
+++ b/themes/images/tizen-hd/00_winset_control_tab_line.png
diff --git a/themes/images/tizen-hd/00_winset_title_tabbar_bg.png b/themes/images/tizen-hd/00_winset_title_tabbar_bg.png
new file mode 100755
index 00000000..4c34b68d
--- /dev/null
+++ b/themes/images/tizen-hd/00_winset_title_tabbar_bg.png
diff --git a/themes/widgets/toolbar.edc b/themes/widgets/toolbar.edc
index 697296d7..460bf003 100644
--- a/themes/widgets/toolbar.edc
+++ b/themes/widgets/toolbar.edc
@@ -485,7 +485,7 @@ group { name: "elm/toolbar/item/default";
          transition: LINEAR 0.1;
       }
       program { name: "go";
-         signal:  "mouse,up,1";
+         signal:  "mouse,clicked,1";
          source:  "event";
          action:  SIGNAL_EMIT "elm,action,click" "elm";
       }
@@ -899,14 +899,14 @@ group { name: "elm/toolbar/object/default";
 group { name: "elm/toolbar/base/tabbar";
    alias: "elm/toolbar/base/tabbar/item_horizontal";
    images {
-      image: "00_winset_control_tabbar_bg_top.png" COMP;
+      image: "00_winset_title_tabbar_bg.png" COMP;
    }
 
    parts {
       part { name: "base";
          mouse_events: 1;
          description { state: "default" 0.0;
-            image.normal: "00_winset_control_tabbar_bg_top.png";
+            image.normal: "00_winset_title_tabbar_bg.png";
          }
       }
       part { name: "clipper";
@@ -944,9 +944,176 @@ group { name: "elm/toolbar/base/tabbar";
    }
 }
 
+group { name: "elm/toolbar/more/tabbar";
+   images {
+      image: "00_winset_control_tab_h_line_h.png" COMP;
+   }
+   parts {
+      part { name: "base";
+         mouse_events: 1;
+         description { state: "default" 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.0;
+            image.normal: "00_winset_title_tabbar_bg.png";
+         }
+         description { state: "open" 0.0;
+            inherit: "default" 0.0;
+            rel2.relative: 1.0 1.0;
+         }
+         description { state: "open2" 0.0;
+            inherit: "default" 0.0;
+            rel2.relative: 1.0 2.0;
+         }
+      }
+      part { name: "clipper";
+         type: RECT;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            fixed: 1 1;
+            rel1 {
+               to: "base";
+            }
+            rel2 {
+               to: "base";
+            }
+         }
+         description { state: "open" 0.0;
+            inherit: "default" 0.0;
+            rel2.relative: 1.0 1.0;
+         }
+         description { state: "open2" 0.0;
+            inherit: "default" 0.0;
+            rel2.relative: 1.0 0.5;
+         }
+      }
+      part { name: "clipper2";
+         type: RECT;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            fixed: 1 1;
+            rel1 {
+               relative: 0.0 0.5;
+               to: "base";
+            }
+            rel2 {
+               to: "base";
+            }
+         }
+         description { state: "open" 0.0;
+            inherit: "default" 0.0;
+            rel1.relative: 0.0 1.0;
+         }
+         description { state: "open2" 0.0;
+            inherit: "default" 0.0;
+            rel1.relative: 0.0 0.5;
+         }
+      }
+      part { name: "elm.swallow.content";
+         clip_to: "clipper";
+         type: SWALLOW;
+         description {
+            state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "clipper";
+            rel2.to: "clipper";
+         }
+      }
+      part { name: "elm.swallow.content2";
+         clip_to: "clipper2";
+         type: SWALLOW;
+         description {
+            state: "default" 0.0;
+            fixed: 1 1;
+            rel1.to: "clipper2";
+            rel2.to: "clipper2";
+         }
+      }
+      part { name: "separator";
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            min: 2 3;
+            max: 9999 3;
+            fixed: 1 1;
+            rel1 {
+                relative: 0.0 0.0;
+                offset: 0 0;
+                to: "clipper";
+            }
+            rel2 {
+                relative: 1.0 0.0;
+                offset: -1 3;
+                to: "clipper";
+            }
+            image {
+               normal: "00_winset_control_tab_h_line_h.png";
+               border: 1 1 1 1;
+            }
+            fill {
+               smooth: 0;
+            }
+         }
+      }
+      part { name: "separator2";
+         clip_to: "clipper2";
+         description { state: "default" 0.0;
+            min: 2 3;
+            max: 9999 3;
+            fixed: 1 1;
+            rel1 {
+                relative: 0.0 0.0;
+                offset: 0 0;
+                to: "clipper2";
+            }
+            rel2 {
+                relative: 1.0 0.0;
+                offset: -1 3;
+                to: "clipper2";
+            }
+            image {
+               normal: "00_winset_control_tab_h_line_h.png";
+               border: 1 1 1 1;
+            }
+            fill {
+               smooth: 0;
+            }
+         }
+      }
+   }
+   programs {
+      program { name: "open";
+         signal:  "elm,state,open";
+         source:  "elm";
+         action:  STATE_SET "open" 0.0;
+         target:  "base";
+         target:  "clipper";
+         target:  "clipper2";
+         transition: LINEAR 0.2;
+      }
+      program { name: "open2";
+         signal:  "elm,state,open2";
+         source:  "elm";
+         action:  STATE_SET "open2" 0.0;
+         target:  "base";
+         target:  "clipper";
+         target:  "clipper2";
+         transition: LINEAR 0.2;
+      }
+      program { name: "close";
+         signal:  "elm,state,close";
+         source:  "elm";
+         action:  STATE_SET "default" 0.0;
+         target:  "base";
+         transition: LINEAR 0.2;
+      }
+   }
+}
+
 group { name: "elm/toolbar/item/tabbar";
    images {
       image: "00_winset_tabbar_focus.png" COMP;
+      image: "00_tab_move_bg.png" COMP;
    }
 
    data.item: "transition_animation_on" "1";
@@ -975,6 +1142,13 @@ group { name: "elm/toolbar/item/tabbar";
             visible: 0;
             color: 255 255 255 0;
          }
+         description { state: "moving" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            image.normal: "00_tab_move_bg.png";
+            image.border: 10 10 10 10;
+            color: 255 255 255 255;
+         }
       }
       part { name: "padding_left_top";
             type: RECT;
@@ -1341,8 +1515,14 @@ group { name: "elm/toolbar/item/tabbar";
          action:  STATE_SET "default" 0.0;
          target:  "bg";
          transition: LINEAR 0.1;
-      }/*
-         program { name: "pressed";
+      }
+      program { name: "moving";
+         signal:  "elm,state,moving";
+         source:  "elm";
+         action:  STATE_SET "moving" 0.0;
+         target:  "bg";
+      }
+/*    program { name: "pressed";
          signal:  "mouse,down,1";
          source:  "event";
          action:  STATE_SET "selected" 0.0;
@@ -1361,7 +1541,7 @@ group { name: "elm/toolbar/item/tabbar";
          transition: LINEAR 0.1;
       }*/
       program { name: "go";
-         signal:  "mouse,up,1";
+         signal:  "mouse,clicked,1";
          source:  "event";
          action:  SIGNAL_EMIT "elm,action,click" "elm";
       }