Merge "Add api for get the internal media player handle of the video player" into...

[platform/core/uifw/dali-adaptor.git] / dali / devel-api / adaptor-framework / virtual-keyboard.h

diff --git a/dali/devel-api/adaptor-framework/virtual-keyboard.h b/dali/devel-api/adaptor-framework/virtual-keyboard.h
old mode 100644 (file)
new mode 100755 (executable)
index a5dcbdb..84c2d4e
--- a/dali/devel-api/adaptor-framework/virtual-keyboard.h
+++ b/dali/devel-api/adaptor-framework/virtual-keyboard.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_VIRTUAL_KEYBOARD_H__
-#define __DALI_VIRTUAL_KEYBOARD_H__
+#ifndef DALI_VIRTUAL_KEYBOARD_H
+#define DALI_VIRTUAL_KEYBOARD_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -75,36 +75,36 @@ enum ReturnKeyType
 /**
  * @brief Show the virtual keyboard.
  */
-DALI_IMPORT_API void Show();
+DALI_ADAPTOR_API void Show();
 
 /**
  * @brief Hide the virtual keyboard.
  */
-DALI_IMPORT_API void Hide();
+DALI_ADAPTOR_API void Hide();
 
 /**
  * @brief Returns whether the virtual keyboard is visible or not.
  * @return true if visible, false otherwise.
  */
-DALI_IMPORT_API bool IsVisible();
+DALI_ADAPTOR_API bool IsVisible();
 
 /**
  * @brief Set one or more of the Input Method Settings
  * @param[in] settingsMap Map of Settings to be applied.
  */
-DALI_IMPORT_API void ApplySettings( const Property::Map& settingsMap );
+DALI_ADAPTOR_API void ApplySettings( const Property::Map& settingsMap );
 
 /**
  * @brief Set the specific return key into the virtual keyboard.
  * @param[in] type the kind of return key types.
  */
-DALI_IMPORT_API void SetReturnKeyType( const InputMethod::ActionButton type );
+DALI_ADAPTOR_API void SetReturnKeyType( const InputMethod::ButtonAction::Type type );
 
 /**
  * @brief Retrieve the current return key type.
  * @return the type of retun key.
  */
-DALI_IMPORT_API InputMethod::ActionButton GetReturnKeyType();
+DALI_ADAPTOR_API InputMethod::ButtonAction::Type GetReturnKeyType();
 
 /**
  * @brief Enable/disable prediction (predictive text).
@@ -113,13 +113,13 @@ DALI_IMPORT_API InputMethod::ActionButton GetReturnKeyType();
  * @param[in] enable true or false to enable or disable
  * Prediction can not be changed while the keyboard is visible. It must be set in advance of showing keyboard.
  */
-DALI_IMPORT_API void EnablePrediction(const bool enable);
+DALI_ADAPTOR_API void EnablePrediction(const bool enable);
 
 /**
  * @brief Returns whether prediction is enabled in the virtual keyboard
  * @return true if predictive text enabled, false otherwise.
  */
-DALI_IMPORT_API bool IsPredictionEnabled();
+DALI_ADAPTOR_API bool IsPredictionEnabled();
 
 /**
  * @brief Provides size and position of keyboard.
@@ -130,7 +130,7 @@ DALI_IMPORT_API bool IsPredictionEnabled();
  * the values then taken down.  So ideally GetSizeAndPosition() should be called after Show().
  * @return rect which is keyboard panel x, y, width, height
  */
-DALI_IMPORT_API Dali::Rect<int> GetSizeAndPosition();
+DALI_ADAPTOR_API Dali::Rect<int> GetSizeAndPosition();
 
 /**
  * @brief Rotates the keyboard orientation to the given angle.
@@ -139,57 +139,16 @@ DALI_IMPORT_API Dali::Rect<int> GetSizeAndPosition();
  * Other valid values are 90, 180, 270.
  * @param angle the angle is in degrees.
  */
-DALI_IMPORT_API void RotateTo(int angle);
+DALI_ADAPTOR_API void RotateTo(int angle);
 
 /**
  * @brief Returns text direction of the keyboard's current input language.
  * @return The direction of the text.
  */
-DALI_IMPORT_API TextDirection GetTextDirection();
-
-/**
- * @brief Connect to this signal to be notified when the virtual keyboard is shown or hidden.
- *
- * A callback of the following type may be connected:
- * @code
- *   void YourCallbackName(bool keyboardShown);
- * @endcode
- * If the parameter keyboardShown is true, then the keyboard has just shown, if it is false, then it
- * has just been hidden.
- * @return The signal to connect to.
- */
-DALI_IMPORT_API StatusSignalType& StatusChangedSignal();
-
-/**
- * @brief Connect to this signal to be notified when the virtual keyboard is resized.
- *
- * A callback of the following type may be connected:
- * @code
- *   void YourCallbackName( int resolvedResize );
- * @endcode
- * The parameter sends the resolved resize defined by the IMF.
- *
- * User can get changed size by using GetSizeAndPosition() in the callback
- * @return The signal to connect to.
- */
-DALI_IMPORT_API KeyboardResizedSignalType& ResizedSignal();
-
-/**
- * @brief Connect to this signal to be notified when the virtual keyboard's language is changed.
- *
- * A callback of the following type may be connected:
- * @code
- *   void YourCallbackName( int resolvedLanguage );
- * @endcode
- * The parameter sends the resolved language defined by the IMF.
- *
- * User can get the text direction of the language by calling GetTextDirection() in the callback.
- * @return The signal to connect to.
- */
-DALI_IMPORT_API LanguageChangedSignalType& LanguageChangedSignal();
+DALI_ADAPTOR_API TextDirection GetTextDirection();
 
 } // namespace VirtualKeyboard
 
 } // namespace Dali
 
-#endif // __DALI_VIRTUAL_KEYBOARD_H__
+#endif // DALI_VIRTUAL_KEYBOARD_H