Move TextSelectionPopup from public to devel 25/39925/3
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Tue, 26 May 2015 12:45:15 +0000 (13:45 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Tue, 26 May 2015 13:58:37 +0000 (14:58 +0100)
Change-Id: I67ed206d8083606ba5435c502e668414095bd9dc
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp
dali-toolkit/dali-toolkit.h
dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp [new file with mode: 0644]
dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h [new file with mode: 0644]
dali-toolkit/devel-api/file.list
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
dali-toolkit/internal/text/decorator/text-decorator.cpp
dali-toolkit/public-api/controls/text-controls/text-selection-popup.cpp [deleted file]
dali-toolkit/public-api/controls/text-controls/text-selection-popup.h [deleted file]
dali-toolkit/public-api/file.list

index d4914f5915ff57c69c03bc8ebb16ab584c97efbc..b248e010dffe3e7ad79db0aa2918910ec0f668c9 100644 (file)
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
 
 using namespace Dali;
 using namespace Toolkit;
index eeeaa44ad0ce174b03d1d7ac275fa50d35b37397..9cef6c3a0cc7d3317f22db535d5ed8c85ec727ce 100644 (file)
@@ -44,7 +44,6 @@
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-field.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
-#include <dali-toolkit/public-api/controls/text-controls/text-selection-popup.h>
 #include <dali-toolkit/public-api/focus-manager/focus-manager.h>
 #include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
 #include <dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h>
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp
new file mode 100644 (file)
index 0000000..f41f667
--- /dev/null
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h>
+
+using namespace Dali;
+
+namespace Dali
+{
+
+namespace Toolkit
+{
+
+TextSelectionPopup TextSelectionPopup::New()
+{
+  return Internal::TextSelectionPopup::New();
+}
+
+TextSelectionPopup::TextSelectionPopup()
+{
+}
+
+TextSelectionPopup::TextSelectionPopup( const TextSelectionPopup& handle )
+: Control( handle )
+{
+}
+
+TextSelectionPopup& TextSelectionPopup::operator=( const TextSelectionPopup& handle )
+{
+  if( &handle != this )
+  {
+    Control::operator=( handle );
+  }
+  return *this;
+}
+
+TextSelectionPopup::~TextSelectionPopup()
+{
+}
+
+TextSelectionPopup TextSelectionPopup::DownCast( BaseHandle handle )
+{
+  return Control::DownCast<TextSelectionPopup, Internal::TextSelectionPopup>(handle);
+}
+
+TextSelectionPopup::TextSelectionPopup( Internal::TextSelectionPopup& implementation )
+: Control(implementation)
+{
+}
+
+TextSelectionPopup::TextSelectionPopup( Dali::Internal::CustomActor* internal )
+: Control( internal )
+{
+  VerifyCustomActorPointer<Internal::TextSelectionPopup>( internal );
+}
+
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h
new file mode 100644 (file)
index 0000000..2243f2d
--- /dev/null
@@ -0,0 +1,143 @@
+#ifndef __DALI_TOOLKIT_TEXT_SELECTION_POPUP_H__
+#define __DALI_TOOLKIT_TEXT_SELECTION_POPUP_H__
+
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control.h>
+
+namespace Dali
+{
+
+namespace Toolkit
+{
+
+namespace Internal DALI_INTERNAL
+{
+class TextSelectionPopup;
+}
+
+/**
+ * @brief A control which provides a Popup with a number of buttons
+ *
+ * The style of the pop can be set through style sheets, this includes the images for the buttons
+ * A Show and Hide API is provided.
+ *
+ * If the buttons exceed the size constraints of the popup then it will offer scrolling.
+ *
+ *
+ */
+class DALI_IMPORT_API TextSelectionPopup : public Control
+{
+public:
+
+  /**
+   * @brief The start and end property ranges for this control.
+   */
+  enum PropertyRange
+  {
+    PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
+    PROPERTY_END_INDEX =   PROPERTY_START_INDEX + 1000              ///< Reserve property indices
+  };
+
+  /**
+   * @brief An enumeration of properties belonging to the TextLabel class.
+   */
+  struct Property
+  {
+    enum
+    {
+
+      POPUP_MAX_SIZE,                           ///< name "popup-max-size",                The max size the Popup can be,                  type VECTOR2
+      POPUP_BACKGROUND_IMAGE,                   ///< name "popup-background-image",        The image to display for popup background       type STRING
+      POPUP_CLIPBOARD_BUTTON_ICON_IMAGE,        ///< name "popup-clipboard-button-image",  The image to use as the popup clipboard icon,   type STRING
+      POPUP_CUT_BUTTON_ICON_IMAGE,              ///< name "popup-cut-button-image",        The image to use as the popup cut icon,         type STRING
+      POPUP_COPY_BUTTON_ICON_IMAGE,             ///< name "popup-copy-button-image",       The image to use as the popup copy icon,        type STRING
+      POPUP_PASTE_BUTTON_ICON_IMAGE,            ///< name "popup-paste-button-image",      The image to use as the popup paste icon,       type STRING
+      POPUP_SELECT_BUTTON_ICON_IMAGE,           ///< name "popup-select-button-image",     The image to use as the popup select icon,      type STRING
+      POPUP_SELECT_ALL_BUTTON_ICON_IMAGE,       ///< name "popup-select-all-button-image", The image to use as the popup select all icon,  type STRING
+    };
+  };
+
+  /**
+   * Create the TextSelectionPopup control.
+   * @return A handle to the TextSelectionPopup control.
+   */
+  static TextSelectionPopup New();
+
+  /**
+   * @brief Creates an empty handle.
+   */
+  TextSelectionPopup();
+
+  /**
+   * @brief Copy constructor.
+   *
+   * @param[in] handle The handle to copy from.
+   */
+  TextSelectionPopup( const TextSelectionPopup& handle );
+
+  /**
+   * @brief Assignment operator.
+   *
+   * @param[in] handle The handle to copy from.
+   * @return A reference to this.
+   */
+  TextSelectionPopup& operator=( const TextSelectionPopup& handle );
+
+  /**
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
+   */
+  ~TextSelectionPopup();
+
+  /**
+   * @brief Downcast a handle to TextSelectionPopup.
+   *
+   * If the BaseHandle points is a TextSelectionPopup the downcast returns a valid handle.
+   * If not the returned handle is left empty.
+   *
+   * @param[in] handle Handle to an object
+   * @return handle to a TextSelectionPopup or an empty handle
+   */
+  static TextSelectionPopup DownCast( BaseHandle handle );
+
+public: // Not intended for application developers
+
+  /**
+   * @brief Creates a handle using the Toolkit::Internal implementation.
+   *
+   * @param[in] implementation The Control implementation.
+   */
+  DALI_INTERNAL TextSelectionPopup( Internal::TextSelectionPopup& implementation );
+
+  /**
+   * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
+   *
+   * @param[in]  internal  A pointer to the internal CustomActor.
+   */
+  explicit DALI_INTERNAL TextSelectionPopup( Dali::Internal::CustomActor* internal );
+
+}; // Class TextSelectionPopup
+
+} // namespace Toolkit
+
+} // namepsace Dali
+
+#endif // __DALI_TOOLKIT_TEXT_SELECTION_POPUP_H__
index 5e0a8ff1e3a94117ff1db3d3525411bbd5c4951e..7a940c11d5b5550069a70b6bf87e7ecfeda64516 100755 (executable)
@@ -16,6 +16,7 @@ devel_api_src_files = \
   $(devel_api_src_dir)/controls/shadow-view/shadow-view.cpp \
   $(devel_api_src_dir)/controls/slider/slider.cpp \
   $(devel_api_src_dir)/controls/super-blur-view/super-blur-view.cpp \
+  $(devel_api_src_dir)/controls/text-controls/text-selection-popup.cpp \
   $(devel_api_src_dir)/controls/tool-bar/tool-bar.cpp \
   $(devel_api_src_dir)/styling/style-manager.cpp \
   $(devel_api_src_dir)/scripting/script.cpp \
@@ -132,6 +133,9 @@ devel_api_shader_effects_header_files = \
 devel_api_super_blur_view_header_files = \
   $(devel_api_src_dir)/controls/super-blur-view/super-blur-view.h
 
+devel_api_text_selection_popup_header_files = \
+  $(devel_api_src_dir)/controls/text-controls/text-selection-popup.h
+
 devel_api_tool_bar_header_files = \
   $(devel_api_src_dir)/controls/tool-bar/tool-bar.h
 
index 07535798e8386dfda79f2d5a5ee4f48390da4ad2..892c563269467908fd5a759ae7e830d07dfa1f50 100644 (file)
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
-#include <dali-toolkit/public-api/controls/text-controls/text-selection-popup.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/actors/image-actor.h>
index 73297901c05e2bc870bfb7969e5b9adf5bd431aa..f529f70a561d6de38e2b9b4f623edabd223e1b33 100644 (file)
@@ -47,7 +47,7 @@
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
-#include <dali-toolkit/public-api/controls/text-controls/text-selection-popup.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
 
 #ifdef DEBUG_ENABLED
 #define DECORATOR_DEBUG
diff --git a/dali-toolkit/public-api/controls/text-controls/text-selection-popup.cpp b/dali-toolkit/public-api/controls/text-controls/text-selection-popup.cpp
deleted file mode 100644 (file)
index 4c55375..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/public-api/controls/text-controls/text-selection-popup.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h>
-
-using namespace Dali;
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-TextSelectionPopup TextSelectionPopup::New()
-{
-  return Internal::TextSelectionPopup::New();
-}
-
-TextSelectionPopup::TextSelectionPopup()
-{
-}
-
-TextSelectionPopup::TextSelectionPopup( const TextSelectionPopup& handle )
-: Control( handle )
-{
-}
-
-TextSelectionPopup& TextSelectionPopup::operator=( const TextSelectionPopup& handle )
-{
-  if( &handle != this )
-  {
-    Control::operator=( handle );
-  }
-  return *this;
-}
-
-TextSelectionPopup::~TextSelectionPopup()
-{
-}
-
-TextSelectionPopup TextSelectionPopup::DownCast( BaseHandle handle )
-{
-  return Control::DownCast<TextSelectionPopup, Internal::TextSelectionPopup>(handle);
-}
-
-TextSelectionPopup::TextSelectionPopup( Internal::TextSelectionPopup& implementation )
-: Control(implementation)
-{
-}
-
-TextSelectionPopup::TextSelectionPopup( Dali::Internal::CustomActor* internal )
-: Control( internal )
-{
-  VerifyCustomActorPointer<Internal::TextSelectionPopup>( internal );
-}
-
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/public-api/controls/text-controls/text-selection-popup.h b/dali-toolkit/public-api/controls/text-controls/text-selection-popup.h
deleted file mode 100644 (file)
index 2243f2d..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-#ifndef __DALI_TOOLKIT_TEXT_SELECTION_POPUP_H__
-#define __DALI_TOOLKIT_TEXT_SELECTION_POPUP_H__
-
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control.h>
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal DALI_INTERNAL
-{
-class TextSelectionPopup;
-}
-
-/**
- * @brief A control which provides a Popup with a number of buttons
- *
- * The style of the pop can be set through style sheets, this includes the images for the buttons
- * A Show and Hide API is provided.
- *
- * If the buttons exceed the size constraints of the popup then it will offer scrolling.
- *
- *
- */
-class DALI_IMPORT_API TextSelectionPopup : public Control
-{
-public:
-
-  /**
-   * @brief The start and end property ranges for this control.
-   */
-  enum PropertyRange
-  {
-    PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
-    PROPERTY_END_INDEX =   PROPERTY_START_INDEX + 1000              ///< Reserve property indices
-  };
-
-  /**
-   * @brief An enumeration of properties belonging to the TextLabel class.
-   */
-  struct Property
-  {
-    enum
-    {
-
-      POPUP_MAX_SIZE,                           ///< name "popup-max-size",                The max size the Popup can be,                  type VECTOR2
-      POPUP_BACKGROUND_IMAGE,                   ///< name "popup-background-image",        The image to display for popup background       type STRING
-      POPUP_CLIPBOARD_BUTTON_ICON_IMAGE,        ///< name "popup-clipboard-button-image",  The image to use as the popup clipboard icon,   type STRING
-      POPUP_CUT_BUTTON_ICON_IMAGE,              ///< name "popup-cut-button-image",        The image to use as the popup cut icon,         type STRING
-      POPUP_COPY_BUTTON_ICON_IMAGE,             ///< name "popup-copy-button-image",       The image to use as the popup copy icon,        type STRING
-      POPUP_PASTE_BUTTON_ICON_IMAGE,            ///< name "popup-paste-button-image",      The image to use as the popup paste icon,       type STRING
-      POPUP_SELECT_BUTTON_ICON_IMAGE,           ///< name "popup-select-button-image",     The image to use as the popup select icon,      type STRING
-      POPUP_SELECT_ALL_BUTTON_ICON_IMAGE,       ///< name "popup-select-all-button-image", The image to use as the popup select all icon,  type STRING
-    };
-  };
-
-  /**
-   * Create the TextSelectionPopup control.
-   * @return A handle to the TextSelectionPopup control.
-   */
-  static TextSelectionPopup New();
-
-  /**
-   * @brief Creates an empty handle.
-   */
-  TextSelectionPopup();
-
-  /**
-   * @brief Copy constructor.
-   *
-   * @param[in] handle The handle to copy from.
-   */
-  TextSelectionPopup( const TextSelectionPopup& handle );
-
-  /**
-   * @brief Assignment operator.
-   *
-   * @param[in] handle The handle to copy from.
-   * @return A reference to this.
-   */
-  TextSelectionPopup& operator=( const TextSelectionPopup& handle );
-
-  /**
-   * @brief Destructor
-   *
-   * This is non-virtual since derived Handle types must not contain data or virtual methods.
-   */
-  ~TextSelectionPopup();
-
-  /**
-   * @brief Downcast a handle to TextSelectionPopup.
-   *
-   * If the BaseHandle points is a TextSelectionPopup the downcast returns a valid handle.
-   * If not the returned handle is left empty.
-   *
-   * @param[in] handle Handle to an object
-   * @return handle to a TextSelectionPopup or an empty handle
-   */
-  static TextSelectionPopup DownCast( BaseHandle handle );
-
-public: // Not intended for application developers
-
-  /**
-   * @brief Creates a handle using the Toolkit::Internal implementation.
-   *
-   * @param[in] implementation The Control implementation.
-   */
-  DALI_INTERNAL TextSelectionPopup( Internal::TextSelectionPopup& implementation );
-
-  /**
-   * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
-   *
-   * @param[in]  internal  A pointer to the internal CustomActor.
-   */
-  explicit DALI_INTERNAL TextSelectionPopup( Dali::Internal::CustomActor* internal );
-
-}; // Class TextSelectionPopup
-
-} // namespace Toolkit
-
-} // namepsace Dali
-
-#endif // __DALI_TOOLKIT_TEXT_SELECTION_POPUP_H__
index 36078159025090e85957428fbe1819c6a7759042..3bd88d8665814e81977b37912a2a65926a056e37 100755 (executable)
@@ -22,7 +22,6 @@ public_api_src_files = \
   $(public_api_src_dir)/controls/table-view/table-view.cpp \
   $(public_api_src_dir)/controls/text-controls/text-label.cpp \
   $(public_api_src_dir)/controls/text-controls/text-field.cpp \
-  $(public_api_src_dir)/controls/text-controls/text-selection-popup.cpp \
   $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \
   $(public_api_src_dir)/controls/image-view/masked-image-view.cpp \
   $(public_api_src_dir)/focus-manager/focus-manager.cpp \
@@ -83,8 +82,7 @@ public_api_table_view_header_files = \
 
 public_api_text_controls_header_files = \
   $(public_api_src_dir)/controls/text-controls/text-label.h \
-  $(public_api_src_dir)/controls/text-controls/text-field.h \
-  $(public_api_src_dir)/controls/text-controls/text-selection-popup.h
+  $(public_api_src_dir)/controls/text-controls/text-field.h 
 
 public_api_focus_manager_header_files = \
   $(public_api_src_dir)/focus-manager/focus-manager.h \