viewmgr: Add tab view.

tab view has tabbar area.
It inheritance ui_basic_view.

Change-Id: I1aad8ab13dc62eb3179360684085b83f98583963

diff --git a/inc/main.h b/inc/main.h
index fcc523d..0dbbc4f 100644 (file)
--- a/inc/main.h
+++ b/inc/main.h
@@ -40,4 +40,4 @@ typedef struct appdata {
 } appdata_s;
 
 Evas_Object *create_content(Evas_Object *parent, const char *text, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb, appdata_s *ad);
-Evas_Object *create_tabbar(Evas_Object *parent);
+Evas_Object *create_toolbar(Evas_Object *parent);

diff --git a/res/ui-viewmgr.edc b/res/ui-viewmgr.edc
index 21299ce..799c55a 100644 (file)
--- a/res/ui-viewmgr.edc
+++ b/res/ui-viewmgr.edc
@@ -41,21 +41,15 @@
 #define TIZEN_VIEW_BADGE2_PADDING_WIDTH_INC (TIZEN_VIEW_BADGE_ICON_LEFT_PADDING_WIDTH_INC + TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC + TIZEN_VIEW_BADGE_TEXT_LEFT_PADDING_WIDTH_INC)
 #define TIZEN_VIEW_TITLE_LEFT_PADDING_WIDTH_INC 32
 #define TIZEN_VIEW_TITLE_FUNC_BTN_SIZE_INC 176 110
-#define TIZEN_VIEW_TOOLBAR_HEIGHT_INC 152
-#define TIZEN_VIEW_TOOLBAR_COLOR_INC 250 250 250 255
-#define TIZEN_VIEW_TOOLBAR_LEFT_TOP_PADDING_WIDTH_INC 32 23
-#define TIZEN_VIEW_TOOLBAR_RIGHT_BOTTOM_PADDING_WIDTH_INC 32 23
 #define TIZEN_VIEW_BACK_BUTTON_LR_PADDING_WIDTH_INC 10
-#define BUTTON_TIZEN_VIEW_TITLE_BUTTON_SIZE_INC 67 67
 #define TIZEN_VIEW_BACK_BUTTON_TITLE_RIGHT_PADDING_WIDTH_INC 90
 #define BUTTON_TIZEN_VIEW_BACK_BUTTON_SIZE_INC 80 80
 #define TIZEN_VIEW_TITLE_RIGHT_PADDING_WIDTH_INC 32
-#define TIZEN_VIEW_TABBAR_TITLE_TOP_PADDING_HEIGHT_INC 80
-#define TIZEN_VIEW_TABBAR_TITLE_HEIGHT_INC 100
-#define TIZEN_VIEW_TABBAR_TITLE_CLIPPER_HEIGHT_INC 80
-#define TIZEN_VIEW_TABBAR_LIGHT_VIEW_HEIGHT_INC 86
-#define TIZEN_VIEW_TABBAR2_HEIGHT_INC 144
-#define TIZEN_VIEW_TABBAR_TOP_DIVIDER_HEIGHT_INC 0
+#define TIZEN_VIEW_TOOLBAR_TITLE_TOP_PADDING_HEIGHT_INC 80
+#define TIZEN_VIEW_TOOLBAR_TITLE_HEIGHT_INC 100
+#define TIZEN_VIEW_TOOLBAR_TITLE_CLIPPER_HEIGHT_INC 80
+#define TIZEN_VIEW_TOOLBAR_LIGHT_VIEW_HEIGHT_INC 86
+#define TIZEN_VIEW_TOOLBAR_TOP_DIVIDER_HEIGHT_INC 0
 
 collections {
   base_scale: 2.6;
@@ -87,7 +81,7 @@ collections {
          public prev_btn_visible = 0;        //Previous button visible status
          public title_left_btn_visible = 0;  //Title left button visible status
          public title_right_btn_visible = 0; //Title right button visible status
-         public tabbar_visible = 0;          //Tabbar visible status (This value is used for tabbar group)
+         public toolbar_visible = 0;          //Tabbar visible status (This value is used for toolbar group)
       }
       parts {
          part { name: "base";
@@ -142,6 +136,75 @@ collections {
                max: -1 0;
             }
          }
+         part { name: "toolbar_top_padding";
+            type: SPACER;
+            scale: 1;
+            repeat_events: 1;
+            description { state: "default" 0.0;
+               min: 0 TIZEN_VIEW_TOOLBAR_TITLE_TOP_PADDING_HEIGHT_INC;
+               max: -1 TIZEN_VIEW_TOOLBAR_TITLE_TOP_PADDING_HEIGHT_INC;
+               fixed: 0 1;
+               align: 0.5 0.0;
+               rel1 { to: "title_bg"; relative: 0.0 0.0; }
+               rel2 { to: "title_bg"; relative: 1.0 0.0; }
+            }
+         }
+         part { name: "toolbar";
+            type: SWALLOW;
+            scale: 1;
+            clip_to: "toolbar_clipper";
+            description { state: "default" 0.0;
+               min: 0 0;
+               max: -1 0;
+               fixed: 0 1;
+               align: 0.5 0.0;
+               rel1 { to: "toolbar_top_padding"; relative: 0.0 1.0; }
+               rel2 { to: "toolbar_top_padding"; relative: 1.0 1.0; }
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: 0 TIZEN_VIEW_TOOLBAR_TITLE_HEIGHT_INC;
+               max: -1 TIZEN_VIEW_TOOLBAR_TITLE_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "toolbar_top_divider";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "toolbar_clipper";
+            description { state: "default" 0.0;
+               min: 0 0;
+               max: -1 0;
+               fixed: 0 1;
+               align: 0.5 0.0;
+               rel1 { to: "toolbar_clipper"; relative: 0.0 0.0; }
+               rel2 { to: "toolbar_clipper"; relative: 1.0 0.0; }
+               color: 244 244 244 25;
+               visible: 0;
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: 0 TIZEN_VIEW_TOOLBAR_TOP_DIVIDER_HEIGHT_INC;
+               max: -1 TIZEN_VIEW_TOOLBAR_TOP_DIVIDER_HEIGHT_INC;
+               visible: 1;
+            }
+         }
+         part { name: "toolbar_clipper";
+            type: RECT;
+            scale: 1;
+            mouse_events: 0;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               min: 0 TIZEN_VIEW_TOOLBAR_TITLE_CLIPPER_HEIGHT_INC;
+               max: -1 TIZEN_VIEW_TOOLBAR_TITLE_CLIPPER_HEIGHT_INC;
+               fixed: 0 1;
+               align: 0.5 1.0;
+               rel1 { to: "toolbar"; relative: 0.0 1.0; }
+               rel2 { to: "toolbar"; relative: 1.0 1.0; }
+            }
+         }
          part { name: "title_clipper";
             type: RECT;
             mouse_events: 0;
@@ -533,7 +596,13 @@ collections {
             description { state: "default" 0.0;
                align: 0.0 0.0;
                rel1 { to_x: "base"; to_y: "title_bg"; relative: 0.0 1.0; }
-               rel2 { to_x: "base"; to_y: "toolbar"; relative: 1.0 0.0; }
+               rel2.to: "base";
+            }
+            description { state: "toolbar" 0.0;
+               align: 0.0 0.0;
+               rel1 { to_x: "base"; to_y: "toolbar"; relative: 0.0 1.0; }
+               rel2.to: "base";
+
             }
          }
          part { name: "content_clipper";
@@ -545,45 +614,6 @@ collections {
                rel2.to_y: "elm.swallow.content";
             }
          }
-         part { name: "toolbar_bg";
-            type: RECT;
-            scale: 1;
-            clip_to: "toolbar_clipper";
-            description { state: "default" 0.0;
-               rel1.to: "toolbar";
-               rel2.to: "toolbar";
-               color: TIZEN_VIEW_TOOLBAR_COLOR_INC;
-            }
-         }
-         part { name: "toolbar";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "toolbar_clipper";
-            description { state: "default" 0.0;
-               min: 0 0;
-               max: -1 0;
-               fixed: 0 1;
-               align: 0.5 1.0;
-               rel1 { to: "base"; relative: 0.0 1.0; }
-               rel2 { to: "base"; relative: 1.0 1.0; }
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: 0 TIZEN_VIEW_TOOLBAR_HEIGHT_INC;
-               max: -1 TIZEN_VIEW_TOOLBAR_HEIGHT_INC;
-               visible: 1;
-            }
-         }
-         part { name: "toolbar_clipper";
-            type: RECT;
-            mouse_events: 0;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               rel1.to: "toolbar";
-               rel2.to: "toolbar";
-            }
-         }
          part { name: "prev_btn_left_padding";
             type: SPACER;
             scale: 1;
@@ -682,6 +712,12 @@ collections {
                      set_state(PART:"title_text_right_padding", "default", 0.0);
                   }
                }
+               if (get_int(toolbar_visible)) {
+                  set_state(PART:"toolbar", "visible", 0.0);
+                  set_state(PART:"toolbar_top_divider", "visible", 0.0);
+                  set_state(PART:"elm.swallow.content", "toolbar", 0.0);
+               }
+
             }
          }
          program { name: "title_hide";
@@ -701,6 +737,29 @@ collections {
                   set_state(PART:"title_text_left_padding", "prev_btn_visible", 0.0);
                   set_state(PART:"title_text_right_padding", "prev_btn_visible", 0.0);
                }
+               set_state(PART:"toolbar", "default", 0.0);
+               set_state(PART:"toolbar_top_divider", "default", 0.0);
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+            }
+         }
+         program { name: "toolbar_show";
+            signal: "elm,state,toolbar,show";
+            source: "elm";
+            script {
+               set_state(PART:"toolbar", "visible", 0.0);
+               set_state(PART:"toolbar_top_divider", "visible", 0.0);
+               set_state(PART:"elm.swallow.content", "toolbar", 0.0);
+               set_int(toolbar_visible, 1);
+            }
+         }
+         program { name: "toolbar_hide";
+            signal: "elm,state,toolbar,hide";
+            source: "elm";
+            script {
+               set_state(PART:"toolbar", "default", 0.0);
+               set_state(PART:"toolbar_top_divider", "default", 0.0);
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_int(toolbar_visible, 0);
             }
          }
          program { name: "subtitle_show";
@@ -836,20 +895,6 @@ collections {
                set_state(PART:"title_text_right_padding", "default", 0.0);
             }
          }
-         program { name: "toolbar_show";
-            signal: "elm,state,toolbar,show";
-            source: "elm";
-            script {
-               set_state(PART:"toolbar", "visible", 0.0);
-            }
-         }
-         program { name: "toolbar_hide";
-            signal: "elm,state,toolbar,hide";
-            source: "elm";
-            script {
-               set_state(PART:"toolbar", "default", 0.0);
-            }
-         }
          program { name: "title_clicked";
             signal: "mouse,clicked,1";
             source: "click_event_area";
@@ -895,154 +940,4 @@ collections {
          }
       }
    }
-   group { name: "elm/layout/tizen_view/tabbar";
-      inherit: "elm/layout/tizen_view/default";
-      parts {
-         part { name: "tabbar_top_padding";
-            type: SPACER;
-            scale: 1;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               min: 0 TIZEN_VIEW_TABBAR_TITLE_TOP_PADDING_HEIGHT_INC;
-               max: -1 TIZEN_VIEW_TABBAR_TITLE_TOP_PADDING_HEIGHT_INC;
-               fixed: 0 1;
-               align: 0.5 0.0;
-               rel1 { to: "title_bg"; relative: 0.0 0.0; }
-               rel2 { to: "title_bg"; relative: 1.0 0.0; }
-            }
-         }
-         part { name: "tabbar";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "tabbar_clipper";
-            description { state: "default" 0.0;
-               min: 0 0;
-               max: -1 0;
-               fixed: 0 1;
-               align: 0.5 0.0;
-               rel1 { to: "tabbar_top_padding"; relative: 0.0 1.0; }
-               rel2 { to: "tabbar_top_padding"; relative: 1.0 1.0; }
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: 0 TIZEN_VIEW_TABBAR_TITLE_HEIGHT_INC;
-               max: -1 TIZEN_VIEW_TABBAR_TITLE_HEIGHT_INC;
-               visible: 1;
-            }
-         }
-         part { name: "tabbar_top_divider";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "tabbar_clipper";
-            description { state: "default" 0.0;
-               min: 0 0;
-               max: -1 0;
-               fixed: 0 1;
-               align: 0.5 0.0;
-               rel1 { to: "tabbar_clipper"; relative: 0.0 0.0; }
-               rel2 { to: "tabbar_clipper"; relative: 1.0 0.0; }
-               color: 244 244 244 25;
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: 0 TIZEN_VIEW_TABBAR_TOP_DIVIDER_HEIGHT_INC;
-               max: -1 TIZEN_VIEW_TABBAR_TOP_DIVIDER_HEIGHT_INC;
-               visible: 1;
-            }
-         }
-         part { name: "tabbar_clipper";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               min: 0 TIZEN_VIEW_TABBAR_TITLE_CLIPPER_HEIGHT_INC;
-               max: -1 TIZEN_VIEW_TABBAR_TITLE_CLIPPER_HEIGHT_INC;
-               fixed: 0 1;
-               align: 0.5 1.0;
-               rel1 { to: "tabbar"; relative: 0.0 1.0; }
-               rel2 { to: "tabbar"; relative: 1.0 1.0; }
-            }
-         }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            scale: 1;
-            repeat_events: 0;
-            clip_to: "content_clipper";
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel1 { to_x: "base"; to_y: "tabbar"; relative: 0.0 1.0; }
-               rel2 { to_x: "base"; to_y: "toolbar"; relative: 1.0 0.0; }
-            }
-         }
-      }
-      programs {
-         program { name: "title_show";
-            signal: "elm,state,title,show";
-            source: "elm";
-            script {
-               set_state(PART:"title_bg", "default", 0.0);
-               set_state(PART:"title_clipper", "default", 0.0);
-               if (get_int(title_left_btn_visible)) {
-                  set_state(PART:"title_left_btn_bg", "visible", 0.0);
-                  set_state(PART:"title_left_padding", "hidden", 0.0);
-                  set_state(PART:"title_left_btn", "visible", 0.0);
-                  set_state(PART:"title_right_btn_bg", "visible", 0.0);
-                  set_state(PART:"title_right_padding", "hidden", 0.0);
-               }
-               else if (get_int(prev_btn_visible))
-                  set_state(PART:"elm.swallow.prev_btn", "default", 0.0);
-               if (get_int(title_right_btn_visible)) {
-                  set_state(PART:"title_right_btn_bg", "visible", 0.0);
-                  set_state(PART:"title_right_padding", "hidden", 0.0);
-                  set_state(PART:"title_right_btn", "visible", 0.0);
-                  set_state(PART:"title_left_btn_bg", "visible", 0.0);
-                  set_state(PART:"title_left_padding", "hidden", 0.0);
-               }
-               if (get_int(tabbar_visible)) {
-                  set_state(PART:"tabbar", "visible", 0.0);
-                  set_state(PART:"tabbar_top_divider", "visible", 0.0);
-               }
-            }
-         }
-         program { name: "title_hide";
-            signal: "elm,state,title,hide";
-            source: "elm";
-            script {
-               set_state(PART:"title_bg", "hidden", 0.0);
-               set_state(PART:"title_clipper", "hidden", 0.0);
-               set_state(PART:"title_left_btn_bg", "default", 0.0);
-               set_state(PART:"title_left_padding", "default", 0.0);
-               set_state(PART:"title_left_btn", "default", 0.0);
-               set_state(PART:"title_right_btn_bg", "default", 0.0);
-               set_state(PART:"title_right_padding", "default", 0.0);
-               set_state(PART:"title_right_btn", "default", 0.0);
-               set_state(PART:"tabbar", "default", 0.0);
-               set_state(PART:"tabbar_top_divider", "default", 0.0);
-               set_state(PART:"elm.swallow.prev_btn", "hidden", 0.0);
-            }
-         }
-         program { name: "tabbar_show";
-            signal: "elm,state,tabbar,show";
-            source: "elm";
-            script {
-               set_state(PART:"tabbar", "visible", 0.0);
-               set_state(PART:"tabbar_top_divider", "visible", 0.0);
-               set_int(tabbar_visible, 1);
-            }
-         }
-         program { name: "tabbar_hide";
-            signal: "elm,state,tabbar,hide";
-            source: "elm";
-            script {
-               set_state(PART:"tabbar", "default", 0.0);
-               set_state(PART:"tabbar_top_divider", "default", 0.0);
-               set_int(tabbar_visible, 0);
-            }
-         }
-      }
-   }
 }

diff --git a/src/efl/example/main.cpp b/src/efl/example/main.cpp
index 93dbf24..fa8e761 100644 (file)
--- a/src/efl/example/main.cpp
+++ b/src/efl/example/main.cpp
@@ -24,14 +24,14 @@
 
 
 Evas_Object*
-create_tabbar(Evas_Object *parent)
+create_toolbar(Evas_Object *parent)
 {
        Evas_Object *toolbar;
 
        toolbar = elm_toolbar_add(parent);
 
        //FIXME: :( UI_View can set this style instead.
-       elm_object_style_set(toolbar, "tabbar_with_title");
+       elm_object_style_set(toolbar, "toolbar_with_title");
        elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND);
        elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE);
 

diff --git a/src/efl/example/page6.h b/src/efl/example/page6.h
index 2b11ed6..36ccca8 100644 (file)
--- a/src/efl/example/page6.h
+++ b/src/efl/example/page6.h
@@ -26,7 +26,7 @@ public:
                /* ui_basic_view(controller, identity name, style name of view).
                   Later, you could get the identity name using view->get_name();
                   you could get the style name of view as well */
-               ad->viewmgr->push_view(new ui_basic_view(this, "page6", "tabbar"));
+               ad->viewmgr->push_view(new ui_basic_view(this, "page6"));
        }
 
        ~page6()
@@ -35,6 +35,7 @@ public:
 
        void load()
        {
+
                //Initialize contents.
 
                ui_basic_view *view = dynamic_cast<ui_basic_view *>(this->get_view());
@@ -56,9 +57,9 @@ public:
                                this->ad);
 
                //Arguments: content, title
-               view->set_content(content, "Title with tabbar");
-               Evas_Object *toolbar = create_tabbar(view->get_base());
-               view->set_tabbar(toolbar);
+               view->set_content(content, "Title with toolbar");
+               Evas_Object *toolbar = create_toolbar(view->get_base());
+               view->set_toolbar(toolbar);
        }
 };
 

diff --git a/src/efl/mobile/ui_basic_view.cpp b/src/efl/mobile/ui_basic_view.cpp
index fdabae2..ccc7de7 100644 (file)
--- a/src/efl/mobile/ui_basic_view.cpp
+++ b/src/efl/mobile/ui_basic_view.cpp
@@ -19,7 +19,7 @@
 //FIXME: is it correct to define here?
 #define EDJ_PATH "/opt/usr/apps/org.tizen.ui-viewmgr/res/ui-viewmgr.edj"
 #define GROUP "elm/layout/tizen_view/default"
-#define TABBAR "elm/layout/tizen_view/tabbar"
+#define TOOLBAR "elm/layout/tizen_view/toolbar"
 
 using namespace efl_viewmgr;
 using namespace viewmgr;
@@ -45,16 +45,7 @@ bool ui_basic_view::create_layout()
                return false;
        }
 
-       if (!strcmp(this->get_style(), "tabbar"))
-       {
-               if (!elm_layout_file_set(layout, EDJ_PATH, TABBAR))
-               {
-                       LOGE("Failed to set tabbar style = ui_basic_view(%p)", this);
-                       evas_object_del(layout);
-                       return false;
-               }
-       }
-       else if (!elm_layout_file_set(layout, EDJ_PATH, GROUP))
+       if (!elm_layout_file_set(layout, EDJ_PATH, GROUP))
        {
                LOGE("Failed to set file = ui_basic_view(%p), path(%s), group(%s)", this, EDJ_PATH, GROUP);
                evas_object_del(layout);
@@ -97,8 +88,8 @@ bool ui_basic_view::create_layout()
        return true;
 }
 
-ui_basic_view::ui_basic_view(ui_controller *controller, const char *name, const char *style)
-               : ui_view(controller, name, style), layout(NULL)
+ui_basic_view::ui_basic_view(ui_controller *controller, const char *name)
+               : ui_view(controller, name), layout(NULL)
 {
 }
 
@@ -230,12 +221,16 @@ Evas_Object *ui_basic_view::set_content(Evas_Object *content, const char *title,
        return pcontent;
 }
 
-bool ui_basic_view::set_tabbar(Evas_Object *toolbar)
+bool ui_basic_view::set_toolbar(Evas_Object *toolbar)
 {
-       if (this->layout)
+       Evas_Object *layout = this->get_base();
+
+       if (layout)
        {
-               elm_object_part_content_set(this->layout, "tabbar", toolbar);
-               if (toolbar) elm_object_signal_emit(this->layout, "elm,state,tabbar,show", "elm");
+               elm_object_part_content_set(layout, "toolbar", toolbar);
+               if (toolbar) elm_object_signal_emit(layout, "elm,state,toolbar,show", "elm");
+               else elm_object_signal_emit(layout, "elm,state,toolbar,hide", "elm");
+
                return true;
        }
        LOGE("Layout is not exist!");

diff --git a/src/efl/mobile/ui_basic_view.h b/src/efl/mobile/ui_basic_view.h
index eff4044..64fffa6 100644 (file)
--- a/src/efl/mobile/ui_basic_view.h
+++ b/src/efl/mobile/ui_basic_view.h
@@ -36,7 +36,7 @@ protected:
        virtual void unload_content();
 
 public:
-       ui_basic_view(ui_controller *controller, const char *name = NULL, const char *style = NULL);
+       ui_basic_view(ui_controller *controller, const char *name = NULL);
        virtual ~ui_basic_view();
 
        Evas_Object *set_content(Evas_Object *content, const char *title = NULL);
@@ -46,7 +46,7 @@ public:
        bool set_title_left_btn(Evas_Object *title_left_btn);
        bool set_title_right_btn(Evas_Object *title_right_btn);
        bool set_title(const char *text);
-       bool set_tabbar(Evas_Object *toolbar);
+       bool set_toolbar(Evas_Object *toolbar);
 
        virtual void menu();
 

diff --git a/src/efl/ui_view.cpp b/src/efl/ui_view.cpp
index b572a04..ffc8422 100644 (file)
--- a/src/efl/ui_view.cpp
+++ b/src/efl/ui_view.cpp
@@ -19,8 +19,8 @@
 using namespace efl_viewmgr;
 using namespace viewmgr;
 
-ui_view::ui_view(ui_controller *controller, const char *name, const char *style)
-               : ui_iface_view(controller, name, style)
+ui_view::ui_view(ui_controller *controller, const char *name)
+               : ui_iface_view(controller, name)
 {
 }
 

diff --git a/src/efl/ui_view.h b/src/efl/ui_view.h
index ab19882..dff9273 100644 (file)
--- a/src/efl/ui_view.h
+++ b/src/efl/ui_view.h
@@ -45,7 +45,7 @@ class ui_view: public viewmgr::ui_iface_view
 
 public:
        ///Constructor.
-       ui_view(ui_controller *controller, const char *name = NULL, const char *style = NULL);
+       ui_view(ui_controller *controller, const char *name = NULL);
 
        ///Destructor.
        virtual ~ui_view();

diff --git a/src/interface/ui_iface_view.cpp b/src/interface/ui_iface_view.cpp
index 07382bb..9a2968e 100644 (file)
--- a/src/interface/ui_iface_view.cpp
+++ b/src/interface/ui_iface_view.cpp
@@ -82,8 +82,8 @@ void ui_iface_view::destroy()
        this->controller->destroy();
 }
 
-ui_iface_view::ui_iface_view(T content, ui_iface_controller *controller, const char *name, const char *style)
-               : content(content), controller(controller), name(string(name ? name : "")), style(string(style ? style : "")), viewmgr(NULL), state(UI_VIEW_STATE_LOAD),
+ui_iface_view::ui_iface_view(T content, ui_iface_controller *controller, const char *name)
+               : content(content), controller(controller), name(string(name ? name : "")), style(string("")), viewmgr(NULL), state(UI_VIEW_STATE_LOAD),
                  indicator(UI_VIEW_INDICATOR_DEFAULT), event_block(false), removable_content(true)
 {
        if (!content) this->state = UI_VIEW_STATE_UNLOAD;
@@ -91,8 +91,8 @@ ui_iface_view::ui_iface_view(T content, ui_iface_controller *controller, const c
        controller->set_view(this);
 }
 
-ui_iface_view::ui_iface_view(ui_iface_controller *controller, const char *name, const char *style)
-               : ui_iface_view(NULL, controller, name, style)
+ui_iface_view::ui_iface_view(ui_iface_controller *controller, const char *name)
+               : ui_iface_view(NULL, controller, name)
 {
        this->state = UI_VIEW_STATE_UNLOAD;
 }

diff --git a/src/interface/ui_iface_view.h b/src/interface/ui_iface_view.h
index 06f6bda..5ceeb8a 100644 (file)
--- a/src/interface/ui_iface_view.h
+++ b/src/interface/ui_iface_view.h
@@ -181,9 +181,9 @@ public:
         *  @warning Be aware the deletion of controller passed here will be covered by ui_iface_view.
         *           If you want to keep it for any reasons, please unset it using set_controller() before ui_iface_view is deleted.
         */
-       ui_iface_view(T content, ui_iface_controller *controller, const char *name, const char *style = NULL);
+       ui_iface_view(T content, ui_iface_controller *controller, const char *name);
        ///Constructor for initializing with controller.
-       ui_iface_view(ui_iface_controller *controller, const char *name = NULL, const char *style = NULL);
+       ui_iface_view(ui_iface_controller *controller, const char *name = NULL);
        ///Constructor for initializing with name.
        ui_iface_view(const char *name = NULL);