X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=demo%2Fdali-table-view.h;h=749000bfdd6c94f2435cf266090a98e0ddd7872a;hb=12fd4d7a32767503adf87fba1178e5ac0c30d896;hp=bbc4d52ed3bc4a03d0c3da63169976f11a7ecb62;hpb=7c667d7ccc67e7b3e07dd0aca810593412fece8e;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

diff --git a/demo/dali-table-view.h b/demo/dali-table-view.h
index bbc4d52..749000b 100644
--- a/demo/dali-table-view.h
+++ b/demo/dali-table-view.h
@@ -2,7 +2,7 @@
 #define __DALI_DEMO_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@
  *
  */
 
-#include <map>
-
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/popup/popup.h>
@@ -27,19 +25,8 @@
 class Example;
 
 typedef std::vector<Example> ExampleList;
-typedef std::map<std::string,Example> ExampleMap;
 typedef ExampleList::iterator ExampleListIter;
 typedef ExampleList::const_iterator ExampleListConstIter;
-typedef ExampleMap::iterator ExampleMapIter;
-typedef ExampleMap::const_iterator ExampleMapConstIter;
-
-typedef std::vector<Dali::Toolkit::TableView> TableViewList;
-typedef TableViewList::iterator TableViewListIter;
-typedef TableViewList::const_iterator TableViewListConstIter;
-
-typedef std::vector<Dali::ImageActor> ImageActorList;
-typedef ImageActorList::iterator ImageActorListIter;
-typedef ImageActorList::const_iterator ImageActorListConstIter;
 
 typedef std::vector<Dali::Animation> AnimationList;
 typedef AnimationList::iterator AnimationListIter;
@@ -99,15 +86,6 @@ public:
   void AddExample(Example example);
 
   /**
-   * Sets the background image PATH.
-   *
-   * @param[in] imagePath The file path to the image to use as the background.
-   *
-   * @note Should be called before the Application MainLoop is started.
-   */
-  void SetBackgroundPath( std::string imagePath );
-
-  /**
    * Sorts the example list alphabetically by Title if parameter is true.
    *
    * @param[in] sortAlphabetically If true, example list is sorted alphabetically.
@@ -173,7 +151,7 @@ private: // Application callbacks & implementation
    *
    * @return The stencil image
    */
-  Dali::ImageActor NewStencilImage();
+  Dali::Toolkit::ImageView NewStencilImage();
 
   // Signal handlers
 
@@ -181,11 +159,21 @@ private: // Application callbacks & implementation
    * Signal emitted when any tile has been pressed
    *
    * @param[in] actor The Actor representing this tile.
-   * @param[in] event The TouchEvent
+   * @param[in] event The Touch information.
    *
    * @return Consume flag
    */
-  bool OnTilePressed( Dali::Actor actor, const Dali::TouchEvent& event );
+  bool OnTilePressed( Dali::Actor actor, const Dali::TouchData& event );
+
+  /**
+   * Called by OnTilePressed & Accessibility to do the appropriate action.
+   *
+   * @param[in] actor The Actor representing this tile.
+   * @param[in] state The Touch state
+   *
+   * @return Consume flag
+   */
+  bool DoTilePress( Dali::Actor actor, Dali::PointState::Type state );
 
   /**
    * Signal emitted when any tile has been hovered
@@ -232,11 +220,11 @@ private: // Application callbacks & implementation
    * (other than those touches consumed by OnTilePressed)
    *
    * @param[in] actor The Actor touched.
-   * @param[in] event The TouchEvent
+   * @param[in] event The Touch information.
    *
    * @return Consume flag
    */
-  bool OnScrollTouched( Dali::Actor actor, const Dali::TouchEvent& event );
+  bool OnScrollTouched( Dali::Actor actor, const Dali::TouchData& event );
 
   /**
    * Setup the effect on the scroll view
@@ -367,11 +355,6 @@ private: // Application callbacks & implementation
    */
   void HideVersionPopup();
 
-  /**
-   * Called when the popup is completely hidden
-   */
-  void PopupHidden();
-
  /*
   * @brief Callback called when the buttons page actor is relaid out
   *
@@ -398,27 +381,20 @@ private:
   Dali::Toolkit::ScrollViewEffect mScrollViewEffect;         ///< Effect to be applied to the scroll view
   Dali::Toolkit::RulerPtr         mScrollRulerX;             ///< ScrollView X (horizontal) ruler
   Dali::Toolkit::RulerPtr         mScrollRulerY;             ///< ScrollView Y (vertical) ruler
-  Dali::Toolkit::TableView        mButtons;                  ///< Navigation buttons
   Dali::Actor                     mPressedActor;             ///< The currently pressed actor.
   Dali::Timer                     mAnimationTimer;           ///< Timer used to turn off animation after a specific time period
   Dali::TapGestureDetector        mLogoTapDetector;          ///< To detect taps on the logo
   Dali::Toolkit::Popup            mVersionPopup;             ///< Displays DALi library version information
-  Dali::Vector3                   mButtonsPageRelativeSize;  ///< Size of a buttons page relative to the stage size
 
   std::vector< Dali::Actor >      mPages;                    ///< List of pages.
-  std::vector< Dali::Actor >      mTableViewImages;          ///< Offscreen render of tableview
-  std::vector< Dali::Actor >      mBackgroundActors;         ///< List of background actors used in the effect
   AnimationList                   mBackgroundAnimations;     ///< List of background bubble animations
   ExampleList                     mExampleList;              ///< List of examples.
-  ExampleMap                      mExampleMap;               ///< Map LUT for examples.
 
-  std::string                     mBackgroundImagePath;      ///< The path to the background image.
   int                             mTotalPages;               ///< Total pages within scrollview.
 
   bool                            mScrolling:1;              ///< Flag indicating whether view is currently being scrolled
   bool                            mSortAlphabetically:1;     ///< Sort examples alphabetically.
   bool                            mBackgroundAnimsPlaying:1; ///< Are background animations playing
-  bool                            mVersionPopupShown:1;      ///< Whehter the version popup is shown or not
 
 };