X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Faccessibility-manager%2Faccessibility-manager.h;h=dea70f49ce37a8671bc62b35ffd3539121788b15;hb=2811d5d65564a988da2e4de22b66ec75b50ecbda;hp=87c5c5f0dd31de0bb04e73ba9a97ae3b1bae57e6;hpb=3a2dfe800fe4ec8214f42b28b3851ea8b8ffc72b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h b/dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h old mode 100755 new mode 100644 index 87c5c5f..dea70f4 --- a/dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h +++ b/dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h @@ -26,10 +26,8 @@ namespace Dali { - namespace Toolkit { - namespace Internal DALI_INTERNAL { class AccessibilityManager; @@ -61,7 +59,6 @@ class AccessibilityManager; class DALI_TOOLKIT_API AccessibilityManager : public BaseHandle { public: - // Typedefs /** @@ -70,8 +67,8 @@ public: * The connected signal callback should return true if handled. * @SINCE_1_0.0 */ - typedef Signal< bool ( AccessibilityManager& ) > AccessibilityActionSignalType; ///< Generic signal type @SINCE_1_0.0 - typedef Signal< bool ( AccessibilityManager&, const Dali::TouchEvent& )> AccessibilityActionScrollSignalType; ///< Scroll signal type @SINCE_1_0.0 + typedef Signal AccessibilityActionSignalType; ///< Generic signal type @SINCE_1_0.0 + typedef Signal AccessibilityActionScrollSignalType; ///< Scroll signal type @SINCE_1_0.0 /** * @brief Enumeration for accessibility that needs four information which will be read by screen-reader. @@ -81,36 +78,35 @@ public: */ enum AccessibilityAttribute { - ACCESSIBILITY_LABEL = 0, ///< Simple text which contained in ui-control @SINCE_1_0.0 - ACCESSIBILITY_TRAIT, ///< Description of ui-control trait @SINCE_1_0.0 - ACCESSIBILITY_VALUE, ///< Current value of ui-control (Optional) @SINCE_1_0.0 - ACCESSIBILITY_HINT, ///< Hint for action (Optional) @SINCE_1_0.0 + ACCESSIBILITY_LABEL = 0, ///< Simple text which contained in ui-control @SINCE_1_0.0 + ACCESSIBILITY_TRAIT, ///< Description of ui-control trait @SINCE_1_0.0 + ACCESSIBILITY_VALUE, ///< Current value of ui-control (Optional) @SINCE_1_0.0 + ACCESSIBILITY_HINT, ///< Hint for action (Optional) @SINCE_1_0.0 ACCESSIBILITY_ATTRIBUTE_NUM ///< Number of attributes @SINCE_1_0.0 }; - /** + /** * @brief Enumeration for overshoot direction. * @SINCE_1_0.0 */ enum FocusOvershotDirection { OVERSHOT_PREVIOUS = -1, ///< Try to move previous of the first actor @SINCE_1_0.0 - OVERSHOT_NEXT = 1, ///< Try to move next of the last actor @SINCE_1_0.0 + OVERSHOT_NEXT = 1, ///< Try to move next of the last actor @SINCE_1_0.0 }; - public: - +public: /// @brief Focus changed signal /// @SINCE_1_0.0 - typedef Signal< void ( Actor, Actor ) > FocusChangedSignalType; + typedef Signal FocusChangedSignalType; /// @brief Focus overshooted signal /// @SINCE_1_0.0 - typedef Signal< void ( Actor, FocusOvershotDirection ) > FocusOvershotSignalType; + typedef Signal FocusOvershotSignalType; /// @brief Focused actor activated signal /// @SINCE_1_0.0 - typedef Signal< void ( Actor ) > FocusedActorActivatedSignalType; + typedef Signal FocusedActorActivatedSignalType; /** * @brief Creates an AccessibilityManager handle; this can be initialised with AccessibilityManager::New(). @@ -421,8 +417,7 @@ public: */ Vector2 GetReadPosition() const; - public: // Signals - +public: // Signals /** * @brief This signal is emitted when the current focused actor is changed. * @@ -462,8 +457,7 @@ public: */ FocusedActorActivatedSignalType& FocusedActorActivatedSignal(); - public: // Accessibility action signals - +public: // Accessibility action signals /** * @brief This is emitted when accessibility(screen-reader) feature turned on or off. * @@ -802,8 +796,7 @@ public: AccessibilityActionScrollSignalType& ActionScrollSignal(); public: - - explicit DALI_INTERNAL AccessibilityManager( Internal::AccessibilityManager *impl ); + explicit DALI_INTERNAL AccessibilityManager(Internal::AccessibilityManager* impl); }; // class AccessibilityManager