Fix empty line

[profile/tv/apps/native/filebrowser.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index f6c5e22..6631d54 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,8 +20,9 @@
 #include <Eina.h>
 #include "dbg.h"
 #include "define.h"
-#include "BaseApp.h"
 
+#include <AppCommon.h>
+#include "BaseApp.h"
 #include <BaseView.h>
 #include <ViewMgr.h>
 #include <CtxPopup.h>
@@ -31,6 +32,8 @@
 #include <ExtNameInfo.h>
 #include "FbContextView.h"
 
+#include <SortMgr.h>
+
 #define PARAM_SOURCE "source"
 #define FBR_WIN_TITLE "File Browser"
 
@@ -38,7 +41,8 @@ Evas_Object *_add_win(const char *name)
 {
        Evas_Object *win;
 
-       win = elm_win_add(NULL, name, ELM_WIN_BASIC);
+       //win = elm_win_add(NULL, name, ELM_WIN_BASIC);
+       win = elm_win_util_standard_add(name, NULL);
        if (!win)
                return NULL;
 
@@ -75,6 +79,35 @@ protected:
 
                ad.win = win;
                
+               elm_win_activate(ad.win);
+               CViewMgr::Initialize(ad.win,NULL);
+               CViewMgr* viewmgr = NULL;
+
+               CSortMgr::Initialize();
+
+               viewmgr = CViewMgr::GetInstance();
+               if(!viewmgr) {
+                       _ERR("Fail to get viewmgr instance");
+                       CViewMgr::Finalize();
+                       return false;
+               }
+
+               pFbBaseView = new CFbBaseView(FBR_BASE_VIEW);
+               if(!viewmgr->AddView(pFbBaseView))
+               {
+                       _ERR("Fail to add pFbBaseView");
+                       CViewMgr::Finalize();
+                       return false;
+               }
+
+               pContextView = new CContextView(FBR_CONTEXT_VIEW);
+               if(!viewmgr->AddView(pContextView))
+               {
+                       _ERR("Fail to add pContextView");
+                       CViewMgr::Finalize();
+                       return false;
+               }
+
                return true;
        }
 
@@ -88,18 +121,14 @@ protected:
                free(ad.source);
        }
 
-       virtual void OnService(service_h service)
+       virtual void OnAppControl(app_control_h app_control)
        {
+               _DBG("  ******************* OnAppControl *********************");
                char *source;
                int r;
-               CViewMgr* viewmgr = NULL;
-
-               _DBG("  ******************* OnService *********************");
-               _DBG("222");
-               elm_win_activate(ad.win);
-
-               r = service_get_extra_data(service, PARAM_SOURCE, &source);
-               if (r != SERVICE_ERROR_NONE)
+               
+               r = app_control_get_extra_data(app_control, PARAM_SOURCE, &source);
+               if (r != APP_CONTROL_ERROR_NONE)
                        source = NULL;
 
                if (source) {
@@ -110,37 +139,25 @@ protected:
                {
                        ad.source = strdup("all");
                }
+       }
+
+       virtual void OnResume(void)
+       {
+               _DBG("  ******************* OnService *********************");
+               CViewMgr* viewmgr = NULL;
 
-               CViewMgr::Initialize(ad.win,NULL);
                viewmgr = CViewMgr::GetInstance();
                if(!viewmgr) {
                        _ERR("Fail to get viewmgr instance");
-                       goto error;
-               }
-
-               pFbBaseView = new CFbBaseView(FBR_BASE_VIEW);
-               if(!viewmgr->AddView(pFbBaseView))
-               {
-                       _ERR("Fail to add pFbBaseView");
-                       goto error;
-               }
-
-               pContextView = new CContextView(FBR_CONTEXT_VIEW);
-               if(!viewmgr->AddView(pContextView))
-               {
-                       _ERR("Fail to add pContextView");
-                       goto error;
+                       ASSERT(0);
+                       return ;
                }
 
                if (!viewmgr->PushView(FBR_BASE_VIEW, ad.source)) {
                        _ERR("Fail to push view");
-                       goto error;
+                       ASSERT(0);
+                       return ;
                }
-               return;
-
-       error:
-               CViewMgr::Finalize();
-               elm_exit();
        }
 
 public: