tizen: port to efl-1.11.0

- replace select_mode from BLOCK_HANDLE to DEFAULT
- remove duplicated scripts in inherited objects
- remove double inclusion (scroller.edc already included by genlist.edc)

It does still build on efl-1.9.3

Change-Id: I82a9e6f69030958f89bb005ddb51e7de232c03b6
Bug-Tizen: PTREL-737/part
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>

diff --git a/themes/tizen.edc b/themes/tizen.edc
index 3fcdf46..53e490f 100644 (file)
--- a/themes/tizen.edc
+++ b/themes/tizen.edc
@@ -79,7 +79,6 @@ collections {
 #include "widgets/popup.edc"
 #include "widgets/progressbar.edc"
 #include "widgets/radio.edc"
-#include "widgets/scroller.edc"
 #include "widgets/segmentedcontrol.edc"
 #include "widgets/selectioninfo.edc"
 #include "widgets/slider.edc"

diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index aa701ef..7ad3574 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -965,9 +965,6 @@
 //////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/datetime_ampm/default";
       inherit: "elm/button/base/style1/auto_expand";
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-      }
       parts {
          part { name: "bg";
             type: RECT;

diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index 0380912..b888f70 100644 (file)
--- a/themes/widgets/entry.edc
+++ b/themes/widgets/entry.edc
@@ -61,7 +61,7 @@ group { name: "elm/entry/base/default";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
@@ -149,7 +149,7 @@ group { name: "elm/entry/base-charwrap/default";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
@@ -210,7 +210,7 @@ group { name: "elm/entry/base-nowrap/default";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
@@ -302,7 +302,7 @@ group { name: "elm/entry/base/editfield";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
@@ -395,7 +395,7 @@ group { name: "elm/entry/base-charwrap/editfield";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
@@ -488,7 +488,7 @@ group { name: "elm/entry/base-single/editfield";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 0;
          source: "elm/entry/selection/default"; // selection under
@@ -546,7 +546,7 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 0;
          source: "elm/entry/selection/default"; // selection under
@@ -591,64 +591,6 @@ group { name: "elm/entry/base-single/editfield/searchbar/default";
    }
 }
 
-group { name: "elm/entry/base-nowrap/default";
-   data.item: "default_font_size" "24";
-   data.item: "min_font_size" "8";
-   data.item: "max_font_size" "60";
-   data {
-      item: context_menu_orientation "horizontal";
-   }
-   parts {
-      part { name: "elm.text";
-         type: TEXTBLOCK;
-         mouse_events: 1;
-         scale: 1;
-         entry_mode: EDITABLE;
-         select_mode: BLOCK_HANDLE;
-         //cursor_mode: BEFORE;
-         multiline: 1;
-         source: "elm/entry/selection/default"; // selection under
-         source2: ENTRY_BLOCK_HANDLE_SOURCE2; // block handle
-         source3: ENTRY_BLOCK_HANDLE_SOURCE3; // block handle
-         source4: "elm/entry/cursor/default"; // cursorover
-         source5: "elm/entry/anchor/default"; // anchor under
-         description { state: "default" 0.0;
-            text {
-               style: "entry_textblock_style";
-               min: 1 1;
-               align: 0.0 0.0;
-            }
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            text {
-               style: "entry_textblock_disabled_style";
-               min: 0 1;
-            }
-         }
-      }
-   }
-   programs {
-      program { name: "focus";
-         signal: "load";
-         source: "";
-         action: FOCUS_SET;
-         target: "elm.text";
-      }
-      program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "elm.text";
-      }
-      program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.text";
-      }
-   }
-}
 
 group { name: "elm/entry/base-single/default";
    data.item: "default_font_size" "24";
@@ -689,7 +631,7 @@ group { name: "elm/entry/base-single/default";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 0;
          source: "elm/entry/selection/default"; // selection under
@@ -748,7 +690,7 @@ group { name: "elm/entry/base-single-noedit/default";
          mouse_events: 1;
          scale: 1;
          entry_mode: PLAIN;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 0;
          source: "elm/entry/selection/default"; // selection under
@@ -805,7 +747,7 @@ group { name: "elm/entry/base-noedit/default";
          mouse_events: 1;
          scale: 1;
          entry_mode: PLAIN;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
@@ -863,7 +805,7 @@ group { name: "elm/entry/base-noedit/default";
            mouse_events: 1;
            scale: 1;
            entry_mode: PLAIN;
-           select_mode: BLOCK_HANDLE;
+           select_mode: DEFAULT;
            //cursor_mode: BEFORE;
            multiline: 1;
            source: "elm/entry/selection/default"; // selection under
@@ -921,7 +863,7 @@ group { name: "elm/entry/base-noedit/default";
            mouse_events: 1;
            scale: 1;
            entry_mode: PLAIN;
-           select_mode: BLOCK_HANDLE;
+           select_mode: DEFAULT;
            //cursor_mode: BEFORE;
            multiline: 1;
            source: "elm/entry/selection/default"; // selection under
@@ -978,7 +920,7 @@ group { name: "elm/entry/base-noedit/default";
            mouse_events: 1;
            scale: 1;
            entry_mode: PASSWORD;
-           select_mode: BLOCK_HANDLE;
+           select_mode: DEFAULT;
            //cursor_mode: BEFORE;
            multiline: 0;
            source: "elm/entry/selection/default"; // selection under
@@ -1065,7 +1007,7 @@ group { name: "elm/entry/base-password/popup";
          mouse_events: 1;
          scale: 1;
          entry_mode: PASSWORD;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 0;
          source: "elm/entry/selection/default"; // selection under
@@ -2000,7 +1942,7 @@ group { name: "elm/entry/base-password/popup";
            mouse_events: 1;
            scale: 1;
            entry_mode: EDITABLE;
-           select_mode: BLOCK_HANDLE;
+           select_mode: DEFAULT;
            //cursor_mode: BEFORE;
            multiline: 1;
            source: "elm/entry/selection/default"; // selection under
@@ -2292,7 +2234,7 @@ group { name: "elm/entry/base-password/popup";
            mouse_events: 1;
            scale: 1;
            entry_mode: PLAIN;
-           select_mode: BLOCK_HANDLE;
+           select_mode: DEFAULT;
            //cursor_mode: BEFORE;
            multiline: 1;
            source: "elm/entry/selection/default"; // selection under
@@ -2633,7 +2575,7 @@ group { name: "elm/entry/base-password/popup";
            mouse_events: 1;
            scale: 1;
            entry_mode: PLAIN;
-           select_mode: BLOCK_HANDLE;
+           select_mode: DEFAULT;
            //cursor_mode: BEFORE;
            multiline: 1;
            source: "elm/entry/selection/default"; // selection under
@@ -2761,7 +2703,7 @@ group { name: "elm/entry/base-password/popup";
            mouse_events: 1;
            scale: 1;
            entry_mode: EDITABLE;
-           select_mode: BLOCK_HANDLE;
+           select_mode: DEFAULT;
            //cursor_mode: BEFORE;
            multiline: 1;
            source: "elm/entry/selection/default"; // selection under
@@ -3051,7 +2993,7 @@ group { name: "elm/entry/base-password/popup";
            mouse_events: 1;
            scale: 1;
            entry_mode: PLAIN;
-           select_mode: BLOCK_HANDLE;
+           select_mode: DEFAULT;
            //cursor_mode: BEFORE;
            multiline: 1;
            source: "elm/entry/selection/default"; // selection under
@@ -3409,7 +3351,7 @@ group { name: "elm/entry/base-password/popup";
            mouse_events: 1;
            scale: 1;
            entry_mode: PLAIN;
-           select_mode: BLOCK_HANDLE;
+           select_mode: DEFAULT;
            //cursor_mode: BEFORE;
            multiline: 1;
            source: "elm/entry/selection/default"; // selection under
@@ -3505,7 +3447,7 @@ group { name: "elm/entry/base/font_color_black";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
@@ -3565,7 +3507,7 @@ group { name: "elm/entry/base-noedit/font_color_black";
          mouse_events: 1;
          scale: 1;
          entry_mode: PLAIN;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
@@ -3660,7 +3602,7 @@ group { name: "elm/entry/base-charwrap/font_color_black";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 1;
          source: "elm/entry/selection/default"; // selection under
@@ -3755,7 +3697,7 @@ group { name: "elm/entry/base-single/font_color_black";
          mouse_events: 1;
          scale: 1;
          entry_mode: EDITABLE;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 0;
          source: "elm/entry/selection/default"; // selection under
@@ -3813,7 +3755,7 @@ group { name: "elm/entry/base-single-noedit/font_color_black";
          mouse_events: 1;
          scale: 1;
          entry_mode: PLAIN;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          //cursor_mode: BEFORE;
          multiline: 0;
          source: "elm/entry/selection/default"; // selection under
@@ -3871,7 +3813,7 @@ group { name: "elm/entry/base-password/font_color_black";
          mouse_events: 1;
          scale: 1;
          entry_mode: PASSWORD;
-         select_mode: BLOCK_HANDLE;
+         select_mode: DEFAULT;
          multiline: 0;
          source: "elm/entry/selection/default"; // selection under
          source2: ENTRY_BLOCK_HANDLE_SOURCE2; // block handle

diff --git a/themes/widgets/genlist/genlist.edc b/themes/widgets/genlist/genlist.edc
index 98d7738..89c9c2a 100644 (file)
--- a/themes/widgets/genlist/genlist.edc
+++ b/themes/widgets/genlist/genlist.edc
@@ -34,30 +34,6 @@
       alias: "elm/scroller/base/dialogue";
       inherit: "elm/scroller/base/default";
 
-         script {
-         public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer;
-         public timer0(val) {
-            new v;
-            v = get_int(sbvis_v);
-            if (v) {
-               v = get_int(sbalways_v);
-               if (!v) {
-                  emit("do-hide-vbar", "");
-                  set_int(sbvis_v, 0);
-               }
-            }
-            v = get_int(sbvis_h);
-            if (v) {
-               v = get_int(sbalways_h);
-               if (!v) {
-                  emit("do-hide-hbar", "");
-                  set_int(sbvis_h, 0);
-               }
-            }
-            set_int(sbvis_timer, 0);
-            return 0;
-         }
-      }
       parts {
          part { name: "bg";
             description { state: "default" 0.0;

diff --git a/themes/widgets/naviframe.edc b/themes/widgets/naviframe.edc
index becf36a..27f1101 100644 (file)
--- a/themes/widgets/naviframe.edc
+++ b/themes/widgets/naviframe.edc
@@ -2200,11 +2200,6 @@
       inherit: "elm/naviframe/item/basic/default";
       alias:"elm/naviframe/item/1line/instant/default";
       alias:"elm/naviframe/item/instant/default";
-      script {
-         public oh_show = 0;     //optionheader show/hide
-         public oh_close = 0;    //optionheader close/open
-         public cbar_bg = 0;     //Controlbar BG Show call count
-      }
       programs {
          program { name: "cur_pushed";
             signal: "elm,state,cur,pushed";
@@ -2232,11 +2227,6 @@
       inherit: "elm/naviframe/item/basic2/default";
       alias:"elm/naviframe/item/2line/instant/default";
       alias:"elm/naviframe/item/instant2/default";
-      script {
-         public oh_show = 0;     //optionheader show/hide
-         public oh_close = 0;    //optionheader close/open
-         public cbar_bg = 0;     //Controlbar BG Show call count
-      }
       programs {
          program { name: "cur_pushed";
             signal: "elm,state,cur,pushed";
@@ -2262,9 +2252,6 @@
    }
    group { name: "elm/naviframe/item/segment/instant/default";
       inherit:  "elm/naviframe/item/segment/default";
-      script {
-         public cbar_bg = 0;     //Controlbar BG Show call count
-      }
       programs {
          program { name: "cur_pushed";
             signal: "elm,state,cur,pushed";
@@ -2303,9 +2290,6 @@
 
    group { name: "elm/naviframe/item/tabbar/instant/default";
       inherit:  "elm/naviframe/item/tabbar/default";
-      script {
-         public cbar_bg = 0;     //Controlbar BG Show call count
-      }
       programs {
          program { name: "cur_pushed";
             signal: "elm,state,cur,pushed";

diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc
index e11529e..f1f2946 100644 (file)
--- a/themes/widgets/popup.edc
+++ b/themes/widgets/popup.edc
@@ -2769,9 +2769,6 @@ group { name: "elm/popup/buttons3/content_expand";
 
 group { name: "elm/popup/item/content_expand";
    inherit: "elm/popup/item/default";
-   script {
-      public item_state = POPUP_ITEM_STATE_ENABLED;
-   }
    parts {
       part { name: "bg";
          mouse_events: 0;

diff --git a/themes/widgets/slider.edc b/themes/widgets/slider.edc
index 1fa4001..11f8729 100644 (file)
--- a/themes/widgets/slider.edc
+++ b/themes/widgets/slider.edc
@@ -2911,31 +2911,6 @@
 
    group { name: "elm/slider/horizontal/expanded_indicator_button";
       inherit: "elm/slider/horizontal/default";
-      script {
-         public invert_on = 0;
-         public set_invert_on() {
-            set_state(PART:"level", "inverted", 0.0);
-            set_state(PART:"level2", "inverted", 0.0);
-            set_int(invert_on, 1);
-         }
-         public set_invert_off() {
-            set_state(PART:"level", "default", 0.0);
-            set_state(PART:"level2", "default", 0.0);
-            set_int(invert_on, 0);
-         }
-         public thumb_down() {
-            if(get_int(invert_on) == 0)
-               set_state(PART:"level", "pressed", 0.0);
-            else if(get_int(invert_on) == 1)
-               set_state(PART:"level2", "pressed", 0.0);
-            }
-         public thumb_up() {
-            if(get_int(invert_on) == 0)
-               set_state(PART:"level", "default", 0.0);
-            else if(get_int(invert_on) == 1)
-               set_state(PART:"level2", "inverted", 0.0);
-            }
-         }
       parts {
          part { name: "elm.dragable.slider";
             type: GROUP;

diff --git a/themes/widgets/toolbar.edc b/themes/widgets/toolbar.edc
index 19ae3ba..4d1d0d3 100644 (file)
--- a/themes/widgets/toolbar.edc
+++ b/themes/widgets/toolbar.edc
@@ -647,9 +647,6 @@ group { name: "elm/toolbar/item/default";
 
 group { name: "elm/toolbar/item/item_horizontal";
    inherit: "elm/toolbar/item/default";
-   script {
-      public item_state = ITEM_STATE_ENABLED;
-   }
    parts {
       part { name: "icon_rect";
          description { state: "default" 0.0;
@@ -1708,9 +1705,6 @@ group { name: "elm/toolbar/item/tabbar";
 
 group { name: "elm/toolbar/item/tabbar/item_horizontal";
    inherit: "elm/toolbar/item/tabbar";
-   script {
-      public item_state = ITEM_STATE_ENABLED;
-   }
    parts {
       part { name: "icon_rect";
          description { state: "default" 0.0;