Tizen 2.4.0 rev3 SDK Public Release tizen_2.4
authorjk7744.park <jk7744.park@samsung.com>
Wed, 24 Feb 2016 09:35:12 +0000 (18:35 +0900)
committerjk7744.park <jk7744.park@samsung.com>
Wed, 24 Feb 2016 09:35:12 +0000 (18:35 +0900)
34 files changed:
mobile/HD-inc.edc
mobile/HD/images/Copy_Paste/copy&paste_handler_bottom_center.png [deleted file]
mobile/HD/images/Copy_Paste/copy&paste_handler_bottom_l.png [deleted file]
mobile/HD/images/Copy_Paste/copy&paste_handler_bottom_r.png [deleted file]
mobile/HD/images/Copy_Paste/copy&paste_handler_center.png [new file with mode: 0644]
mobile/HD/images/Copy_Paste/copy&paste_handler_left_bottom.png [new file with mode: 0644]
mobile/HD/images/Copy_Paste/copy&paste_handler_left_top.png [new file with mode: 0644]
mobile/HD/images/Copy_Paste/copy&paste_handler_right_bottom.png [new file with mode: 0644]
mobile/HD/images/Copy_Paste/copy&paste_handler_right_top.png [new file with mode: 0644]
mobile/HD/images/Copy_Paste/copy&paste_handler_top_center.png [deleted file]
mobile/HD/images/Copy_Paste/copy&paste_handler_top_l.png [deleted file]
mobile/HD/images/Copy_Paste/copy&paste_handler_top_r.png [deleted file]
mobile/HD/images/Navigation_elements/core_page_indicator_off.png [changed mode: 0755->0644]
mobile/HD/images/Navigation_elements/core_page_indicator_off_ef.png [deleted file]
mobile/HD/images/Navigation_elements/core_page_indicator_on.png [changed mode: 0755->0644]
mobile/HD/images/Navigation_elements/core_page_indicator_on_ef.png [deleted file]
mobile/HD/images/core_theme_bg_01.png
mobile/widgets/button.edc
mobile/widgets/calendar.edc
mobile/widgets/check.edc
mobile/widgets/colorselector.edc
mobile/widgets/conform.edc
mobile/widgets/ctxpopup.edc
mobile/widgets/entry.edc
mobile/widgets/gengrid.edc
mobile/widgets/genlist.edc
mobile/widgets/index.edc
mobile/widgets/list.edc
mobile/widgets/naviframe.edc
mobile/widgets/popup.edc
mobile/widgets/slider.edc
mobile/widgets/toolbar.edc
mobile/widgets_default/panes.edc
packaging/efl-theme-tizen.spec

index 63a110c..236e40f 100644 (file)
@@ -47,7 +47,7 @@
 // Colorselector
 //****************************************************************************//
 #define COLORSELECTOR_PALETTE_COLORPLANE_HEIGHT_INC 238
-#define COLORSELECTOR_PALETTE_COLORPLANE_WIDTH_INC 678
+#define COLORSELECTOR_PALETTE_COLORPLANE_WIDTH_INC 720
 #define COLORSELECTOR_PORTRAIT_HOR_PAD_COLORPLANE_INC "8"
 #define COLORSELECTOR_PORTRAIT_VER_PAD_COLORPLANE_INC "8"
 #define COLORSELECTOR_PALETTE_COLORBG_MIN_COLORPLANE_INC 90 90
 //****************************************************************************//
 // Layout
 //****************************************************************************//
-#define LAYOUT_INDICATOR_HEIGHT_INC 52
 #define SEARCHBAR_CANCEL_BUTTON_W_INC 30
 #define SEARCHBAR_CANCEL_BUTTON_LEFT_PADDING_INC 10
 #define SEARCHBAR_H_INC 63
 #define CTXPOPUP_COPYPASTE_ITEM_TEXT_STYLE_TEXT_TOP_PADDING_INC 13
 #define CTXPOPUP_COPYPASTE_ITEM_TEXT_BOTTOM_PADDING_INC 14
 #define CTXPOPUP_COPYPASTE_SEPARATOR_TEXT_STYLE_MIN_SIZE_INC 2 CTXPOPUP_COPYPASTE_ITEM_HEIGHT_MIN_INC
-#define CTXPOPUP_COPYPASTE_ARROW_SIZE_INC 1 1
 
 //****************************************************************************//
 // Tabbar
 #define SCROLLER_TABBAR_SCROLLBAR_HBAR_MIN_SIZE_INC 22 SCROLLER_TABBAR_SCROLLBAR_HBAR_HEIGHT
 #define SCROLLER_TABBAR_SCROLLBAR_HBAR_MAX_SIZE_INC -1 SCROLLER_TABBAR_SCROLLBAR_HBAR_HEIGHT
 
-#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_PADDING_SIZE 6
-#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_PADDING_SIZE 6
+#define SCROLLER_DEFAULT_SCROLLBAR_VBAR_PADDING_SIZE 11
+#define SCROLLER_DEFAULT_SCROLLBAR_HBAR_PADDING_SIZE 11
 #define SCROLLER_LIST_EFFECT_SCROLLBAR_HBAR_TB_PADDING_SIZE_INC 5
 #define SCROLLER_LIST_EFFECT_SCROLLBAR_HBAR_LR_PADDING_SIZE_INC 12
 #define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIN_SIZE_INC 32 82
 #define SCROLLER_HANDLER_SCROLLBAR_VBAR_MIDDLE_MIN_SIZE_INC 32 32
 #define SCROLLER_HANDLER_SCROLLBAR_HBAR_MIDDLE_MIN_SIZE_INC 32 32
 
-#define SCROLLER_HANDLER_SCROLLBAR_VBAR_HEADER_SIZE 6
-#define SCROLLER_HANDLER_SCROLLBAR_VBAR_PADDING_SIZE 6
-#define SCROLLER_HANDLER_SCROLLBAR_HBAR_PADDING_SIZE 6
+#define SCROLLER_HANDLER_SCROLLBAR_VBAR_HEADER_SIZE 11
+#define SCROLLER_HANDLER_SCROLLBAR_VBAR_PADDING_SIZE 11
+#define SCROLLER_HANDLER_SCROLLBAR_HBAR_PADDING_SIZE 11
 
 #define SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MAX_SIZE 45
 #define SCROLLER_EFFECT_SHADOW_FIRST_LAYER_MIN_SIZE 30
 #define ENTRY_PREEDIT_SUB2_COLOR_INC "#9962C3"
 #define ENTRY_PREEDIT_SUB3_COLOR_INC "#76DE37"
 #define ENTRY_PREEDIT_SUB4_COLOR_INC "#999999"
-#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC 80
-#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC 80
-#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC 80*1.29
-#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC 80*1.29
+#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC 44
+#define ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC 44
 #define ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH 3
 #define ENTRY_SELECTION_BLOCK_HANDLE_EDGE_HEIGHT 23
-#define ENTRY_CURSOR_HANDLE_MIN_WIDTH_INC 80
-#define ENTRY_CURSOR_HANDLE_MIN_HEIGHT_INC 80
-#define ENTRY_CURSOR_HANDLE_MIN_WIDTH_ZOOM_INC 80*1.29
-#define ENTRY_CURSOR_HANDLE_MIN_HEIGHT_ZOOM_INC 80*1.29
-#define ENTRY_CURSOR_SIZE_INC 3 0
+#define ENTRY_CURSOR_HANDLE_MIN_WIDTH_INC 44
+#define ENTRY_CURSOR_HANDLE_MIN_HEIGHT_INC 44
+#define ENTRY_CURSOR_SIZE_INC 2 0
 #define MAGNIFIER_WIDTH_FIXED_INC 226
 #define MAGNIFIER_HEIGHT_MIN 96
 #define MAGNIFIER_HEIGHT_MAX 118
 #define GRID_POPUP_PADDING_LEFT_TOP_SIZE         31 6
 #define GRID_POPUP_PADDING_RIGHT_BOTTOM_SIZE     31 6
 #define GRID_POPUP_PADDING_BOTTOM_SIZE           8 6
-#define GRID_POPUP_ITEM_REAL_BG_SIZE             100 123
-#define GRID_POPUP_SWALLOW_ICON_SIZE             19 19
+#define GRID_POPUP_ITEM_REAL_BG_SIZE             180 222
+#define GRID_POPUP_SWALLOW_ICON_SIZE             118 118
 #define GRID_POPUP_TEXT_HEIGHT                   86
-#define GRID_POPUP_TEXT_MIN_SIZE                 84
 #define GENGRID_POPUP_CONTENT_TOP_PADDING        24
 #define GENGRID_POPUP_CONTENT_BOTTOM_PADDING     24
 
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_bottom_center.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_bottom_center.png
deleted file mode 100644 (file)
index 9fb7341..0000000
Binary files a/mobile/HD/images/Copy_Paste/copy&paste_handler_bottom_center.png and /dev/null differ
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_bottom_l.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_bottom_l.png
deleted file mode 100644 (file)
index ea30705..0000000
Binary files a/mobile/HD/images/Copy_Paste/copy&paste_handler_bottom_l.png and /dev/null differ
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_bottom_r.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_bottom_r.png
deleted file mode 100644 (file)
index e70ff44..0000000
Binary files a/mobile/HD/images/Copy_Paste/copy&paste_handler_bottom_r.png and /dev/null differ
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_center.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_center.png
new file mode 100644 (file)
index 0000000..b618976
Binary files /dev/null and b/mobile/HD/images/Copy_Paste/copy&paste_handler_center.png differ
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_left_bottom.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_left_bottom.png
new file mode 100644 (file)
index 0000000..4ddb0d8
Binary files /dev/null and b/mobile/HD/images/Copy_Paste/copy&paste_handler_left_bottom.png differ
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_left_top.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_left_top.png
new file mode 100644 (file)
index 0000000..f7251a3
Binary files /dev/null and b/mobile/HD/images/Copy_Paste/copy&paste_handler_left_top.png differ
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_right_bottom.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_right_bottom.png
new file mode 100644 (file)
index 0000000..4ddb0d8
Binary files /dev/null and b/mobile/HD/images/Copy_Paste/copy&paste_handler_right_bottom.png differ
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_right_top.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_right_top.png
new file mode 100644 (file)
index 0000000..f7251a3
Binary files /dev/null and b/mobile/HD/images/Copy_Paste/copy&paste_handler_right_top.png differ
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_top_center.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_top_center.png
deleted file mode 100644 (file)
index 95c8262..0000000
Binary files a/mobile/HD/images/Copy_Paste/copy&paste_handler_top_center.png and /dev/null differ
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_top_l.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_top_l.png
deleted file mode 100644 (file)
index c127f7f..0000000
Binary files a/mobile/HD/images/Copy_Paste/copy&paste_handler_top_l.png and /dev/null differ
diff --git a/mobile/HD/images/Copy_Paste/copy&paste_handler_top_r.png b/mobile/HD/images/Copy_Paste/copy&paste_handler_top_r.png
deleted file mode 100644 (file)
index 2dad0ce..0000000
Binary files a/mobile/HD/images/Copy_Paste/copy&paste_handler_top_r.png and /dev/null differ
old mode 100755 (executable)
new mode 100644 (file)
index 2997644..2b33cbb
Binary files a/mobile/HD/images/Navigation_elements/core_page_indicator_off.png and b/mobile/HD/images/Navigation_elements/core_page_indicator_off.png differ
diff --git a/mobile/HD/images/Navigation_elements/core_page_indicator_off_ef.png b/mobile/HD/images/Navigation_elements/core_page_indicator_off_ef.png
deleted file mode 100755 (executable)
index 6aa0d17..0000000
Binary files a/mobile/HD/images/Navigation_elements/core_page_indicator_off_ef.png and /dev/null differ
old mode 100755 (executable)
new mode 100644 (file)
index 6fd8964..4c1ebbb
Binary files a/mobile/HD/images/Navigation_elements/core_page_indicator_on.png and b/mobile/HD/images/Navigation_elements/core_page_indicator_on.png differ
diff --git a/mobile/HD/images/Navigation_elements/core_page_indicator_on_ef.png b/mobile/HD/images/Navigation_elements/core_page_indicator_on_ef.png
deleted file mode 100755 (executable)
index 27a2ac9..0000000
Binary files a/mobile/HD/images/Navigation_elements/core_page_indicator_on_ef.png and /dev/null differ
index 477402f..be3057d 100644 (file)
Binary files a/mobile/HD/images/core_theme_bg_01.png and b/mobile/HD/images/core_theme_bg_01.png differ
index 869680f..c595d82 100644 (file)
                         set_state(PART:"clipper", "pressed", 0.0);
                         set_state(PART:"tizen_vg_shape2", "pressed", 0.0);
                         set_state(PART:"tizen_vg_shape_clipper2", "pressed", 0.0);
-                        set_int(animate, 0);
                         run_program(PROGRAM:"delay_unpressed_effect");
                      }
                      emit("elm,action,unpress", "");
                         set_state(PART:"clipper", "pressed", 0.0);
                         set_state(PART:"tizen_vg_shape2", "pressed", 0.0);
                         set_state(PART:"tizen_vg_shape_clipper2", "pressed", 0.0);
-                        set_int(animate, 0);
                         run_program(PROGRAM:"delay_unpressed_effect");
                      }
                   }
                      } else {
                         set_state(PART:"tizen_vg_shape", "pressed", 0.0);
                         set_state(PART:"tizen_vg_shape_clipper", "pressed", 0.0);
-                        set_int(animate, 0);
                         run_program(PROGRAM:"delay_unpressed_effect");
                      }
                      emit("elm,action,unpress", "");
             source: "event";
             script {
                if (get_int(multi_down) == 0) {
-                  if (get_int(disabled) == 0) {
-                     run_program(PROGRAM:"play_sound");
-                     run_program(PROGRAM:"clicked_signal");
-                  }
+                 run_program(PROGRAM:"play_sound");
+                 run_program(PROGRAM:"clicked_signal");
                }
             }
          }
                         set_state(PART:"tizen_vg_shape", "pressed", 0.0); \
                         set_state(PART:"tizen_vg_shape_clipper", "pressed", 0.0); \
                         set_state(PART:"button_center_part", "pressed", 0.0); \
-                        set_int(animate, 0); \
                         run_program(PROGRAM:"delay_unpressed_effect"); \
                      } \
                      emit("elm,action,unpress", ""); \
@@ -3073,7 +3067,6 @@ group { name: "elm/button/base/contacts";
                         set_state(PART:"tizen_vg_shape", "pressed", 0.0);
                         set_state(PART:"tizen_vg_shape_clipper", "pressed", 0.0);
                         set_state(PART:"elm.text", "pressed", 0.0);
-                        set_int(animate, 0);
                         run_program(PROGRAM:"delay_unpressed_effect");
                      }
                      emit("elm,action,unpress", "");
@@ -3086,10 +3079,8 @@ group { name: "elm/button/base/contacts";
             source: "event";
             script {
                if (get_int(multi_down) == 0) {
-                  if (get_int(disabled) == 0) {
-                     run_program(PROGRAM:"play_sound");
-                     run_program(PROGRAM:"clicked_signal");
-                  }
+                 run_program(PROGRAM:"play_sound");
+                 run_program(PROGRAM:"clicked_signal");
                }
             }
          }
@@ -3424,7 +3415,6 @@ group { name: "elm/button/base/contacts";
                      } else {
                         set_state(PART:"tizen_vg_shape", "pressed", 0.0);
                         set_state(PART:"tizen_vg_shape_clipper", "pressed", 0.0);
-                        set_int(animate, 0);
                         run_program(PROGRAM:"delay_unpressed_effect");
                      }
                      emit("elm,action,unpress", "");
@@ -4891,7 +4881,6 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus")
                         set_state(PART:"tizen_vg_shape", "pressed", 0.0);
                         set_state(PART:"tizen_vg_shape_clipper", "pressed", 0.0);
                         set_state(PART:"arrow.image", "pressed", 0.0);
-                        set_int(animate, 0);
                         run_program(PROGRAM:"delay_unpressed_effect");
                      }
                      emit("elm,action,unpress", "");
@@ -5730,7 +5719,6 @@ group { name: "elm/button/base/hoversel_vertical/default";
                      set_state(PART:"elm.text", "pressed", 0.0);
                      set_state(PART:"button_image", "pressed", 0.0);
                      set_state(PART:"press_effect", "pressed", 0.0);
-                     set_int(animate, 0);
                      run_program(PROGRAM:"delay_unpressed_effect");
                   }
                   emit("elm,action,unpress", "");
index 626cc3c..e57f762 100644 (file)
          }\
       }\
       programs {\
+         program {\
+            signal: "mouse,down,1"; source: "left_bt"#_sufix;\
+            action: SIGNAL_EMIT "elm,action,decrement,start"#_signal_sufix "elm";\
+         }\
+         program {\
+            signal: "mouse,up,1"; source: "left_bt"#_sufix;\
+            action: SIGNAL_EMIT "elm,action,stop"#_signal_sufix "elm"; \
+         }\
+         program {\
+            signal: "mouse,down,1"; source: "right_bt"#_sufix;\
+            action: SIGNAL_EMIT "elm,action,increment,start"#_signal_sufix "elm";\
+         }\
+         program {\
+            signal: "mouse,up,1"; source: "right_bt"#_sufix;\
+            action: SIGNAL_EMIT "elm,action,stop"#_signal_sufix "elm";     \
+         }\
          program { name:   "rtl"#_sufix;\
             signal: "edje,state,rtl"; source: "edje";\
             script {\
                set_state(PART:"right_bt"#_sufix"_swallow", "default", 0.0);\
             }\
          }\
+         program {\
+            signal: "mouse,clicked,1"; \
+            source: "left_bt"#_sufix; \
+            script { \
+               run_program(PROGRAM:"touch_sound"); \
+            } \
+         } \
+         program {\
+            signal: "mouse,clicked,1"; \
+            source: "right_bt"#_sufix; \
+            script { \
+               run_program(PROGRAM:"touch_sound"); \
+            } \
+         } \
          program { \
             name: "touch_sound"; \
             action: RUN_PLUGIN "touch_sound"; \
          text.style: "calendar_date_holiday_disabled_style"; \
       } \
    } \
+   part { name: "cit_"#_pos".check"; \
+      type: RECT; \
+      mouse_events: 0; \
+      scale: 1; \
+      description { state: "default" 0.0; \
+         fixed: 1 1; \
+         rel1 { \
+            to: "cit_"#_pos".rect"; \
+            relative: 0.6 0.5; \
+         } \
+         rel2 { \
+            to: "cit_"#_pos".rect"; \
+            relative: 0.6 0.5; \
+         } \
+         min: 16 16; \
+         max: 16 16; \
+         aspect: 1 1; \
+         align: 0.0 1.0;\
+         color: 0 0 0 0; \
+         visible: 0; \
+      } \
+      description { state: "visible" 0.0; \
+         inherit: "default" 0.0; \
+         visible: 1; \
+      } \
+   } \
    part { name: "cit_"#_pos".access"; type: RECT; repeat_events: 1; \
       description { state: "default" 0.0; \
          fixed: 1 1; \
          name:    "cit_"#_pos".clear"; \
          signal:  "cit_"#_pos",clear"; \
          source:  "elm"; \
+         action:  STATE_SET "default" 0.0; \
+         target:  "cit_"#_pos".check"; \
          after:   "cit_"#_pos".holiday_clear"; \
       } \
       program { \
          } \
       } \
       program { \
+         name:    "cit_"#_pos".checked"; \
+         signal:  "cit_"#_pos",checked"; \
+         source:  "elm"; \
+         action:  STATE_SET "visible" 0.0; \
+         target:  "cit_"#_pos".check"; \
+      } \
+      program { \
          name:    "cit_"#_pos".holiday"; \
          signal:  "cit_"#_pos",holiday"; \
          source:  "elm"; \
index 67b347b..4c6de4e 100644 (file)
@@ -58,7 +58,7 @@ group { name: "elm/check/base/default";
       part { name: "tizen_vg_shape_bg_clipper";
          type: RECT;
          description { state: "default" 0.0;
-            color: 249 249 249 77;
+            color: 249 249 249 255;
          }
          description { state: "off" 0.0;
             color: 249 249 249 52;
index d260e2e..ad6c92c 100644 (file)
@@ -35,6 +35,7 @@ group {
          type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
+            align: 0.0 0.0;
             min: COLORSELECTOR_PALETTE_COLORPLANE_WIDTH_INC COLORSELECTOR_PALETTE_COLORPLANE_HEIGHT_INC;
             max: -1 -1;
          }
@@ -69,7 +70,7 @@ group {
          type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            align: 0.5 0.0;
+            align: 0.0 0.0;
             fixed: 0 1;
             rel1 {
                relative: 0.0 1.0;
index 3b64db5..e9ce187 100644 (file)
@@ -45,34 +45,31 @@ group { name: "elm/conformant/base/default";
          description { state: "default" 0.0;
          }
       }
-      part { name: "indicator_base";
-         type: SPACER;
+      part { name: "elm.swallow.indicator_base";
+         type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 0 1;
             align: 0.5 0.0;
-            min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
             rel2.relative: 1.0 0.0;
          }
          description { state: "hide" 0.0;
             inherit: "default" 0.0;
-            min: 0 0;
+            align: 0.5 1.0;
          }
       }
-      part { name: "indicator_adapter";
-         type: SPACER;
+      part { name: "elm.swallow.indicator_adapter";
+         type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 0 1;
             align: 0.5 0.0;
-            min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
             rel2.relative: 1.0 0.0;
          }
          //just in case: hide
         description { state: "hide" 0.0;
             inherit: "default" 0.0;
             align: 0.5 1.0;
-            min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
          }
       }
       part { name: "elm.swallow.content";
@@ -80,7 +77,7 @@ group { name: "elm/conformant/base/default";
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 0.0 1.0;
-            rel1.to: "indicator_base";
+            rel1.to: "elm.swallow.indicator_base";
             rel2.relative: 1.0 0.0;
             rel2.to: "sip_area";
          }
@@ -106,8 +103,8 @@ group { name: "elm/conformant/base/default";
          type: RECT;
          clip_to: "overlap_clipper";
          description { state: "default" 0.0;
-            rel1 { to: "indicator_adapter"; }
-            rel2 { to: "indicator_adapter"; }
+            rel1 { to: "elm.swallow.indicator_adapter"; }
+            rel2 { to: "elm.swallow.indicator_adapter"; }
             color: 61 184 204 255;
          }
          description { state: "transparent" 0.0;
@@ -142,8 +139,8 @@ group { name: "elm/conformant/base/default";
          type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "indicator_adapter";
-            rel2.to: "indicator_adapter";
+            rel1.to: "elm.swallow.indicator_adapter";
+            rel2.to: "elm.swallow.indicator_adapter";
          }
       }
       part { name: "elm.swallow.attach_panel_base";
@@ -225,14 +222,14 @@ group { name: "elm/conformant/base/default";
           signal: "indicator,show,effect";
           source: "elm";
           action: STATE_SET "default" 0.0;
-          target: "indicator_adapter";
+          target: "elm.swallow.indicator_adapter";
           transition: DECELERATE 0.2;
       }
       program { name: "hide_indicator_effect"; //hide indicator using effect
           signal: "indicator,hide,effect";
           source: "elm";
           action: STATE_SET "hide" 0.0;
-          target: "indicator_adapter";
+          target: "elm.swallow.indicator_adapter";
           transition: DECELERATE 0.2;
       }
       program { name: "opaque_indicator";
@@ -313,7 +310,6 @@ group { name: "elm/conformant/base/default";
             set_int(clipboard_disable, 0);
             //set content state
             set_state(PART:"elm.swallow.content", "default", 0.0);
-            set_state(PART:"sip_area", "default", 0.0);
          }
       }
       program { name: "disable_clipboard";
@@ -339,7 +335,6 @@ group { name: "elm/conformant/base/default";
          script {
             set_int(keypad_disable, 0);
             set_state(PART:"elm.swallow.content", "default", 0.0);
-            set_state(PART:"sip_area", "default", 0.0);
          }
       }
       program { name: "disable_virtualkeypad";
@@ -402,17 +397,17 @@ group { name: "elm/conformant/base/default";
                 (get_int(indicator_visible) == 0) ||
                 (get_int(overlap_mode) == 1) ||
                 (get_int(landscape_mode) == 1)) {
-               set_state(PART:"indicator_base", "hide", 0.0);
+               set_state(PART:"elm.swallow.indicator_base", "hide", 0.0);
             } else {
-               set_state(PART:"indicator_base", "default", 0.0);
+               set_state(PART:"elm.swallow.indicator_base", "default", 0.0);
             }
             //update indicator adapter
             if ((get_int(transparent_mode) == 1) ||
                 (get_int(indicator_visible) == 0) ||
                 (get_int(landscape_mode)))
-              set_state(PART:"indicator_adapter", "hide", 0.0);
+              set_state(PART:"elm.swallow.indicator_adapter", "hide", 0.0);
             else
-              set_state(PART:"indicator_adapter", "default", 0.0);
+              set_state(PART:"elm.swallow.indicator_adapter", "default", 0.0);
          }
       }
       program { name: "landscape_mode";
index 673c491..e8a5c9b 100644 (file)
@@ -682,6 +682,7 @@ group {
 ///////////////////////////////////////////////////////////////////////////////
 group {
    name: "elm/ctxpopup/base/default";
+   alias: "elm/ctxpopup/base/copypaste";
    images {
       set {
          name: "core_contextual_popup_bg.#.png";
@@ -998,178 +999,6 @@ group {
       }
    }
 }
-
-group {
-   name: "elm/ctxpopup/base/copypaste";
-   inherit: "elm/ctxpopup/base/default";
-   parts {
-      part {
-         name:"content_left_top_padding";
-         type: SPACER;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_CONTENT_LEFT_PADDING 0;
-            max: CTXPOPUP_CONTENT_LEFT_PADDING 0;
-            rel2 { relative: 0 0; }
-            align: 0 0;
-            fixed: 1 1;
-         }
-      }
-      part {
-         name:"content_right_bottom_padding";
-         type: SPACER;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_CONTENT_RIGHT_PADDING 0;
-            max: CTXPOPUP_CONTENT_RIGHT_PADDING 0;
-            rel1{relative: 1 1;}
-            align: 1 1;
-            fixed: 1 1;
-         }
-      }
-      part { name: "arrow_area_left";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: CTXPOPUP_COPYPASTE_ARROW_SIZE_INC;
-            fixed: 1 1;
-            align: 1 0.5;
-            rel1 {
-               relative: 1 1;
-               to_x:"arrow_left_top_padding";
-               to_y: "ctxpopup_frame_left_top";
-            }
-            rel2 {
-               relative: 1 0;
-               to_x:"arrow_left_top_padding";
-               to_y:"ctxpopup_frame_right_bottom";
-            }
-         }
-      }
-      part { name: "arrow_area_right";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: CTXPOPUP_COPYPASTE_ARROW_SIZE_INC;
-            fixed: 1 1;
-            align: 0 0.5;
-            rel1 {
-               relative: 0 1;
-               to_x:"arrow_right_bottom_padding";
-               to_y:"ctxpopup_frame_left_top";
-            }
-            rel2 {
-               relative: 0 0;
-               to_x:"arrow_right_bottom_padding";
-               to_y: "ctxpopup_frame_right_bottom";
-            }
-         }
-      }
-      part { name: "arrow_area_up";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: CTXPOPUP_COPYPASTE_ARROW_SIZE_INC;
-            align: 0.5 1;
-            rel1 {
-               relative: 1 1;
-               to_x: "ctxpopup_frame_left_top";
-               to_y: "arrow_left_top_padding";
-            }
-            rel2 {
-               relative: 0 1;
-               to_x:"ctxpopup_frame_right_bottom";
-               to_y: "arrow_left_top_padding";
-            }
-         }
-      }
-      part { name: "arrow_area_down";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: CTXPOPUP_COPYPASTE_ARROW_SIZE_INC;
-            fixed: 1 1;
-            align: 0.5 0;
-            rel1 {
-               relative: 1 0;
-               to_x:"ctxpopup_frame_left_top";
-               to_y:"arrow_right_bottom_padding";
-            }
-            rel2 {
-               relative: 0 0;
-               to_x: "ctxpopup_frame_right_bottom";
-               to_y:"arrow_right_bottom_padding";
-            }
-         }
-      }
-      part { name: "elm.swallow.arrow_up";
-         type: SWALLOW;
-         mouse_events: 0;
-         scale: 1;
-         dragable {
-            x: 1 1 0;
-            y: 1 1 0;
-            confine: "arrow_area_up";
-         }
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_COPYPASTE_ARROW_SIZE_INC;
-            fixed: 1 1;
-            visible: 1;
-         }
-      }
-      part { name: "elm.swallow.arrow_down";
-         type: SWALLOW;
-         mouse_events: 0;
-         scale: 1;
-         dragable {
-            x: 1 1 0;
-            y: 1 1 0;
-            confine: "arrow_area_down";
-         }
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_COPYPASTE_ARROW_SIZE_INC;
-            fixed: 1 1;
-            visible: 1;
-         }
-      }
-      part { name: "elm.swallow.arrow_left";
-         type: SWALLOW;
-         mouse_events: 0;
-         scale: 1;
-         dragable {
-            x: 1 1 0;
-            y: 1 1 0;
-            confine: "arrow_area_left";
-         }
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_COPYPASTE_ARROW_SIZE_INC;
-            fixed: 1 1;
-            visible: 1;
-         }
-      }
-      part { name: "elm.swallow.arrow_right";
-         type: SWALLOW;
-         mouse_events: 0;
-         scale: 1;
-         dragable {
-            x: 1 1 0;
-            y: 1 1 0;
-            confine: "arrow_area_right";
-         }
-         description {
-            state: "default" 0.0;
-            min: CTXPOPUP_COPYPASTE_ARROW_SIZE_INC;
-            fixed: 1 1;
-            visible: 1;
-         }
-      }
-   }
-}
 ///////////////////////////////////////////////////////////////////////////////
 group {
    name: "elm/ctxpopup/arrow/default";
index 3f6f54d..c4468dc 100644 (file)
@@ -862,10 +862,11 @@ group { name: "elm/entry/base-single/default";
 
 group { name: "elm/entry/base-single/spinner/default";
    alias: "elm/entry/base-single/spinner/horizontal";
-   data.item: "default_font_size" "106";
+   data.item: "default_font_size" "80";
+   // FIXME: SamsungNum3L has to be applied.
    styles {
       style { name: "entry_single_spinner_textblock_style";
-         base: "font=TizenSans:style=Light font_size=106 color=#000000ff align=center";
+         base: "font=Tizen:style=Light font_size=80 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
          tag:  "br" "";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
@@ -880,7 +881,7 @@ group { name: "elm/entry/base-single/spinner/default";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "entry_single_spinner_textblock_focused_style";
-         base: "font=TizenSans:style=Light font_size=106 color=#000000ff align=center";
+         base: "font=Tizen:style=Light font_size=80 color=#000000ff wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
          tag:  "br" "";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
@@ -895,7 +896,7 @@ group { name: "elm/entry/base-single/spinner/default";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "entry_single_spinner_textblock_disabled_style";
-         base: "font=TizenSans:style=Light font_size=106 color=#000000a3 align=center";
+         base: "font=Tizen:style=Light font_size=60 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen";
          tag:  "br" "";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
@@ -910,7 +911,7 @@ group { name: "elm/entry/base-single/spinner/default";
          tag:  "preedit_sub4" "+ backing=on backing_color="ENTRY_PREEDIT_SUB4_COLOR_INC" underline=on underline_color="ENTRY_PREEDIT_UNDERLINE_COLOR_INC;
       }
       style { name: "entry_single_spinner_textblock_guide_style";
-         base: "font=TizenSans:style=Light font_size=106 color=#000000a3 align=center";
+         base: "font=Tizen:style=Light font_size=60 color=#000000a3 wrap=none align=center left_margin=1 right_margin=3 text_class=tizen ellipsis=1.0";
          tag:  "br" "";
          tag:  "em" "+ font_style=Oblique";
          tag:  "b" "+ font_weight=Bold";
@@ -2388,18 +2389,48 @@ group { name: "elm/entry/handler/start/default";
    data.item: "height" ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
    data.item: "gap" ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC;
    images {
-      image: "copy&paste_handler_bottom_l.png" COMP;
-      image: "copy&paste_handler_bottom_r.png" COMP;
-      image: "copy&paste_handler_top_l.png" COMP;
-      image: "copy&paste_handler_top_r.png" COMP;
+      image: "copy&paste_handler_left_bottom.png" COMP;
+      image: "copy&paste_handler_left_top.png" COMP;
    }
    script {
-      public handler_on_top = 0;
-      public handler_focused = 0;
-      public handler_disabled = 0;
-      public handler_zoomed = 0;
+      public handler_ontop;
+      public handler_focused;
+      public handler_disabled;
    }
    parts {
+      part { name: "edge";
+         type: RECT;
+         mouse_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            align: 1 0;
+            rel2.offset: 1 0;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH ENTRY_SELECTION_BLOCK_HANDLE_EDGE_HEIGHT;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH ENTRY_SELECTION_BLOCK_HANDLE_EDGE_HEIGHT;
+            color: 0 184 230 255;
+         }
+         description { state: "show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         description { state: "top" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 1 1;
+         }
+         description { state: "bottom_reversed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 1 0;
+         }
+         description { state: "top_reversed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 1 1;
+         }
+      }
       part { name: "handle";
          mouse_events: 1;
          scale: 1;
@@ -2407,10 +2438,12 @@ group { name: "elm/entry/handler/start/default";
             visible: 0;
             fixed: 1 1;
             align: 1.0 0;
+            rel2.offset: 6 0;
             min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
             max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
             image {
-               normal: "copy&paste_handler_bottom_l.png";
+               normal: "copy&paste_handler_left_bottom.png";
+               border: 0 0 0 0;
             }
          }
          description { state: "show" 0.0;
@@ -2422,45 +2455,22 @@ group { name: "elm/entry/handler/start/default";
             visible: 1;
             align: 1.0 1;
             image {
-               normal: "copy&paste_handler_top_l.png";
+               normal: "copy&paste_handler_left_top.png";
             }
          }
          description { state: "bottom_reversed" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            align: 0 0;
-            image {
-               normal: "copy&paste_handler_bottom_r.png";
-            }
+            align: 0.5 0;
          }
          description { state: "top_reversed" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            align: 0.0 1;
+            align: 0.5 1;
             image {
-               normal: "copy&paste_handler_top_r.png";
+               normal: "copy&paste_handler_left_top.png";
             }
          }
-         description { state: "zoom_show" 0.0;
-            inherit: "show" 0.0;
-            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-         }
-         description { state: "zoom_top" 0.0;
-            inherit: "top" 0.0;
-            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-         }
-         description { state: "zoom_bottom_reversed" 0.0;
-            inherit: "bottom_reversed" 0.0;
-            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-         }
-         description { state: "zoom_top_reversed" 0.0;
-            inherit: "top_reversed" 0.0;
-            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-         }
       }
    }
    programs {
@@ -2477,199 +2487,70 @@ group { name: "elm/entry/handler/start/default";
          script {
             set_int(handler_focused, 0);
             set_state(PART:"handle", "default", 0.0);
+            set_state(PART:"edge", "default", 0.0);
          }
       }
-      program { name: "pressed_show";
-         action: STATE_SET "zoom_show" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed_top";
-         action: STATE_SET "zoom_top" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed_bottom_reversed";
-         action: STATE_SET "zoom_bottom_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed_top_reversed";
-         action: STATE_SET "zoom_top_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_show";
-         action: STATE_SET "show" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_top";
-         action: STATE_SET "top" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_bottom_reversed";
-         action: STATE_SET "bottom_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_top_reversed";
-         action: STATE_SET "top_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed";
-         signal: "mouse,down,1";
-         source: "handle";
-         script {
-            set_int(handler_zoomed, 1);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "show"))
-              {
-                 run_program(PROGRAM:"pressed_show");
-              }
-            else if (!strcmp(st, "top"))
-              {
-                 run_program(PROGRAM:"pressed_top");
-              }
-            else if (!strcmp(st, "bottom_reversed"))
-              {
-                 run_program(PROGRAM:"pressed_bottom_reversed");
-              }
-            else if (!strcmp(st, "top_reversed"))
-              {
-                 run_program(PROGRAM:"pressed_top_reversed");
-              }
-         }
-      }
-      program { name: "released";
-         signal: "mouse,up,1";
-         source: "handle";
-         script {
-            set_int(handler_zoomed, 0);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "zoom_show"))
-              {
-                 run_program(PROGRAM:"released_show");
-              }
-            else if (!strcmp(st, "zoom_top"))
-              {
-                 run_program(PROGRAM:"released_top");
-              }
-            else if (!strcmp(st, "zoom_bottom_reversed"))
-              {
-                 run_program(PROGRAM:"released_bottom_reversed");
-              }
-            else if (!strcmp(st, "zoom_top_reversed"))
-              {
-                 run_program(PROGRAM:"released_top_reversed");
-              }
-         }
-         after: "released2";
-      }
-      program { name: "released2";
-         in: 0.3 0.0;
-         script {
-            set_int(handler_zoomed, 0);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "zoom_show"))
-              {
-                 run_program(PROGRAM:"released_show");
-              }
-            else if (!strcmp(st, "zoom_top"))
-              {
-                 run_program(PROGRAM:"released_top");
-              }
-            else if (!strcmp(st, "zoom_bottom_reversed"))
-              {
-                 run_program(PROGRAM:"released_bottom_reversed");
-              }
-            else if (!strcmp(st, "zoom_top_reversed"))
-              {
-                 run_program(PROGRAM:"released_top_reversed");
-              }
-         }
-      }
-      program { name: "top";
-         signal: "elm,state,top";
+      program { name: "bottom_reversed";
+         signal: "elm,state,bottom,reversed";
          source: "elm";
          script {
-            new focused, disabled, zoomed;
-            focused = get_int(handler_focused);
+            new disabled;
             disabled = get_int(handler_disabled);
-            set_int(handler_on_top, 1);
-            if ((focused == 1) && (disabled == 0)) {
-               zoomed = get_int(handler_zoomed);
-               if (zoomed) {
-                    set_state(PART:"handle", "zoom_top", 0.0);
-                 } else {
-                    set_state(PART:"handle", "top", 0.0);
-                 }
+            if (disabled == 0) {
+               set_state(PART:"handle", "bottom_reversed", 0.0);
+               set_state(PART:"edge", "bottom_reversed", 0.0);
             } else {
                set_state(PART:"handle", "default", 0.0);
+               set_state(PART:"edge", "default", 0.0);
             }
          }
       }
-      program { name: "bottom";
-         signal: "elm,state,bottom";
+      program { name: "top_reversed";
+         signal: "elm,state,top,reversed";
          source: "elm";
          script {
-            new focused, disabled, zoomed;
-            focused = get_int(handler_focused);
+            new disabled;
             disabled = get_int(handler_disabled);
-            zoomed = get_int(handler_zoomed);
-            set_int(handler_on_top, 0);
-            if ((focused == 1) && (disabled == 0)) {
-               if (zoomed) {
-                  set_state(PART:"handle", "zoom_show", 0.0);
-               } else {
-                  set_state(PART:"handle", "show", 0.0);
-               }
+            if (disabled == 0) {
+               set_state(PART:"handle", "top_reversed", 0.0);
+               set_state(PART:"edge", "top_reversed", 0.0);
             } else {
                set_state(PART:"handle", "default", 0.0);
+               set_state(PART:"edge", "default", 0.0);
             }
          }
       }
-      program { name: "bottom_reversed";
-         signal: "elm,state,bottom,reversed";
+      program { name: "top";
+         signal: "elm,state,top";
          source: "elm";
          script {
-            new disabled, zoomed;
+            new focused, disabled;
+            focused = get_int(handler_focused);
             disabled = get_int(handler_disabled);
-            zoomed = get_int(handler_zoomed);
-            if (disabled == 0) {
-               if (zoomed) {
-                  set_state(PART:"handle", "zoom_bottom_reversed", 0.0);
-               } else {
-                  set_state(PART:"handle", "bottom_reversed", 0.0);
-               }
+            set_int(handler_ontop, 1);
+            if ((focused == 1) && (disabled == 0)) {
+               set_state(PART:"handle", "top", 0.0);
+               set_state(PART:"edge", "top", 0.0);
             } else {
                set_state(PART:"handle", "default", 0.0);
+               set_state(PART:"edge", "default", 0.0);
             }
          }
       }
-      program { name: "top_reversed";
-         signal: "elm,state,top,reversed";
+      program { name: "bottom";
+         signal: "elm,state,bottom";
          source: "elm";
          script {
-            new disabled, zoomed;
+            new focused, disabled;
+            focused = get_int(handler_focused);
             disabled = get_int(handler_disabled);
-            zoomed = get_int(handler_zoomed);
-            if (disabled == 0) {
-               if (zoomed) {
-                  set_state(PART:"handle", "zoom_top_reversed", 0.0);
-               } else {
-                  set_state(PART:"handle", "top_reversed", 0.0);
-               }
+            set_int(handler_ontop, 0);
+            if ((focused == 1) && (disabled == 0)) {
+               set_state(PART:"handle", "show", 0.0);
+               set_state(PART:"edge", "show", 0.0);
             } else {
                set_state(PART:"handle", "default", 0.0);
+               set_state(PART:"edge", "default", 0.0);
             }
          }
       }
@@ -2695,18 +2576,49 @@ group { name: "elm/entry/handler/end/default";
    data.item: "height" ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
    data.item: "gap" ENTRY_SELECTION_BLOCK_HANDLE_MIN_WEIGHT_INC;
    images {
-      image: "copy&paste_handler_bottom_l.png" COMP;
-      image: "copy&paste_handler_bottom_r.png" COMP;
-      image: "copy&paste_handler_top_l.png" COMP;
-      image: "copy&paste_handler_top_r.png" COMP;
+      image: "copy&paste_handler_right_bottom.png" COMP;
+      image: "copy&paste_handler_right_top.png" COMP;
    }
    script {
-      public handler_on_top = 0;
-      public handler_focused = 0;
-      public handler_disabled = 0;
-      public handler_zoomed = 0;
+      public handler_ontop;
+      public handler_focused;
+      public handler_disabled;
+      public handler_pressed;
    }
    parts {
+        part { name: "edge";
+         type: RECT;
+         mouse_events: 1;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            align: 0 0;
+            rel1.offset: -1 0;
+            min: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH ENTRY_SELECTION_BLOCK_HANDLE_EDGE_HEIGHT;
+            max: ENTRY_SELECTION_BLOCK_HANDLE_EDGE_WIDTH ENTRY_SELECTION_BLOCK_HANDLE_EDGE_HEIGHT;
+            color: 0 184 230 255;
+         }
+         description { state: "show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         description { state: "top" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0 1;
+         }
+         description { state: "bottom_reversed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0 0;
+         }
+         description { state: "top_reversed" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            align: 0 1;
+         }
+      }
       part { name: "handle";
          mouse_events: 1;
          scale: 1;
@@ -2714,10 +2626,12 @@ group { name: "elm/entry/handler/end/default";
             visible: 0;
             fixed: 1 1;
             align: 0 0;
+            rel1.offset: -7 0;
             min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
             max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_INC;
             image {
-               normal: "copy&paste_handler_bottom_r.png";
+               normal: "copy&paste_handler_right_bottom.png";
+               border: 0 0 0 0;
             }
          }
          description { state: "show" 0.0;
@@ -2729,45 +2643,22 @@ group { name: "elm/entry/handler/end/default";
             visible: 1;
             align: 0 1;
             image {
-               normal: "copy&paste_handler_top_r.png";
+               normal: "copy&paste_handler_right_top.png";
             }
          }
          description { state: "bottom_reversed" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            align: 1 0;
-            image {
-               normal: "copy&paste_handler_bottom_l.png";
-            }
+            align: 0 0;
          }
          description { state: "top_reversed" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            align: 1 1;
+            align: 0 1;
             image {
-               normal: "copy&paste_handler_top_l.png";
+               normal: "copy&paste_handler_right_top.png";
             }
          }
-         description { state: "zoom_show" 0.0;
-            inherit: "show" 0.0;
-            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-         }
-         description { state: "zoom_top" 0.0;
-            inherit: "top" 0.0;
-            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-         }
-         description { state: "zoom_bottom_reversed" 0.0;
-            inherit: "bottom_reversed" 0.0;
-            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-         }
-         description { state: "zoom_top_reversed" 0.0;
-            inherit: "top_reversed" 0.0;
-            min: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-            max: ENTRY_SELECTION_BLOCK_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_SELECTION_BLOCK_HANDLE_MIN_HEIGHT_ZOOM_INC;
-         }
       }
    }
    programs {
@@ -2784,143 +2675,23 @@ group { name: "elm/entry/handler/end/default";
          script {
             set_int(handler_focused, 0);
             set_state(PART:"handle", "default", 0.0);
-         }
-      }
-      program { name: "pressed_show";
-         action: STATE_SET "zoom_show" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed_top";
-         action: STATE_SET "zoom_top" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed_bottom_reversed";
-         action: STATE_SET "zoom_bottom_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed_top_reversed";
-         action: STATE_SET "zoom_top_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_show";
-         action: STATE_SET "show" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_top";
-         action: STATE_SET "top" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_bottom_reversed";
-         action: STATE_SET "bottom_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_top_reversed";
-         action: STATE_SET "top_reversed" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed";
-         signal: "mouse,down,1";
-         source: "handle";
-         script {
-            set_int(handler_zoomed, 1);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "show"))
-              {
-                 run_program(PROGRAM:"pressed_show");
-              }
-            else if (!strcmp(st, "top"))
-              {
-                 run_program(PROGRAM:"pressed_top");
-              }
-            else if (!strcmp(st, "bottom_reversed"))
-              {
-                 run_program(PROGRAM:"pressed_bottom_reversed");
-              }
-            else if (!strcmp(st, "top_reversed"))
-              {
-                 run_program(PROGRAM:"pressed_top_reversed");
-              }
-         }
-      }
-      program { name: "released";
-         signal: "mouse,up,1";
-         source: "handle";
-         script {
-            set_int(handler_zoomed, 0);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "zoom_show"))
-              {
-                 run_program(PROGRAM:"released_show");
-              }
-            else if (!strcmp(st, "zoom_top"))
-              {
-                 run_program(PROGRAM:"released_top");
-              }
-            else if (!strcmp(st, "zoom_bottom_reversed"))
-              {
-                 run_program(PROGRAM:"released_bottom_reversed");
-              }
-            else if (!strcmp(st, "zoom_top_reversed"))
-              {
-                 run_program(PROGRAM:"released_top_reversed");
-              }
-         }
-         after: "released2";
-      }
-      program { name: "released2";
-         in: 0.3 0.0;
-         script {
-            set_int(handler_zoomed, 0);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "zoom_show"))
-              {
-                 run_program(PROGRAM:"released_show");
-              }
-            else if (!strcmp(st, "zoom_top"))
-              {
-                 run_program(PROGRAM:"released_top");
-              }
-            else if (!strcmp(st, "zoom_bottom_reversed"))
-              {
-                 run_program(PROGRAM:"released_bottom_reversed");
-              }
-            else if (!strcmp(st, "zoom_top_reversed"))
-              {
-                 run_program(PROGRAM:"released_top_reversed");
-              }
+            set_state(PART:"edge", "default", 0.0);
          }
       }
       program { name: "top";
          signal: "elm,state,top";
          source: "elm";
          script {
-            new focused, disabled, zoomed;
+            new focused, disabled;
             focused = get_int(handler_focused);
             disabled = get_int(handler_disabled);
-            set_int(handler_on_top, 1);
+            set_int(handler_ontop, 1);
             if ((focused == 1) && (disabled == 0)) {
-                 zoomed = get_int(handler_zoomed);
-                 if (zoomed) {
-                      set_state(PART:"handle", "zoom_top", 0.0);
-                 } else {
-                      set_state(PART:"handle", "top", 0.0);
-                 }
+               set_state(PART:"handle", "top", 0.0);
+               set_state(PART:"edge", "top", 0.0);
             } else {
-                 set_state(PART:"handle", "default", 0.0);
+               set_state(PART:"handle", "default", 0.0);
+               set_state(PART:"edge", "default", 0.0);
             }
          }
       }
@@ -2928,19 +2699,16 @@ group { name: "elm/entry/handler/end/default";
          signal: "elm,state,bottom";
          source: "elm";
          script {
-            new focused, disabled, zoomed;
+            new focused, disabled;
             focused = get_int(handler_focused);
             disabled = get_int(handler_disabled);
-            zoomed = get_int(handler_zoomed);
-            set_int(handler_on_top, 0);
+            set_int(handler_ontop, 0);
             if ((focused == 1) && (disabled == 0)) {
-               if (zoomed) {
-                  set_state(PART:"handle", "zoom_show", 0.0);
-               } else {
-                  set_state(PART:"handle", "show", 0.0);
-               }
+               set_state(PART:"handle", "show", 0.0);
+               set_state(PART:"edge", "show", 0.0);
             } else {
                set_state(PART:"handle", "default", 0.0);
+               set_state(PART:"edge", "default", 0.0);
             }
          }
       }
@@ -2948,17 +2716,14 @@ group { name: "elm/entry/handler/end/default";
          signal: "elm,state,bottom,reversed";
          source: "elm";
          script {
-            new disabled, zoomed;
+            new disabled;
             disabled = get_int(handler_disabled);
-            zoomed = get_int(handler_zoomed);
             if (disabled == 0) {
-               if (zoomed) {
-                  set_state(PART:"handle", "zoom_bottom_reversed", 0.0);
-               } else {
-                  set_state(PART:"handle", "bottom_reversed", 0.0);
-               }
+               set_state(PART:"handle", "bottom_reversed", 0.0);
+               set_state(PART:"edge", "bottom_reversed", 0.0);
             } else {
                set_state(PART:"handle", "default", 0.0);
+               set_state(PART:"edge", "default", 0.0);
             }
          }
       }
@@ -2966,17 +2731,14 @@ group { name: "elm/entry/handler/end/default";
          signal: "elm,state,top,reversed";
          source: "elm";
          script {
-            new disabled, zoomed;
+            new disabled;
             disabled = get_int(handler_disabled);
-            zoomed = get_int(handler_zoomed);
             if (disabled == 0) {
-               if (zoomed) {
-                  set_state(PART:"handle", "zoom_top_reversed", 0.0);
-               } else {
-                  set_state(PART:"handle", "top_reversed", 0.0);
-               }
+               set_state(PART:"handle", "top_reversed", 0.0);
+               set_state(PART:"edge", "top_reversed", 0.0);
             } else {
                set_state(PART:"handle", "default", 0.0);
+               set_state(PART:"edge", "default", 0.0);
             }
          }
       }
@@ -3011,10 +2773,32 @@ group { name: "elm/entry/handler/end/spinner/vertical";
 
 group { name: "elm/entry/cursor_handle/default";
    images {
-      image: "copy&paste_handler_bottom_center.png" COMP;
-      image: "copy&paste_handler_top_center.png" COMP;
+      set {
+         name: "copy&paste_handler_center_circle";
+         image {
+            image: SMALL"images/Copy_Paste/copy&paste_handler_center.png" COMP;
+         }
+         image {
+            image: MEDIUM"images/Copy_Paste/copy&paste_handler_center.png" COMP;
+         }
+      }
    }
    parts {
+      part { name: "sens";
+         type: RECT;
+         scale: 1;
+         mouse_events: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            color: 0 0 0 0;
+            rel1 { relative: -0.25 0.0; to: "handle";}
+            rel2 { relative: 1.25 1.0; to: "handle";}
+         }
+         description { state: "show" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
       part { name: "handle";
          scale: 1;
          mouse_events: 1;
@@ -3024,11 +2808,12 @@ group { name: "elm/entry/cursor_handle/default";
             align: 0 0;
             visible: 0;
             align: 0.5 0;
-            rel1.offset: -2 0;
             image {
-               normal: "copy&paste_handler_bottom_center.png";
+               normal: "copy&paste_handler_center_circle";
+               border: 0 0 0 0;
             }
             image.middle: SOLID;
+            fill.smooth: 0;
          }
          description { state: "show" 0.0;
             inherit: "default" 0.0;
@@ -3038,101 +2823,13 @@ group { name: "elm/entry/cursor_handle/default";
             inherit: "default" 0.0;
             visible: 1;
             align: 0.5 1.0;
-            image {
-               normal: "copy&paste_handler_top_center.png";
-            }
-         }
-         description { state: "zoom_show" 0.0;
-            inherit: "show" 0.0;
-            min: ENTRY_CURSOR_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_ZOOM_INC;
-            max: ENTRY_CURSOR_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_ZOOM_INC;
-         }
-         description { state: "zoom_top" 0.0;
-            inherit: "top" 0.0;
-            min: ENTRY_CURSOR_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_ZOOM_INC;
-            max: ENTRY_CURSOR_HANDLE_MIN_WIDTH_ZOOM_INC ENTRY_CURSOR_HANDLE_MIN_HEIGHT_ZOOM_INC;
          }
       }
    }
    script {
-      public on_top = 0;
-      public zoomed = 0;
+      public on_top;
    }
    programs {
-      program { name: "pressed_show";
-         action: STATE_SET "zoom_show" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed_top";
-         action: STATE_SET "zoom_top" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_show";
-         action: STATE_SET "show" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "released_top";
-         action: STATE_SET "top" 0.0;
-         target: "handle";
-         transition: GLIDE_EASE_OUT(0.3);
-      }
-      program { name: "pressed";
-         signal: "mouse,down,1";
-         source: "handle";
-         script {
-            set_int(zoomed, 1);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "show"))
-              {
-                 run_program(PROGRAM:"pressed_show");
-              }
-            else if (!strcmp(st, "top"))
-              {
-                 run_program(PROGRAM:"pressed_top");
-              }
-         }
-      }
-      program { name: "released";
-         signal: "mouse,up,1";
-         source: "handle";
-         script {
-            set_int(zoomed, 0);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "zoom_show"))
-              {
-                 run_program(PROGRAM:"released_show");
-              }
-            else if (!strcmp(st, "zoom_top"))
-              {
-                 run_program(PROGRAM:"released_top");
-              }
-         }
-         after: "released2";
-      }
-      program { name: "released2";
-         in: 0.3 0.0;
-         script {
-            set_int(zoomed, 0);
-            new st[31];
-            new Float:vl;
-            get_state(PART:"handle", st, 30, vl);
-            if (!strcmp(st, "zoom_show"))
-              {
-                 run_program(PROGRAM:"released_show");
-              }
-            else if (!strcmp(st, "zoom_top"))
-              {
-                 run_program(PROGRAM:"released_top");
-              }
-         }
-      }
       program { name: "focused";
          signal: "edje,focus,in";
          source: "edje";
@@ -3143,6 +2840,7 @@ group { name: "elm/entry/cursor_handle/default";
             } else {
                set_state(PART:"handle", "show", 0.0);
             }
+            set_state(PART:"sens", "show", 0.0);
          }
       }
       program { name: "unfocused";
@@ -3150,6 +2848,7 @@ group { name: "elm/entry/cursor_handle/default";
          source: "edje";
          script {
             set_state(PART:"handle", "default", 0.0);
+            set_state(PART:"sens", "default", 0.0);
          }
       }
       program { name: "show";
@@ -3157,12 +2856,8 @@ group { name: "elm/entry/cursor_handle/default";
          source: "edje";
          script {
             set_int(on_top, 0);
-            new zoomed_val = get_int(zoomed);
-            if (zoomed_val) {
-                 set_state(PART:"handle", "zoom_show", 0.0);
-            } else {
-                 set_state(PART:"handle", "show", 0.0);
-            }
+            set_state(PART:"handle", "show", 0.0);
+            set_state(PART:"sens", "show", 0.0);
          }
       }
       program { name: "hide";
@@ -3170,6 +2865,7 @@ group { name: "elm/entry/cursor_handle/default";
          source: "edje";
          script {
             set_state(PART:"handle", "default", 0.0);
+            set_state(PART:"sens", "default", 0.0);
          }
       }
       program { name: "top";
@@ -3177,12 +2873,8 @@ group { name: "elm/entry/cursor_handle/default";
          source: "edje";
          script {
             set_int(on_top, 1);
-            new zoomed_val = get_int(zoomed);
-            if (zoomed_val) {
-                 set_state(PART:"handle", "zoom_top", 0.0);
-            } else {
-                 set_state(PART:"handle", "top", 0.0);
-            }
+            set_state(PART:"handle", "top", 0.0);
+            set_state(PART:"sens", "show", 0.0);
          }
       }
    }
index 102dc0a..264e997 100644 (file)
@@ -430,7 +430,10 @@ styles {
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
+               align: 0.5 0.0;
                min: GRID_POPUP_ITEM_REAL_BG_SIZE;
+               max: GRID_POPUP_ITEM_REAL_BG_SIZE;
+               rel2.relative: 1.0 0.0;
             }
          }
          part { name: "left_top_padding";
@@ -439,6 +442,7 @@ styles {
             description { state: "default" 0.0;
                min: GRID_POPUP_PADDING_LEFT_TOP_SIZE;
                align: 0.0 0.0;
+               fixed: 1 1;
                rel1.to: "item_bg";
                rel2 {
                   relative: 0.0 0.0;
@@ -452,6 +456,7 @@ styles {
             description { state: "default" 0.0;
                min: GRID_POPUP_PADDING_RIGHT_BOTTOM_SIZE;
                align: 1.0 1.0;
+               fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
                   to_x: "item_bg";
@@ -469,7 +474,9 @@ styles {
             scale: 1;
             description { state: "default" 0.0;
                min: GRID_POPUP_PADDING_BOTTOM_SIZE;
+               min: GRID_POPUP_PADDING_BOTTOM_SIZE;
                align: 1.0 1.0;
+               fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
                   to: "item_bg";
@@ -485,7 +492,9 @@ styles {
             scale: 1;
             description { state: "default" 0.0;
                min: GRID_POPUP_PADDING_BOTTOM_SIZE;
+               min: GRID_POPUP_PADDING_BOTTOM_SIZE;
                align: 0.0 1.0;
+               fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
                   to: "item_bg";
@@ -501,6 +510,8 @@ styles {
             scale: 1;
             description { state: "default" 0.0;
                min: GRID_POPUP_SWALLOW_ICON_SIZE;
+               max: GRID_POPUP_SWALLOW_ICON_SIZE;
+               align: 0.5 0.5;
                rel1 {
                   relative: 1.0 1.0;
                   to: "left_top_padding";
@@ -524,8 +535,9 @@ styles {
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GRID_POPUP_TEXT_MIN_SIZE GRID_POPUP_TEXT_HEIGHT;
-               fixed: 0 1;
+               min: 164 GRID_POPUP_TEXT_HEIGHT;
+               max: 164 GRID_POPUP_TEXT_HEIGHT;
+               fixed: 1 1;
                align: 0.5 1.0;
                rel1 {
                   relative: 1.0 0.0;
index 9b1f960..0c106ad 100644 (file)
@@ -701,10 +701,10 @@ group { name: "elm/genlist/item/multiline/default";
             text.min: 0 1;
          }
          desc { "pressed"; inherit: "default";
-            text.style: "list_text_main_press";
+            text.style: "list.text_main_press";
          }
          desc { "disabled"; inherit: "default";
-            text.style: "list_text_main_dim";
+            text.style: "list.text_main_dim";
          }
       }
       spacer { "base_line";
index 4f0040a..0e31dbc 100644 (file)
       alias: "elm/index/item/horizontal/pagecontrol";
       alias: "elm/index/item_odd/horizontal/pagecontrol";
       images {
-         image: "core_page_indicator_on.png" COMP;
-         image: "core_page_indicator_on_ef.png" COMP;
-         image: "core_page_indicator_off.png" COMP;
-         image: "core_page_indicator_off_ef.png" COMP;
+         set {
+            name: "core_page_indicator_on";
+            image {
+               image: SMALL"images/Navigation_elements/core_page_indicator_on.png" COMP;
+            }
+            image {
+               image: MEDIUM"images/Navigation_elements/core_page_indicator_on.png" COMP;
+            }
+         }
+         set {
+            name: "core_page_indicator_off";
+            image {
+               image: SMALL"images/Navigation_elements/core_page_indicator_off.png" COMP;
+            }
+            image {
+               image: MEDIUM"images/Navigation_elements/core_page_indicator_off.png" COMP;
+            }
+         }
       }
       parts {
          part { name:"bg";
                fixed: 1 1;
                min: INDEX_PAGECONTROL_IND_MIN_INC;
                max: INDEX_PAGECONTROL_IND_MIN_INC;
-               image.normal: "core_page_indicator_off.png";
+               image.normal: "core_page_indicator_off";
                color: 250 250 250 128;
                visible: 1;
             }
                visible: 0;
             }
          }
-         part { name: "indicator_off_ef";
-            scale: 1;
-            mouse_events: 1;
-            type: IMAGE;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               image.normal: "core_page_indicator_off_ef.png";
-               rel1.to: "indicator_off";
-               rel2.to: "indicator_off";
-            }
-            description { state: "active" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
          part { name: "indicator_on";
             mouse_events: 1;
             scale: 1;
                fixed: 1 1;
                min: INDEX_PAGECONTROL_IND_MIN_INC;
                max: INDEX_PAGECONTROL_IND_MIN_INC;
-               image.normal: "core_page_indicator_on.png";
+               image.normal: "core_page_indicator_on";
                color: 250 250 250 255;
                visible: 0;
             }
                visible: 1;
             }
          }
-         part { name: "indicator_on_ef";
-            scale: 1;
-            mouse_events: 1;
-            type: IMAGE;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               image.normal: "core_page_indicator_on_ef.png";
-               visible: 0;
-               rel1.to: "indicator_on";
-               rel2.to: "indicator_on";
-            }
-            description { state: "active" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
       }
       programs {
          program { name: "active";
             source: "elm";
             action: STATE_SET "active" 0.0;
             target: "indicator_off";
-            target: "indicator_off_ef";
             target: "indicator_on";
-            target: "indicator_on_ef";
          }
          program { name: "inactive";
             signal: "elm,state,inactive";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "indicator_off";
-            target: "indicator_off_ef";
             target: "indicator_on";
-            target: "indicator_on_ef";
          }
       }
    }
index 73f93ae..0907436 100644 (file)
@@ -95,42 +95,7 @@ group { name: "elm/list/item/default";
             color: 230 230 230 255;
          )
       )
-      part { name: "event";
-         type: RECT;
-         scale:1;
-         repeat_events:1;
-         description { state: "default" 0.0;
-            color : 0 0 0 0;
-         }
-      }
-   }
-   programs {
-      LIST_PROGRAM_DEFAULT(
-         target: "elm.text";
-         target: "bg";
-      )
-      LIST_PROGRAM_DISABLED(
-         target: "elm.text";
-         target: "bg";
-      )
-      LIST_PROGRAM_SELECT(
-         target: "elm.text";
-         target: "bg";
-      )
-      LIST_PROGRAM_REORDER(
-         target: "elm.text";
-         target: "bg";
-      )
-      program { name: "play_sound";
-         signal: "mouse,clicked,1";
-         source: "event";
-         script {
-            run_program(PROGRAM:"touch_sound");
-         }
-      }
-      program { name: "touch_sound";
-         action: RUN_PLUGIN "touch_sound";
-      }
    }
+   LIST_PROGRAMS( target: "elm.text"; )
 }
 
index 64fda0a..f5a5e99 100644 (file)
             }
          }
          part { name: "title_bg";
-            type: RECT;
+            type: SPACER;
             scale: 1;
-            mouse_events: 0;
             description { state: "default" 0.0;
                min: 0 NAVIFRAME_TITLE_HEIGHT_INC;
                max: -1 NAVIFRAME_TITLE_HEIGHT_INC;
                fixed: 0 1;
                rel1 { to: "base"; relative: 0.0 0.0; }
                rel2 { to: "base"; relative: 1.0 0.0; }
-               color: 61 185 204 255;
             }
             description { state: "hidden" 0.0;
                inherit: "default" 0.0;
          }
          part { name: "tabbar_clipper";
             type: RECT;
-            scale: 1;
             mouse_events: 0;
             clip_to: "clipper";
             description { state: "default" 0.0;
             }
          }
          part { name: "title_bg";
-            type: RECT;
+            type: SPACER;
             scale: 1;
-            mouse_events: 0;
             description { state: "default" 0.0;
                min: 0 NAVIFRAME_TITLE_HEIGHT_INC;
                max: -1 NAVIFRAME_TITLE_HEIGHT_INC;
                fixed: 0 1;
                rel1 { to: "base"; relative: 0.0 0.0; }
                rel2 { to: "base"; relative: 1.0 0.0; }
-               color: 61 185 204 255;
             }
             description { state: "hidden" 0.0;
                inherit: "default" 0.0;
index f801be7..13d2fec 100644 (file)
@@ -89,7 +89,7 @@ group { name: "elm/notify/bottom/popup";
       }
       program { name: "end2";
          action: STATE_SET "end" 0.0;
-         transition: GLIDE_EASE_OUT(0.35);
+         transition: SIN_FAC 0.33 1.7;
          target: "elm.swallow.content";
          target: "block";
          after: "showfinished";
@@ -106,7 +106,7 @@ group { name: "elm/notify/bottom/popup";
       program { name: "hide_effect";
          signal: "elm,state,hide";
          source: "elm";
-         transition: GLIDE_EASE_OUT(0.35);
+         transition: SIN_FAC 0.33 1.7;
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.content";
          after: "hide_effect_done";
index 26101e4..dcdf87a 100644 (file)
@@ -196,10 +196,11 @@ group { name: "elm/slider/horizontal/default";
                description {
                   state: "default" 0.0;
                   min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
                   fixed: 1 0;
                   rel1.to: "bg";
                   rel2 {
-                     relative: 0.0 1.0;
+                     relative: 0.0  1.0;
                      to: "bg";
                   }
                   align: 0.0 0.5;
@@ -223,7 +224,6 @@ group { name: "elm/slider/horizontal/default";
                      to_x: "bar_image_left_padding";
                      to_y: "bg";
                   }
-                  fixed: 1 1;
                }
                description { state: "visible" 0.0;
                   inherit: "default" 0.0;
@@ -238,21 +238,21 @@ group { name: "elm/slider/horizontal/default";
                   state: "default" 0.0;
                   align: 0.0 0.5;
                   min: 0 0;
+                  max: 0 0;
                   rel1 {
-                     relative: 1.0 0.0;
-                     to_x: "elm.swallow.icon";
-                     to_y: "bg";
+                     relative: 1.0  0.0;
+                     to: "elm.swallow.icon";
                   }
                   rel2 {
-                     relative: 1.0 1.0;
-                     to_x: "elm.swallow.icon";
-                     to_y: "bg";
+                     relative: 1.0  1.0;
+                     to: "elm.swallow.icon";
                   }
-                  fixed: 1 0;
+                  fixed: 1 1;
                }
                description { state: "visible";
                   inherit: "default" 0.0;
                   min: SLIDER_ICON_PADDING_SIZE_INC;
+                  max: SLIDER_ICON_PADDING_SIZE_INC;
                }
             }
             part {
@@ -263,21 +263,21 @@ group { name: "elm/slider/horizontal/default";
                   state: "default" 0.0;
                   align: 0.0 0.5;
                   min: 0 0;
+                  max: 0 0;
                   rel1 {
-                     relative: 1.0 0.0;
-                     to_x: "bar_icon_right_padding_1";
-                     to_y: "bg";
+                     relative: 1.0  0.0;
+                     to: "bar_icon_right_padding_1";
                   }
                   rel2 {
-                     relative: 1.0 1.0;
-                     to_x: "bar_icon_right_padding_1";
-                     to_y: "bg";
+                     relative: 1.0  1.0;
+                     to: "bar_icon_right_padding_1";
                   }
-                  fixed: 1 0;
+                  fixed: 1 1;
                }
                description { state: "visible";
                   inherit: "default" 0.0;
                   min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
                }
             }
             part { name: "base";
@@ -286,17 +286,16 @@ group { name: "elm/slider/horizontal/default";
                scale: 1;
                description { state: "default" 0.0;
                   min: 0 SLIDER_BASE_HEIGHT_INC;
+                  max: -1 SLIDER_BASE_HEIGHT_INC;
                   rel1 {
-                     to_x: "bar_icon_right_padding_2";
-                     to_y: "bg";
-                     relative: 1.0 0.5;
+                     to: "bar_icon_right_padding_2";
+                     relative: 1.0 0.0;
                   }
                   rel2 {
-                     to_x: "bar_image_right_padding";
-                     to_y: "bg";
-                     relative: 0.0 0.5;
+                     to: "bar_image_right_padding";
+                     relative: 0.0 1.0;
                   }
-                  fixed: 1 1;
+                  fixed: 0 1;
                   color: 145 145 145 179;
                }
                description { state: "disabled" 0.0;
@@ -312,12 +311,12 @@ group { name: "elm/slider/horizontal/default";
                   rel1 {
                      to_x: "bar_image_left_padding";
                      to_y: "bg";
-                     relative: 1.0 0.5;
+                     relative: 1.0 0.0;
                   }
                   rel2 {
                       to_x: "bar_image_right_padding";
                       to_y: "bg";
-                      relative: 0.0 0.5;
+                      relative: 0.0 1.0;
                   }
                   fixed: 1 1;
                }
@@ -326,12 +325,12 @@ group { name: "elm/slider/horizontal/default";
                   rel1 {
                      to_x: "bar_icon_right_padding_2";
                      to_y: "bg";
-                     relative: 1.0 0.5;
+                     relative: 1.0 0.0;
                   }
                   rel2 {
                       to_x: "bar_image_right_padding";
                       to_y: "bg";
-                      relative: 0.0 0.5;
+                      relative: 0.0 1.0;
                   }
                }
             }
@@ -342,14 +341,15 @@ group { name: "elm/slider/horizontal/default";
                description { state: "default" 0.0;
                   rel1 {
                      to_x: "bar_icon_right_padding_2";
-                     relative: 1.0 0.5;
+                     relative: 1.0 0.0;
                   }
                   rel2 {
                      to_x: "elm.dragable.slider";
-                     relative: 0.5 0.5;
+                     relative: 0.5 1.0;
                   }
                   fixed: 1 1;
                   min: 0 SLIDER_BASE_HEIGHT_INC;
+                  max: -1 SLIDER_BASE_HEIGHT_INC;
                   color: 61 184 204 255;
                }
                description { state: "pressed" 0.0;
@@ -395,13 +395,14 @@ group { name: "elm/slider/horizontal/default";
                description {
                   state: "default" 0.0;
                   min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
                   fixed: 1 0;
                   rel1 {
-                     relative: 1.0 0.0;
+                     relative: 1.0  0.0;
                      to: "bg";
                   }
                   rel2 {
-                     relative: 1.0 1.0;
+                     relative: 1.0  1.0;
                      to: "bg";
                   }
                   align: 1.0 0.5;
@@ -422,16 +423,15 @@ group { name: "elm/slider/horizontal/default";
                scale: 1;
                description { state: "default" 0.0;
                   min: 0  SLIDER_SWALLOWBAR_HEIGHT_INC;
-                  fixed: 1 1;
+                  max: -1 SLIDER_SWALLOWBAR_HEIGHT_INC;
+                  fixed: 0 1;
                   rel1 {
-                     to_x: "bar_icon_right_padding_2";
-                     to_y: "bg";
-                     relative: 1.0 0.5;
+                     to: "bar_icon_right_padding_2";
+                     relative: 1.0 0.0;
                   }
                   rel2 {
-                     to_x: "bar_image_right_padding";
-                     to_y: "bg";
-                     relative: 0.0 0.5;
+                     to: "bar_image_right_padding";
+                     relative: 0.0 1.0;
                   }
                }
             }
@@ -440,16 +440,11 @@ group { name: "elm/slider/horizontal/default";
                scale: 1;
                description { state: "default" 0.0;
                   min: SLIDER_CENTER_POINT_SIZE_INC;
+                  max: SLIDER_CENTER_POINT_SIZE_INC;
                   visible: 0;
-                  rel1 {
-                     to: "base";
-                     relative: 0.5 0.5;
-                  }
-                  rel2 {
-                     to: "base";
-                     relative: 0.5 0.5;
-                  }
-                  fixed: 1 1;
+                  rel1.to: "base";
+                  rel2.to: "base";
+                  fixed: 0 1;
                   color: 61 184 204 255;
                }
                description { state: "visible" 0.0;
@@ -468,7 +463,6 @@ group { name: "elm/slider/horizontal/default";
                scale: 1;
                clip_to: "base";
                description { state: "default" 0.0;
-                  fixed: 1 1;
                   rel1.to: "base";
                   rel2.to: "base";
                }
@@ -479,7 +473,6 @@ group { name: "elm/slider/horizontal/default";
                scale: 1;
                clip_to: "level";
                description { state: "default" 0.0;
-                  fixed: 1 1;
                   rel1.to: "level";
                   rel2.to: "level";
                }
@@ -490,7 +483,6 @@ group { name: "elm/slider/horizontal/default";
                scale: 1;
                clip_to: "level2";
                description { state: "default" 0.0;
-                  fixed: 1 1;
                   rel1.to: "level2";
                   rel2.to: "level2";
                }
@@ -501,7 +493,6 @@ group { name: "elm/slider/horizontal/default";
                scale: 1;
                clip_to: "hider";
                description { state: "default" 0.0;
-                  fixed: 1 1;
                   rel1.to: "level";
                   rel2.to: "level";
                }
@@ -512,7 +503,6 @@ group { name: "elm/slider/horizontal/default";
                scale: 1;
                clip_to: "center_point";
                description { state: "default" 0.0;
-                  fixed: 1 1;
                   rel1.to: "center_point";
                   rel2.to: "center_point";
                }
@@ -546,7 +536,7 @@ group { name: "elm/slider/horizontal/default";
                description { state: "default" 0.0;
                   min: 0 SLIDER_POPUP_HEIGHT_INC;
                   max: -1 SLIDER_POPUP_HEIGHT_INC;
-                  fixed: 1 1;
+                  fixed: 0 1;
                   rel1.to: "elm.dragable.slider";
                   rel2.to: "elm.dragable.slider";
                }
@@ -555,7 +545,6 @@ group { name: "elm/slider/horizontal/default";
                type: RECT;
                scale: 1;
                description { state: "default" 0.0;
-                  fixed: 1 1;
                   rel1.offset: 0 -1000;
                   rel2.offset: -1 1000;
                   color: 61 184 204 255;
@@ -572,7 +561,6 @@ group { name: "elm/slider/horizontal/default";
                type: RECT;
                scale: 1;
                description { state: "default" 0.0;
-                  fixed: 1 1;
                   visible: 0;
                   color: 0 0 0 0;
                }
@@ -583,7 +571,6 @@ group { name: "elm/slider/horizontal/default";
                repeat_events: 0;
                scale: 1;
                description { state: "default" 0.0;
-                  fixed: 1 1;
                   visible: 0;
                   color: 0 0 0 0;
                }
@@ -728,112 +715,74 @@ group { name: "elm/slider/horizontal/center_point";
          parts {
             part { name: "level";
                type: RECT;
-               clip_to: "level_clipper";
+               mouse_events: 0;
+               scale: 1;
                description { state: "default" 0.0;
                   fixed: 1 1;
                   rel1 {
-                     to: "base";
-                     relative: 0.0 0.0;
+                     to_x: "center_point";
+                     to_y: "base";
+                     relative: 0.5 0.0;
                   }
                   rel2 {
                      to_x: "elm.dragable.slider";
                      to_y: "base";
                      relative: 0.5 1.0;
                   }
-                  visible: 1;
                   color: 61 184 204 255;
                }
                description { state: "pressed" 0.0;
-                  inherit: "default" 0.0;
-                  visible: 1;
+                 inherit: "default" 0.0;
                }
                description { state: "inverted" 0.0;
                   inherit: "default" 0.0;
-                  visible: 1;
+                  visible: 0;
                }
                description { state: "disabled" 0.0;
                   inherit: "default" 0.0;
-                  visible: 1;
                   color: 61 184 204 77;
                }
             }
             part { name: "level2";
                type: RECT;
-               clip_to: "level2_clipper";
+               mouse_events: 0;
+               scale: 1;
                description { state: "default" 0.0;
                   fixed: 1 1;
+                  visible: 0;
                   rel1 {
                      to_x: "elm.dragable.slider";
                      to_y: "base";
                      relative: 0.5 0.0;
                   }
                   rel2 {
-                     to: "base";
-                     relative: 1.0 1.0;
+                     to_x: "center_point";
+                     to_y: "base";
+                     relative: 0.5 1.0;
                   }
                   color: 61 184 204 255;
-                  visible: 1;
                }
                description { state: "inverted" 0.0;
                   inherit: "default" 0.0;
                   visible: 1;
                }
                description { state: "pressed" 0.0;
-                  inherit: "inverted" 0.0;
-                  visible: 1;
+                 inherit: "inverted" 0.0;
                }
                description { state: "disabled" 0.0;
                   inherit: "inverted" 0.0;
-                  visible: 1;
                   color: 61 184 204 77;
                }
             }
-            part { name: "level_clipper";
-               type: RECT;
-               description { state: "default" 0.0;
-                  fixed: 1 1;
-                  rel1 {
-                     to_x: "center_point";
-                     to_y: "base";
-                     relative: 0.5 0.0;
-                  }
-                  rel2 {
-                     to_x: "bar_image_right_padding";
-                     to_y: "base";
-                     relative: 0.0 1.0;
-                  }
-               }
-            }
-            part { name: "level2_clipper";
-               type: RECT;
-               description { state: "default" 0.0;
-                  fixed: 1 1;
-                  rel1 {
-                     to_x: "bar_image_left_padding";
-                     to_y: "base";
-                     relative: 1.0 0.0;
-                  }
-                  rel2 {
-                     to_x: "center_point";
-                     to_y: "base";
-                     relative: 0.5 1.0;
-                  }
-               }
-            }
             part { name:"center_point";
                type: RECT;
                scale: 1;
                description { state: "default" 0.0;
                   min: SLIDER_CENTER_POINT_SIZE_INC;
-                  rel1 {
-                     to: "base";
-                     relative: 0.5 0.5;
-                  }
-                  rel2 {
-                     to: "base";
-                     relative: 0.5 0.5;
-                  }
-                  fixed: 1 1;
+                  max: SLIDER_CENTER_POINT_SIZE_INC;
+                  rel1.to: "base";
+                  rel2.to: "base";
+                  fixed: 0 1;
                   visible: 1;
                   color: 61 184 204 255;
                }
@@ -932,9 +881,6 @@ group { name: "elm/slider/horizontal/warning";
          public disabled = 0;
          public popup_show = 1;
          public show = 0;
-         public warning_area = 0;
-         public warning_area_set = 0;
-
          public set_popup_show() {
             set_int(popup_show, 1);
          }
@@ -999,130 +945,55 @@ group { name: "elm/slider/horizontal/warning";
             new Float:dx, Float:dy;
             get_drag(PART:"elm.dragable.slider", dx, dy);
             if (!get_int(invert_on)) {
-               if (get_int(warning_area_set)) {
-                  if (dx > get_float(warning_area)) {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "warning", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,warning", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled_warning", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "warning", 0.0);
-                     set_int(warning, 1);
-                  }
-                  else {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "default", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,default", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "default", 0.0);
-                     set_int(warning, 0);
-                  }
+               if (dx > SLIDER_WARNING_LEVEL) {
+                 if (!get_int(disabled)) {
+                   set_state(PART:"handle_color", "warning", 0.0);
+                   if (get_int(popup_show))
+                     emit("popup,warning", "popup,emit");
+                 }
+                 else {
+                   set_state(PART:"handle_color", "disabled_warning", 0.0);
+                 }
+                 set_state(PART:"level_warning_clip", "warning", 0.0);
+                 set_int(warning, 1);
                }
                else {
-                  if (dx > SLIDER_WARNING_LEVEL) {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "warning", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,warning", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled_warning", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "warning", 0.0);
-                     set_int(warning, 1);
-                  }
-                  else {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "default", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,default", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "default", 0.0);
-                     set_int(warning, 0);
-                  }
+                 if (!get_int(disabled)) {
+                   set_state(PART:"handle_color", "default", 0.0);
+                   if (get_int(popup_show))
+                     emit("popup,default", "popup,emit");
+                 }
+                 else {
+                   set_state(PART:"handle_color", "disabled", 0.0);
+                 }
+                 set_state(PART:"level_warning_clip", "default", 0.0);
+                 set_int(warning, 0);
                }
             }
             else {
-               if (get_int(warning_area_set)) {
-                  if (dx < (1.0 - get_float(warning_area))) {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "warning", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,warning", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled_warning", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "inverted_warning", 0.0);
-                     set_int(warning, 1);
-                  }
-                  else {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "default", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,default", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "inverted", 0.0);
-                     set_int(warning, 0);
-                  }
+               if (dx < (1.0 - SLIDER_WARNING_LEVEL)) {
+                 if (!get_int(disabled)) {
+                   set_state(PART:"handle_color", "warning", 0.0);
+                   if (get_int(popup_show))
+                     emit("popup,warning", "popup,emit");
+                 }
+                 else {
+                   set_state(PART:"handle_color", "disabled_warning", 0.0);
+                 }
+                 set_state(PART:"level_warning_clip", "inverted_warning", 0.0);
+                 set_int(warning, 1);
                }
                else {
-                  if (dx < (1.0 - SLIDER_WARNING_LEVEL)) {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "warning", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,warning", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled_warning", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "inverted_warning", 0.0);
-                     set_int(warning, 1);
-                  }
-                  else {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "default", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,default", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "inverted", 0.0);
-                     set_int(warning, 0);
-                  }
-               }
-            }
-         }
-         public message(Msg_Type:type, id, ...) {
-            if (type == MSG_FLOAT_SET) {
-               new Float:ratio;
-               ratio = getfarg(2);
-               if (id == 0) {
-                  set_float(warning_area, ratio);
-                  set_int(warning_area_set, 1);
-                  custom_state(PART:"center_point", "default", 0.0);
-                  if (!get_int(invert_on)) {
-                     set_state_val(PART:"center_point", STATE_ALIGNMENT, ratio, 0.5);
-                  }
-                  else {
-                     set_state_val(PART:"center_point", STATE_ALIGNMENT, 1 - ratio, 0.5);
-                  }
-                  set_state(PART:"center_point", "custom", 0.0);
-                  drag_state_warning();
+                 if (!get_int(disabled)) {
+                   set_state(PART:"handle_color", "default", 0.0);
+                   if (get_int(popup_show))
+                     emit("popup,default", "popup,emit");
+                 }
+                 else {
+                   set_state(PART:"handle_color", "disabled", 0.0);
+                 }
+                 set_state(PART:"level_warning_clip", "inverted", 0.0);
+                 set_int(warning, 0);
                }
             }
          }
@@ -1151,10 +1022,11 @@ group { name: "elm/slider/horizontal/warning";
                description {
                   state: "default" 0.0;
                   min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
                   fixed: 1 0;
                   rel1.to: "bg";
                   rel2 {
-                     relative: 0.0 1.0;
+                     relative: 0.0  1.0;
                      to: "bg";
                   }
                   align: 0.0 0.5;
@@ -1192,6 +1064,7 @@ group { name: "elm/slider/horizontal/warning";
                   state: "default" 0.0;
                   align: 0.0 0.5;
                   min: 0 0;
+                  max: 0 0;
                   rel1 {
                      relative: 1.0  0.0;
                      to: "elm.swallow.icon";
@@ -1200,11 +1073,12 @@ group { name: "elm/slider/horizontal/warning";
                      relative: 1.0  1.0;
                      to: "elm.swallow.icon";
                   }
-                  fixed: 1 0;
+                  fixed: 1 1;
                }
                description { state: "visible";
                   inherit: "default" 0.0;
                   min: SLIDER_ICON_PADDING_SIZE_INC;
+                  max: SLIDER_ICON_PADDING_SIZE_INC;
                }
             }
             part {
@@ -1215,6 +1089,7 @@ group { name: "elm/slider/horizontal/warning";
                   state: "default" 0.0;
                   align: 0.0 0.5;
                   min: 0 0;
+                  max: 0 0;
                   rel1 {
                      relative: 1.0  0.0;
                      to: "bar_icon_right_padding_1";
@@ -1223,11 +1098,12 @@ group { name: "elm/slider/horizontal/warning";
                      relative: 1.0  1.0;
                      to: "bar_icon_right_padding_1";
                   }
-                  fixed: 1 0;
+                  fixed: 1 1;
                }
                description { state: "visible";
                   inherit: "default" 0.0;
                   min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
                }
             }
             part { name: "base";
@@ -1236,15 +1112,14 @@ group { name: "elm/slider/horizontal/warning";
                scale: 1;
                description { state: "default" 0.0;
                   min: 0 SLIDER_BASE_HEIGHT_INC;
+                  max: -1 SLIDER_BASE_HEIGHT_INC;
                   rel1 {
-                     to_x: "bar_icon_right_padding_2";
-                     to_y: "bg";
-                     relative: 1.0 0.5;
+                     to: "bar_icon_right_padding_2";
+                     relative: 1.0 0.0;
                   }
                   rel2 {
-                     to_x: "bar_image_right_padding";
-                     to_y: "bg";
-                     relative: 0.0 0.5;
+                     to: "bar_image_right_padding";
+                     relative: 0.0 1.0;
                   }
                   fixed: 0 1;
                   color: 145 145 145 179;
@@ -1400,13 +1275,14 @@ group { name: "elm/slider/horizontal/warning";
                description {
                   state: "default" 0.0;
                   min: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
+                  max: SLIDER_LEFT_RIGHT_PADDING_SIZE_INC;
                   fixed: 1 0;
                   rel1 {
-                     relative: 1.0 0.0;
+                     relative: 1.0  0.0;
                      to: "bg";
                   }
                   rel2 {
-                     relative: 1.0 1.0;
+                     relative: 1.0  1.0;
                      to: "bg";
                   }
                   align: 1.0 0.5;
@@ -2663,11 +2539,8 @@ group { name: "elm/slider/vertical/default";
          public invert_on = 0;
          public warning = 0;
          public disabled = 0;
-         public popup_show = 1;
          public show = 0;
-         public warning_area = 0;
-         public warning_area_set = 0;
-
+         public popup_show = 1;
          public set_popup_show() {
             set_int(popup_show, 0);
          }
@@ -2732,130 +2605,47 @@ group { name: "elm/slider/vertical/default";
             new Float:dx, Float:dy;
             get_drag(PART:"elm.dragable.slider", dx, dy);
             if (!get_int(invert_on)) {
-               if (get_int(warning_area_set)) {
-                  if (dy > get_float(warning_area)) {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "warning", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,warning", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled_warning", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "warning", 0.0);
-                     set_int(warning, 1);
+               if (dy > SLIDER_WARNING_LEVEL) {
+                  if (!get_int(disabled)) {
+                     set_state(PART:"handle_color", "warning", 0.0);
                   }
                   else {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "default", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,default", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "default", 0.0);
-                     set_int(warning, 0);
+                     set_state(PART:"handle_color", "disabled_warning", 0.0);
                   }
+                  set_state(PART:"level_warning_clip", "warning", 0.0);
+                  set_int(warning, 1);
                }
                else {
-                  if (dy > SLIDER_WARNING_LEVEL) {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "warning", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,warning", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled_warning", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "warning", 0.0);
-                     set_int(warning, 1);
+                  if (!get_int(disabled)) {
+                     set_state(PART:"handle_color", "default", 0.0);
                   }
                   else {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "default", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,default", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "default", 0.0);
-                     set_int(warning, 0);
+                     set_state(PART:"handle_color", "disabled", 0.0);
                   }
+                  set_state(PART:"level_warning_clip", "default", 0.0);
+                  set_int(warning, 0);
                }
             }
             else {
-               if (get_int(warning_area_set)) {
-                  if (dy < (1.0 - get_float(warning_area))) {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "warning", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,warning", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled_warning", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "inverted_warning", 0.0);
-                     set_int(warning, 1);
+               if (dy < (1.0 - SLIDER_WARNING_LEVEL)) {
+                  if (!get_int(disabled)) {
+                     set_state(PART:"handle_color", "warning", 0.0);
                   }
                   else {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "default", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,default", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "inverted", 0.0);
-                     set_int(warning, 0);
+                     set_state(PART:"handle_color", "disabled_warning", 0.0);
                   }
+                  set_state(PART:"level_warning_clip", "inverted_warning", 0.0);
+                  set_int(warning, 1);
                }
                else {
-                  if (dy < (1.0 - SLIDER_WARNING_LEVEL)) {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "warning", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,warning", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled_warning", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "inverted_warning", 0.0);
-                     set_int(warning, 1);
-                  }
-                  else {
-                     if (!get_int(disabled)) {
-                        set_state(PART:"handle_color", "default", 0.0);
-                        if (get_int(popup_show))
-                           emit("popup,default", "popup,emit");
-                     }
-                     else {
-                        set_state(PART:"handle_color", "disabled", 0.0);
-                     }
-                     set_state(PART:"level_warning_clip", "inverted", 0.0);
-                     set_int(warning, 0);
-                  }
-               }
-            }
-         }
-         public message(Msg_Type:type, id, ...) {
-            if (type == MSG_FLOAT_SET) {
-               new Float:ratio;
-               ratio = getfarg(2);
-               if (id == 0) {
-                  set_float(warning_area, ratio);
-                  set_int(warning_area_set, 1);
-                  custom_state(PART:"center_point", "default", 0.0);
-                  if (!get_int(invert_on)) {
-                     set_state_val(PART:"center_point", STATE_ALIGNMENT, 0.5, ratio);
+                  if (!get_int(disabled)) {
+                     set_state(PART:"handle_color", "default", 0.0);
                   }
                   else {
-                     set_state_val(PART:"center_point", STATE_ALIGNMENT, 0.5, 1 - ratio);
+                     set_state(PART:"handle_color", "disabled", 0.0);
                   }
-                  set_state(PART:"center_point", "custom", 0.0);
-                  drag_state_warning();
+                  set_state(PART:"level_warning_clip", "inverted", 0.0);
+                  set_int(warning, 0);
                }
             }
          }
@@ -2864,10 +2654,10 @@ group { name: "elm/slider/vertical/default";
          part { name: "access";
             type: RECT;
                description { state: "default" 0.0;
-                  fixed: 1 1;
-                  color: 0 0 0 0;
+               fixed: 1 1;
+               color: 0 0 0 0;
                }
-            }
+          }
             part {
                name: "bg";
                type: SPACER;
@@ -2888,7 +2678,7 @@ group { name: "elm/slider/vertical/default";
                   max: SLIDER_TOP_PADDING_SIZE_INC;
                   fixed: 1 1;
                   rel1 {
-                     relative: 0.0 0.0;
+                     relative: 0.0  0.0;
                      to: "bg";
                   }
                   rel2 {
index 1f7f193..04d119b 100644 (file)
@@ -340,32 +340,24 @@ group { name: "elm/toolbar/item/tabbar";
          scale: 1;
          mouse_events: 0;
          description { state: "default" 0.0;
+            min: 0 TABBAR_COMMON_SELECTED_LINE_HEIGHT_INC;
+            max: 0 TABBAR_COMMON_SELECTED_LINE_HEIGHT_INC;
             rel1 {
                to: "selected_line_top_padding";
-               relative: 0.25 1.0;
+               relative: 0.0 1.0;
             }
             rel2 {
                to: "selected_line_top_padding";
-               relative: 0.75 1.0;
+               relative: 1.0 1.0;
             }
             image.normal: "core_tab_selectbar.#.png";
             fixed: 0 1;
+            color: 249 249 249 255;
             align: 0.5 0.0;
-            min: 0 TABBAR_COMMON_SELECTED_LINE_HEIGHT_INC;
-            max: -1 TABBAR_COMMON_SELECTED_LINE_HEIGHT_INC;
-            color: 249 249 249 0;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            rel1 {
-               to: "selected_line_top_padding";
-               relative: 0.0 1.0;
-            }
-            rel2 {
-               to: "selected_line_top_padding";
-               relative: 1.0 1.0;
-            }
-            color: 249 249 249 255;
+            max: -1 TABBAR_COMMON_SELECTED_LINE_HEIGHT_INC;
          }
       }
       part { name: "padding_left_top";
index b79adfb..cc6cd55 100644 (file)
          }
          //BAR
          part { name: "elm.bar";
-            type: SPACER;
+            type: RECT;
             dragable {
                confine: "whole";
                x: 1 1 1;
             }
             scale: 1;
             description { state: "default" 0.0;
-               min: PANES_STYLE_DEFAULT_MOVABLE_SIZE_INC 0;
-               fixed: 1 0;
-               rel1.relative: 0.5 0.0;
-               rel2.relative: 0.5 1.0;
+               min: PANES_STYLE_DEFAULT_MOVABLE_SIZE_INC 999999;
+               fixed: 0 1;
+               align: 1.0 0.5;
+               rel1.relative: 0.0 0.5;
+               rel2.relative: 1.0 0.5;
+               color: 0 0 0 0;
             }
             description { state: "default" 0.1;
                inherit: "default" 0.0;
-               min: 0 0;
+               min: 0 999999;
             }
             description { state: "disabled" 0.0;
                inherit:  "default" 0.0;
-               min: PANES_STYLE_DEFAULT_FIXED_SIZE_INC 0;
+               min: PANES_STYLE_DEFAULT_FIXED_SIZE_INC 999999;
             }
             description { state: "disabled" 0.1;
                inherit:  "default" 0.1;
          }
          part { name: "bar_bg";
             type: IMAGE;
-            dragable.events: "elm.bar";
+            mouse_events: 0;
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 0.0;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-               rel1.to_x: "bar_bg";
-               rel2.to_x: "bar_bg";
-               color: 0 0 0 0;
+               rel1.to: "elm.bar";
+               rel2.to: "elm.bar";
             }
             description { state: "disabled" 0.0;
                inherit:  "default" 0.0;
             mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
-               rel1.to_x: "bar_bg";
-               rel2.to_x: "bar_bg";
-               color: 0 0 0 0;
+               rel1.to: "elm.bar";
+               rel2.to: "elm.bar";
             }
             description { state: "clicked" 0.0;
                inherit:  "default" 0.0;
          part { name:"bar_disabled";
             type: RECT;
             description { state:"default" 0.0;
-               rel1.to_x: "bar_bg";
-               rel2.to_x: "bar_bg";
+               rel1.to_x: "elm.bar";
+               rel2.to_x: "elm.bar";
                color: 0 0 0 0;
                visible: 0;
             }
          }
          //BAR
          part { name: "elm.bar";
-            type: SPACER;
+            type: RECT;
             dragable {
                confine: "whole";
                x: 0 0 0;
             }
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 PANES_STYLE_DEFAULT_MOVABLE_SIZE_INC;
-               fixed: 0 1;
-               rel1.relative: 0.0 0.5;
-               rel2.relative: 1.0 0.5;
+               min: 999999 PANES_STYLE_DEFAULT_MOVABLE_SIZE_INC;
+               fixed: 1 0;
+               align: 0.5 0.0;
+               rel1.relative: 0.5 0.0;
+               rel2.relative: 0.5 1.0;
+               color: 0 0 0 0;
             }
             description { state: "default" 0.1;
                inherit: "default" 0.0;
-               min: 0 0;
+               min: 999999 0;
             }
             description { state: "disabled" 0.0;
                inherit:  "default" 0.0;
-               min: 0 PANES_STYLE_DEFAULT_FIXED_SIZE_INC;
+               min: 999999 PANES_STYLE_DEFAULT_FIXED_SIZE_INC;
+               visible: 0;
             }
             description { state: "disabled" 0.1;
                inherit:  "default" 0.1;
          }
          part { name: "bar_bg";
             type: IMAGE;
-            dragable.events: "elm.bar";
+            mouse_events: 0;
             description { state: "default" 0.0;
                rel1 {
                   relative: 0.0 1.0;
             repeat_events: 1;
             ignore_flags: ON_HOLD;
             description { state: "default" 0.0;
-               rel1.to_y: "bar_bg";
-               rel2.to_y: "bar_bg";
-               color: 0 0 0 0;
+               rel1.to: "elm.bar";
+               rel2.to: "elm.bar";
             }
             description { state: "disabled" 0.0;
                inherit:  "default" 0.0;
             mouse_events: 1;
             repeat_events: 1;
             description { state: "default" 0.0;
-               rel1.to_y: "bar_bg";
-               rel2.to_y: "bar_bg";
-               color: 0 0 0 0;
+               rel1.to: "elm.bar";
+               rel2.to: "elm.bar";
             }
             description { state: "clicked" 0.0;
                inherit:  "default" 0.0;
          part { name:"bar_disabled";
             type: RECT;
             description { state:"default" 0.0;
-               rel1.to_y: "bar_bg";
-               rel2.to_y: "bar_bg";
+               rel1.to_y: "elm.bar";
+               rel2.to_y: "elm.bar";
                color: 0 0 0 0;
                visible: 0;
             }
index 6400f33..32b92a1 100644 (file)
@@ -1,6 +1,6 @@
 Name:          efl-theme-tizen
 Summary:       Tizen theme files
-Version:       1.2.34
+Version:       1.2.31
 Release:       1
 Group:         TO_BE/FILLED_IN
 License:       BSD 2-Clause and Flora-1.1